From 15935ec48e16b80577b59d2fcb68ce885dc70a1c Mon Sep 17 00:00:00 2001
From: Kanchalai Tanglertsampan <yuisu@microsoft.com>
Date: Fri, 10 Feb 2017 12:46:32 -0800
Subject: [PATCH] Emit "__esModule" before other statments

---
 src/compiler/transformers/module/module.ts    |  17 +-
 .../baselines/reference/APISample_compile.js  |   2 +-
 tests/baselines/reference/APISample_linter.js |   2 +-
 .../reference/APISample_parseConfig.js        |   2 +-
 .../reference/APISample_transform.js          |   2 +-
 .../baselines/reference/APISample_watcher.js  |   2 +-
 tests/baselines/reference/aliasAssignments.js |   4 +-
 .../reference/aliasOnMergedModuleInterface.js |   2 +-
 .../reference/aliasUsageInAccessorsOfClass.js |   6 +-
 .../baselines/reference/aliasUsageInArray.js  |   6 +-
 .../aliasUsageInFunctionExpression.js         |   6 +-
 .../reference/aliasUsageInGenericFunction.js  |   6 +-
 .../reference/aliasUsageInIndexerOfClass.js   |   6 +-
 .../reference/aliasUsageInObjectLiteral.js    |   6 +-
 .../reference/aliasUsageInOrExpression.js     |   6 +-
 ...aliasUsageInTypeArgumentOfExtendsClause.js |   6 +-
 .../reference/aliasUsageInVarAssignment.js    |   6 +-
 .../reference/aliasUsedAsNameValue.js         |   4 +-
 ...aceExportAssignmentUsedInVarInitializer.js |   2 +-
 .../allowSyntheticDefaultImports1.js          |   4 +-
 .../allowSyntheticDefaultImports10.js         |   2 +-
 .../allowSyntheticDefaultImports4.js          |   2 +-
 .../allowSyntheticDefaultImports9.js          |   2 +-
 .../reference/alwaysStrictModule4.js          |   2 +-
 .../reference/alwaysStrictModule6.js          |   2 +-
 .../reference/ambientDeclarationsExternal.js  |   2 +-
 .../reference/ambientDeclarationsPatterns.js  |   2 +-
 .../reference/ambientExternalModuleMerging.js |   2 +-
 ...rnalModuleWithInternalImportDeclaration.js |   2 +-
 ...lModuleWithoutInternalImportDeclaration.js |   2 +-
 tests/baselines/reference/ambientShorthand.js |   2 +-
 .../reference/ambientShorthand_reExport.js    |   6 +-
 .../reference/amdDependencyComment1.js        |   2 +-
 .../reference/amdDependencyComment2.js        |   2 +-
 .../reference/amdDependencyCommentName1.js    |   2 +-
 .../reference/amdDependencyCommentName2.js    |   2 +-
 .../reference/amdDependencyCommentName3.js    |   2 +-
 .../reference/amdDependencyCommentName4.js    |   2 +-
 .../reference/amdImportAsPrimaryExpression.js |   4 +-
 .../amdImportNotAsPrimaryExpression.js        |   4 +-
 .../reference/anonymousDefaultExportsAmd.js   |   4 +-
 .../anonymousDefaultExportsCommonjs.js        |   4 +-
 .../reference/anonymousDefaultExportsUmd.js   |   4 +-
 tests/baselines/reference/asOperator4.js      |   4 +-
 .../asyncAwaitIsolatedModules_es5.js          |   2 +-
 .../reference/asyncImportedPromise_es5.js     |   4 +-
 .../reference/asyncImportedPromise_es6.js     |   4 +-
 .../reference/augmentExportEquals1.js         |   2 +-
 .../reference/augmentExportEquals1_1.js       |   2 +-
 .../reference/augmentExportEquals2.js         |   2 +-
 .../reference/augmentExportEquals2_1.js       |   2 +-
 .../reference/augmentExportEquals3.js         |   4 +-
 .../reference/augmentExportEquals3_1.js       |   4 +-
 .../reference/augmentExportEquals4.js         |   4 +-
 .../reference/augmentExportEquals4_1.js       |   4 +-
 .../reference/augmentExportEquals5.js         |   2 +-
 .../reference/augmentExportEquals6.js         |   4 +-
 .../reference/augmentExportEquals6_1.js       |   2 +-
 .../augmentedTypesExternalModule1.js          |   2 +-
 tests/baselines/reference/cacheResolutions.js |   6 +-
 .../baselines/reference/chainedImportAlias.js |   4 +-
 .../baselines/reference/circularReference.js  |   4 +-
 .../reference/circularReferenceInImport.js    |   2 +-
 .../reference/classAbstractManyKeywords.js    |   2 +-
 .../reference/classExtendsAcrossFiles.js      |   4 +-
 ...classMemberInitializerWithLamdaScoping3.js |   2 +-
 ...classMemberInitializerWithLamdaScoping4.js |   2 +-
 .../collisionExportsRequireAndAlias.js        |   6 +-
 .../collisionExportsRequireAndAmbientClass.js |   2 +-
 .../collisionExportsRequireAndAmbientEnum.js  |   2 +-
 ...llisionExportsRequireAndAmbientFunction.js |   2 +-
 ...collisionExportsRequireAndAmbientModule.js |   2 +-
 .../collisionExportsRequireAndAmbientVar.js   |   2 +-
 .../collisionExportsRequireAndClass.js        |   2 +-
 .../collisionExportsRequireAndEnum.js         |   2 +-
 .../collisionExportsRequireAndFunction.js     |   2 +-
 ...ionExportsRequireAndInternalModuleAlias.js |   2 +-
 .../collisionExportsRequireAndModule.js       |   2 +-
 ...onExportsRequireAndUninstantiatedModule.js |   2 +-
 .../collisionExportsRequireAndVar.js          |   2 +-
 .../commentOnExportEnumDeclaration.js         |   2 +-
 .../reference/commentsDottedModuleName.js     |   2 +-
 .../reference/commentsExternalModules.js      |   4 +-
 .../reference/commentsExternalModules2.js     |   4 +-
 .../reference/commentsExternalModules3.js     |   4 +-
 .../reference/commentsMultiModuleMultiFile.js |   4 +-
 .../reference/commentsOnRequireStatement.js   |   6 +-
 .../commonJSImportAsPrimaryExpression.js      |   4 +-
 .../commonJSImportNotAsPrimaryExpression.js   |   4 +-
 tests/baselines/reference/commonSourceDir5.js |   6 +-
 tests/baselines/reference/commonSourceDir6.js |   6 +-
 .../reference/commonSourceDirectory.js        |   2 +-
 .../reference/commonSourceDirectory.js.map    |   2 +-
 .../commonSourceDirectory.sourcemap.txt       |  26 +-
 .../reference/commonSourceDirectory_dts.js    |   2 +-
 .../commonSourceDirectory_dts.js.map          |   2 +-
 .../commonSourceDirectory_dts.sourcemap.txt   |  20 +-
 .../baselines/reference/commonjsSafeImport.js |   4 +-
 .../reference/complexNarrowingWithAny.js      |   2 +-
 .../reference/constDeclarations-access5.js    |   4 +-
 .../reference/constEnumExternalModule.js      |   2 +-
 .../controlFlowBinaryOrExpression.js          |   2 +-
 .../controlFlowPropertyDeclarations.js        |   2 +-
 .../controlFlowSelfReferentialLoop.js         |   2 +-
 .../reference/copyrightWithNewLine1.js        |   2 +-
 .../reference/copyrightWithoutNewLine1.js     |   2 +-
 .../crashIntypeCheckInvocationExpression.js   |   2 +-
 ...rashIntypeCheckObjectCreationExpression.js |   2 +-
 .../baselines/reference/declFileAccessors.js  |   2 +-
 .../declFileAliasUseBeforeDeclaration.js      |   4 +-
 ...assWithStaticMethodReturningConstructor.js |   2 +-
 .../reference/declFileConstructors.js         |   2 +-
 ...lFileExportAssignmentOfGenericInterface.js |   2 +-
 .../reference/declFileExportImportChain.js    |   4 +-
 .../reference/declFileExportImportChain2.js   |   2 +-
 .../reference/declFileForExportedImport.js    |   2 +-
 .../baselines/reference/declFileFunctions.js  |   2 +-
 .../reference/declFileGenericType.js          |   2 +-
 ...eclFileImportModuleWithExportAssignment.js |   2 +-
 tests/baselines/reference/declFileMethods.js  |   2 +-
 .../declarationEmitClassMemberNameConflict.js |   2 +-
 .../declarationEmitExportAssignment.js        |   2 +-
 .../declarationEmitExportDeclaration.js       |   4 +-
 .../declarationEmitExpressionInExtends3.js    |   2 +-
 .../declarationEmitIdentifierPredicates01.js  |   2 +-
 ...itIdentifierPredicatesWithPrivateName01.js |   2 +-
 ...declarationEmitInferedDefaultExportType.js |   2 +-
 .../declarationEmitInferedTypeAlias1.js       |   4 +-
 .../declarationEmitInferedTypeAlias2.js       |   4 +-
 .../declarationEmitInferedTypeAlias3.js       |   4 +-
 .../declarationEmitInferedTypeAlias5.js       |   4 +-
 .../declarationEmitInferedTypeAlias6.js       |   4 +-
 .../declarationEmitInferedTypeAlias7.js       |   4 +-
 .../declarationEmitInferedTypeAlias9.js       |   2 +-
 .../reference/declarationEmitInvalidExport.js |   2 +-
 .../reference/declarationEmitNameConflicts.js |   2 +-
 .../declarationEmitNameConflictsWithAlias.js  |   2 +-
 .../reference/declarationEmitPromise.js       |   2 +-
 .../declarationEmitThisPredicates01.js        |   2 +-
 .../declarationEmitThisPredicates02.js        |   2 +-
 ...tionEmitThisPredicatesWithPrivateName01.js |   2 +-
 ...tionEmitThisPredicatesWithPrivateName02.js |   2 +-
 ...arationEmitTypeAliasWithTypeParameters1.js |   2 +-
 ...arationEmitTypeAliasWithTypeParameters2.js |   2 +-
 ...arationEmitTypeAliasWithTypeParameters5.js |   2 +-
 .../reference/declarationEmitUnknownImport.js |   2 +-
 .../declarationEmitUnknownImport2.js          |   2 +-
 .../reference/declarationMerging2.js          |   2 +-
 .../decoratedClassExportsCommonJS1.js         |   2 +-
 .../decoratedClassExportsCommonJS2.js         |   2 +-
 .../decoratedDefaultExportsGetExportedAmd.js  |   4 +-
 ...oratedDefaultExportsGetExportedCommonjs.js |   4 +-
 .../decoratedDefaultExportsGetExportedUmd.js  |   4 +-
 ...ratorInstantiateModulesInFunctionBodies.js |   4 +-
 .../baselines/reference/decoratorMetadata.js  |   4 +-
 .../decoratorMetadataOnInferredType.js        |   2 +-
 ...orMetadataRestParameterWithImportedType.js |   8 +-
 .../decoratorMetadataWithConstructorType.js   |   2 +-
 ...adataWithImportDeclarationNameCollision.js |   4 +-
 ...dataWithImportDeclarationNameCollision2.js |   4 +-
 ...dataWithImportDeclarationNameCollision3.js |   4 +-
 ...dataWithImportDeclarationNameCollision4.js |   4 +-
 ...dataWithImportDeclarationNameCollision5.js |   4 +-
 ...dataWithImportDeclarationNameCollision6.js |   4 +-
 ...dataWithImportDeclarationNameCollision7.js |   4 +-
 ...dataWithImportDeclarationNameCollision8.js |   4 +-
 .../baselines/reference/decoratorOnClass2.js  |   2 +-
 .../reference/decoratorOnClassConstructor2.js |   4 +-
 .../reference/decoratorOnClassConstructor3.js |   4 +-
 .../defaultExportInAwaitExpression01.js       |   4 +-
 .../defaultExportInAwaitExpression02.js       |   4 +-
 .../reference/defaultExportWithOverloads01.js |   2 +-
 .../reference/defaultExportsCannotMerge01.js  |   4 +-
 .../reference/defaultExportsCannotMerge02.js  |   4 +-
 .../reference/defaultExportsCannotMerge03.js  |   4 +-
 .../reference/defaultExportsCannotMerge04.js  |   2 +-
 .../reference/defaultExportsGetExportedAmd.js |   4 +-
 .../defaultExportsGetExportedCommonjs.js      |   4 +-
 .../reference/defaultExportsGetExportedUmd.js |   4 +-
 .../reference/dependencyViaImportAlias.js     |   2 +-
 .../destructuringInVariableDeclarations1.js   |   2 +-
 .../destructuringInVariableDeclarations2.js   |   2 +-
 .../destructuringInVariableDeclarations3.js   |   2 +-
 .../destructuringInVariableDeclarations4.js   |   2 +-
 .../destructuringInVariableDeclarations5.js   |   2 +-
 .../destructuringInVariableDeclarations6.js   |   2 +-
 .../reference/downlevelLetConst13.js          |   2 +-
 .../reference/duplicateLocalVariable1.js      |   2 +-
 .../reference/duplicateLocalVariable2.js      |   2 +-
 .../duplicateSymbolsExportMatching.js         |   2 +-
 .../reference/dynamicModuleTypecheckError.js  |   2 +-
 .../baselines/reference/elidingImportNames.js |   6 +-
 tests/baselines/reference/emptyModuleName.js  |   2 +-
 .../reference/enumFromExternalModule.js       |   4 +-
 .../reference/errorsOnImportedSymbol.js       |   2 +-
 .../reference/es3defaultAliasIsQuoted.js      |   4 +-
 tests/baselines/reference/es5-commonjs.js     |   2 +-
 tests/baselines/reference/es5-commonjs2.js    |   2 +-
 tests/baselines/reference/es5-commonjs3.js    |   2 +-
 tests/baselines/reference/es5-commonjs4.js    |   2 +-
 tests/baselines/reference/es5-commonjs5.js    |   2 +-
 tests/baselines/reference/es5-commonjs6.js    |   2 +-
 .../es5-importHelpersAsyncFunctions.js        |   2 +-
 tests/baselines/reference/es5-umd2.js         |   2 +-
 tests/baselines/reference/es5-umd3.js         |   2 +-
 .../es5ExportDefaultClassDeclaration.js       |   2 +-
 .../es5ExportDefaultClassDeclaration2.js      |   2 +-
 .../es5ExportDefaultClassDeclaration3.js      |   2 +-
 .../reference/es5ExportDefaultExpression.js   |   2 +-
 .../es5ExportDefaultFunctionDeclaration.js    |   2 +-
 .../es5ExportDefaultFunctionDeclaration2.js   |   2 +-
 .../es5ExportDefaultFunctionDeclaration3.js   |   2 +-
 .../reference/es5ExportDefaultIdentifier.js   |   2 +-
 .../es5ModuleInternalNamedImports.js          |   2 +-
 .../reference/es5ModuleWithModuleGenAmd.js    |   2 +-
 .../es5ModuleWithModuleGenCommonjs.js         |   2 +-
 .../es5ModuleWithoutModuleGenTarget.js        |   2 +-
 tests/baselines/reference/es6-umd2.js         |   2 +-
 .../baselines/reference/es6ExportAllInEs5.js  |   4 +-
 .../reference/es6ExportClauseInEs5.js         |   2 +-
 .../es6ExportClauseWithAssignmentInEs5.js     |   2 +-
 ...ExportClauseWithoutModuleSpecifierInEs5.js |   4 +-
 .../reference/es6ExportEqualsInterop.js       |   2 +-
 .../reference/es6ImportDefaultBindingAmd.js   |   4 +-
 .../reference/es6ImportDefaultBindingDts.js   |   4 +-
 ...rtDefaultBindingFollowedWithNamedImport.js |   4 +-
 ...ultBindingFollowedWithNamedImport1InEs5.js |   4 +-
 ...ndingFollowedWithNamedImport1WithExport.js |   4 +-
 ...efaultBindingFollowedWithNamedImportDts.js |   4 +-
 ...faultBindingFollowedWithNamedImportDts1.js |   4 +-
 ...aultBindingFollowedWithNamedImportInEs5.js |   4 +-
 ...indingFollowedWithNamedImportWithExport.js |   4 +-
 ...ndingFollowedWithNamespaceBinding1InEs5.js |   4 +-
 ...FollowedWithNamespaceBinding1WithExport.js |   4 +-
 ...tBindingFollowedWithNamespaceBindingDts.js |   4 +-
 ...BindingFollowedWithNamespaceBindingDts1.js |   4 +-
 ...indingFollowedWithNamespaceBindingInEs5.js |   4 +-
 ...gFollowedWithNamespaceBindingWithExport.js |   4 +-
 .../es6ImportDefaultBindingMergeErrors.js     |   4 +-
 ...s6ImportDefaultBindingNoDefaultProperty.js |   2 +-
 .../es6ImportDefaultBindingWithExport.js      |   4 +-
 .../reference/es6ImportNameSpaceImport.js     |   4 +-
 .../reference/es6ImportNameSpaceImportAmd.js  |   4 +-
 .../reference/es6ImportNameSpaceImportDts.js  |   4 +-
 .../es6ImportNameSpaceImportInEs5.js          |   4 +-
 .../es6ImportNameSpaceImportMergeErrors.js    |   4 +-
 .../es6ImportNameSpaceImportWithExport.js     |   4 +-
 .../reference/es6ImportNamedImport.js         |   4 +-
 .../reference/es6ImportNamedImportAmd.js      |   4 +-
 .../reference/es6ImportNamedImportDts.js      |   4 +-
 .../reference/es6ImportNamedImportInEs5.js    |   4 +-
 .../es6ImportNamedImportInExportAssignment.js |   2 +-
 ...rtNamedImportInIndirectExportAssignment.js |   2 +-
 .../es6ImportNamedImportMergeErrors.js        |   4 +-
 .../es6ImportNamedImportNoExportMember.js     |   2 +-
 .../es6ImportNamedImportWithExport.js         |   4 +-
 .../es6ImportNamedImportWithTypesAndValues.js |   4 +-
 .../es6ImportWithoutFromClauseAmd.js          |   6 +-
 .../es6ImportWithoutFromClauseInEs5.js        |   4 +-
 .../es6ImportWithoutFromClauseWithExport.js   |   4 +-
 .../es6ModuleWithModuleGenTargetAmd.js        |   2 +-
 .../es6ModuleWithModuleGenTargetCommonjs.js   |   2 +-
 .../reference/exportAndImport-es3-amd.js      |   4 +-
 .../reference/exportAndImport-es3.js          |   4 +-
 .../reference/exportAndImport-es5-amd.js      |   4 +-
 .../reference/exportAndImport-es5.js          |   4 +-
 .../reference/exportArrayBindingPattern.js    |   2 +-
 .../reference/exportAssignClassAndModule.js   |   2 +-
 .../reference/exportAssignDottedName.js       |   2 +-
 .../exportAssignImportedIdentifier.js         |   4 +-
 .../baselines/reference/exportAssignTypes.js  |   2 +-
 .../exportAssignedTypeAsTypeAnnotation.js     |   2 +-
 .../reference/exportAssignmentClass.js        |   2 +-
 .../exportAssignmentConstrainedGenericType.js |   2 +-
 .../reference/exportAssignmentEnum.js         |   2 +-
 .../reference/exportAssignmentFunction.js     |   2 +-
 .../reference/exportAssignmentGenericType.js  |   2 +-
 .../reference/exportAssignmentInterface.js    |   2 +-
 .../exportAssignmentInternalModule.js         |   2 +-
 .../exportAssignmentMergedInterface.js        |   2 +-
 .../reference/exportAssignmentMergedModule.js |   2 +-
 ...xportAssignmentOfDeclaredExternalModule.js |   2 +-
 .../exportAssignmentOfGenericType1.js         |   2 +-
 .../exportAssignmentTopLevelClodule.js        |   2 +-
 .../exportAssignmentTopLevelEnumdule.js       |   2 +-
 .../exportAssignmentTopLevelFundule.js        |   2 +-
 .../exportAssignmentTopLevelIdentifier.js     |   2 +-
 .../reference/exportAssignmentVariable.js     |   2 +-
 ...ationWithModuleSpecifierNameOnNextLine1.js |   8 +-
 .../reference/exportDeclareClass1.js          |   4 +-
 .../reference/exportDeclaredModule.js         |   2 +-
 .../reference/exportDefaultProperty.js        |   6 +-
 .../reference/exportDefaultProperty2.js       |   4 +-
 .../reference/exportEqualCallable.js          |   2 +-
 .../reference/exportEqualErrorType.js         |   2 +-
 .../reference/exportEqualMemberMissing.js     |   2 +-
 .../reference/exportEqualsDefaultProperty.js  |   2 +-
 .../reference/exportEqualsProperty.js         |   2 +-
 .../reference/exportEqualsProperty2.js        |   2 +-
 tests/baselines/reference/exportImport.js     |   4 +-
 .../reference/exportImportMultipleFiles.js    |   6 +-
 .../exportImportNonInstantiatedModule2.js     |   2 +-
 .../exportNonInitializedVariablesAMD.js       |   2 +-
 .../exportNonInitializedVariablesCommonJS.js  |   2 +-
 .../exportNonInitializedVariablesUMD.js       |   2 +-
 .../exportRedeclarationTypeAliases.js         |   2 +-
 .../reference/exportSameNameFuncVar.js        |   2 +-
 .../reference/exportSpecifierForAGlobal.js    |   2 +-
 tests/baselines/reference/exportStar-amd.js   |  10 +-
 tests/baselines/reference/exportStar.js       |  10 +-
 .../reference/exportStarForValues.js          |   2 +-
 .../reference/exportStarForValues2.js         |   4 +-
 .../reference/exportStarForValues3.js         |   8 +-
 .../reference/exportStarForValues4.js         |   4 +-
 .../reference/exportStarForValues7.js         |   4 +-
 .../reference/exportStarForValues8.js         |   8 +-
 .../reference/exportStarForValues9.js         |   4 +-
 .../reference/exportStarFromEmptyModule.js    |   6 +-
 tests/baselines/reference/exportToString.js   |   2 +-
 tests/baselines/reference/exportVisibility.js |   2 +-
 .../exportedBlockScopedDeclarations.js        |   2 +-
 .../baselines/reference/exportedVariable1.js  |   2 +-
 .../exportingContainingVisibleType.js         |   2 +-
 .../reference/exportsAndImports1-amd.js       |   6 +-
 .../reference/exportsAndImports1-es6.js       |   6 +-
 .../baselines/reference/exportsAndImports1.js |   6 +-
 .../reference/exportsAndImports2-amd.js       |   6 +-
 .../reference/exportsAndImports2-es6.js       |   6 +-
 .../baselines/reference/exportsAndImports2.js |   6 +-
 .../reference/exportsAndImports3-amd.js       |   6 +-
 .../reference/exportsAndImports3-es6.js       |   6 +-
 .../baselines/reference/exportsAndImports3.js |   6 +-
 .../reference/exportsAndImports4-amd.js       |   4 +-
 .../reference/exportsAndImports4-es6.js       |   4 +-
 .../baselines/reference/exportsAndImports4.js |   4 +-
 ...sAndImportsWithContextualKeywordNames01.js |   2 +-
 ...sAndImportsWithContextualKeywordNames02.js |   4 +-
 .../exportsAndImportsWithUnderscores1.js      |   4 +-
 .../exportsAndImportsWithUnderscores2.js      |   4 +-
 .../exportsAndImportsWithUnderscores3.js      |   4 +-
 .../exportsAndImportsWithUnderscores4.js      |   4 +-
 .../extendClassExpressionFromModule.js        |   2 +-
 ...xtendingClassFromAliasAndUsageInIndexer.js |   8 +-
 .../reference/externalModuleAssignToVar.js    |   4 +-
 .../externalModuleExportingGenericClass.js    |   2 +-
 .../externalModuleImmutableBindings.js        |   4 +-
 .../reference/externalModuleQualification.js  |   2 +-
 ...ceOfImportDeclarationWithExportModifier.js |   4 +-
 ...ernceResolutionOrderInImportDeclaration.js |   4 +-
 .../reference/externalModuleResolution.js     |   2 +-
 .../reference/externalModuleResolution2.js    |   2 +-
 .../reference/fieldAndGetterWithSameName.js   |   2 +-
 ...ilesEmittingIntoSameOutputWithOutOption.js |   2 +-
 .../functionAndImportNameConflict.js          |   4 +-
 .../functionLikeInParameterInitializer.js     |   2 +-
 .../reference/generatorES6InAMDModule.js      |   2 +-
 .../reference/genericClassesInModule2.js      |   2 +-
 .../genericInterfaceFunctionTypeParameter.js  |   2 +-
 .../reference/genericMemberFunction.js        |   2 +-
 .../reference/genericReturnTypeFromGetter1.js |   2 +-
 .../genericTypeWithMultipleBases1.js          |   2 +-
 .../genericTypeWithMultipleBases2.js          |   2 +-
 .../genericWithIndexerOfTypeParameterType2.js |   2 +-
 ...getEmitOutputWithDeclarationFile2.baseline |   2 +-
 .../getEmitOutputWithEmitterErrors2.baseline  |   2 +-
 tests/baselines/reference/giant.js            |   2 +-
 ...sAnExternalModuleInsideAnInternalModule.js |   4 +-
 .../baselines/reference/importAsBaseClass.js  |   4 +-
 tests/baselines/reference/importDecl.js       |  12 +-
 .../reference/importDeclWithClassModifiers.js |   2 +-
 .../importDeclWithDeclareModifier.js          |   2 +-
 .../reference/importDeclWithExportModifier.js |   2 +-
 ...clWithExportModifierAndExportAssignment.js |   2 +-
 .../importDeclarationUsedAsTypeQuery.js       |   2 +-
 tests/baselines/reference/importHelpers.js    |   2 +-
 tests/baselines/reference/importHelpersAmd.js |   4 +-
 .../importHelpersInIsolatedModules.js         |   4 +-
 .../baselines/reference/importHelpersInTsx.js |   2 +-
 .../reference/importHelpersNoHelpers.js       |   2 +-
 .../reference/importHelpersNoModule.js        |   2 +-
 .../reference/importHelpersOutFile.js         |   6 +-
 .../reference/importImportOnlyModule.js       |   6 +-
 .../baselines/reference/importInsideModule.js |   2 +-
 .../reference/importNonExternalModule.js      |   2 +-
 .../reference/importNonStringLiteral.js       |   2 +-
 .../baselines/reference/importTsBeforeDTs.js  |   4 +-
 .../reference/importUsedInExtendsList1.js     |   4 +-
 .../reference/importWithTrailingSlash.js      |   8 +-
 .../import_reference-exported-alias.js        |   2 +-
 .../import_reference-to-type-alias.js         |   4 +-
 ...-referenecing-aliased-type-throug-array.js |   2 +-
 ...ar-referencing-an-imported-module-alias.js |   4 +-
 .../importedAliasesInTypePositions.js         |   4 +-
 .../reference/importedModuleClassNameClash.js |   2 +-
 .../reference/importsImplicitlyReadonly.js    |   4 +-
 tests/baselines/reference/inferenceLimit.js   |   2 +-
 .../reference/instanceOfInExternalModules.js  |   4 +-
 .../reference/interfaceContextualType.js      |   2 +-
 .../reference/interfaceDeclaration3.js        |   2 +-
 .../reference/interfaceDeclaration5.js        |   2 +-
 .../reference/interfaceImplementation6.js     |   2 +-
 ...alAliasClassInsideLocalModuleWithExport.js |   2 +-
 ...liasClassInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...liasClassInsideTopLevelModuleWithExport.js |   2 +-
 ...sClassInsideTopLevelModuleWithoutExport.js |   2 +-
 ...nalAliasEnumInsideLocalModuleWithExport.js |   2 +-
 ...AliasEnumInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...AliasEnumInsideTopLevelModuleWithExport.js |   2 +-
 ...asEnumInsideTopLevelModuleWithoutExport.js |   2 +-
 ...liasFunctionInsideLocalModuleWithExport.js |   2 +-
 ...sFunctionInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...sFunctionInsideTopLevelModuleWithExport.js |   2 +-
 ...nctionInsideTopLevelModuleWithoutExport.js |   2 +-
 ...alizedModuleInsideLocalModuleWithExport.js |   2 +-
 ...zedModuleInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...zedModuleInsideTopLevelModuleWithExport.js |   2 +-
 ...ModuleInsideTopLevelModuleWithoutExport.js |   2 +-
 ...iasInterfaceInsideLocalModuleWithExport.js |   2 +-
 ...InterfaceInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...alizedModuleInsideLocalModuleWithExport.js |   2 +-
 ...zedModuleInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...zedModuleInsideTopLevelModuleWithExport.js |   2 +-
 ...ModuleInsideTopLevelModuleWithoutExport.js |   2 +-
 ...rnalAliasVarInsideLocalModuleWithExport.js |   2 +-
 ...lAliasVarInsideLocalModuleWithoutExport.js |   2 +-
 ...sideLocalModuleWithoutExportAccessError.js |   2 +-
 ...lAliasVarInsideTopLevelModuleWithExport.js |   2 +-
 ...iasVarInsideTopLevelModuleWithoutExport.js |   2 +-
 .../reference/intersectionTypeInference1.js   |   2 +-
 .../isolatedModulesImportExportElision.js     |   2 +-
 .../reference/isolatedModulesPlainFile-AMD.js |   2 +-
 .../isolatedModulesPlainFile-CommonJS.js      |   2 +-
 .../reference/isolatedModulesPlainFile-UMD.js |   2 +-
 ...jsFileCompilationRestParamJsDocFunction.js |   2 +-
 .../reference/jsxEmitWithAttributes.js        |   4 +-
 .../reference/jsxFactoryAndReactNamespace.js  |   4 +-
 .../reference/jsxFactoryIdentifier.js         |   4 +-
 .../reference/jsxFactoryIdentifier.js.map     |   4 +-
 .../jsxFactoryIdentifier.sourcemap.txt        | 248 +++++++++---------
 .../jsxFactoryIdentifierAsParameter.js        |   2 +-
 .../jsxFactoryIdentifierAsParameter.js.map    |   2 +-
 ...FactoryIdentifierAsParameter.sourcemap.txt |  33 ++-
 ...jsxFactoryIdentifierWithAbsentParameter.js |   2 +-
 ...actoryIdentifierWithAbsentParameter.js.map |   2 +-
 ...dentifierWithAbsentParameter.sourcemap.txt |  29 +-
 .../jsxFactoryNotIdentifierOrQualifiedName.js |   4 +-
 ...jsxFactoryNotIdentifierOrQualifiedName2.js |   4 +-
 .../reference/jsxFactoryQualifiedName.js      |   4 +-
 .../reference/jsxFactoryQualifiedName.js.map  |   4 +-
 .../jsxFactoryQualifiedName.sourcemap.txt     | 232 ++++++++--------
 .../jsxFactoryQualifiedNameResolutionError.js |   2 +-
 ...FactoryQualifiedNameResolutionError.js.map |   2 +-
 ...QualifiedNameResolutionError.sourcemap.txt |  33 ++-
 .../jsxFactoryQualifiedNameWithEs5.js         |   2 +-
 .../reference/jsxImportInAttribute.js         |   2 +-
 tests/baselines/reference/jsxViaImport.2.js   |   2 +-
 tests/baselines/reference/jsxViaImport.js     |   2 +-
 .../reference/localAliasExportAssignment.js   |   2 +-
 .../baselines/reference/mapOnTupleTypes01.js  |   2 +-
 .../baselines/reference/mapOnTupleTypes02.js  |   2 +-
 .../memberAccessMustUseModuleInstances.js     |   4 +-
 .../reference/mergeWithImportedNamespace.js   |   2 +-
 .../reference/mergeWithImportedType.js        |   2 +-
 .../reference/mergedDeclarations6.js          |   4 +-
 .../reference/mergedDeclarations7.js          |   2 +-
 .../mergedModuleDeclarationCodeGen.js         |   2 +-
 .../reference/metadataOfEventAlias.js         |   4 +-
 .../missingFunctionImplementation.js          |   2 +-
 .../missingSemicolonInModuleSpecifier.js      |   4 +-
 .../moduleAliasAsFunctionArgument.js          |   2 +-
 ...gmentationCollidingNamesInAugmentation1.js |   6 +-
 .../moduleAugmentationDeclarationEmit1.js     |   6 +-
 .../moduleAugmentationDeclarationEmit2.js     |   6 +-
 .../moduleAugmentationDisallowedExtensions.js |  10 +-
 .../moduleAugmentationExtendAmbientModule1.js |   4 +-
 .../moduleAugmentationExtendAmbientModule2.js |   4 +-
 .../moduleAugmentationExtendFileModule1.js    |   6 +-
 .../moduleAugmentationExtendFileModule2.js    |   6 +-
 .../reference/moduleAugmentationGlobal1.js    |   4 +-
 .../reference/moduleAugmentationGlobal2.js    |   4 +-
 .../reference/moduleAugmentationGlobal3.js    |   4 +-
 .../reference/moduleAugmentationGlobal4.js    |   2 +-
 .../reference/moduleAugmentationGlobal5.js    |   2 +-
 .../moduleAugmentationImportsAndExports1.js   |   8 +-
 .../moduleAugmentationImportsAndExports2.js   |   8 +-
 .../moduleAugmentationImportsAndExports3.js   |   8 +-
 .../moduleAugmentationImportsAndExports4.js   |   8 +-
 .../moduleAugmentationImportsAndExports5.js   |   8 +-
 .../moduleAugmentationImportsAndExports6.js   |   8 +-
 .../moduleAugmentationInAmbientModule1.js     |   2 +-
 .../moduleAugmentationInAmbientModule2.js     |   2 +-
 .../moduleAugmentationInAmbientModule3.js     |   2 +-
 .../moduleAugmentationInAmbientModule4.js     |   2 +-
 .../moduleAugmentationInAmbientModule5.js     |   2 +-
 .../moduleAugmentationInDependency.js         |   2 +-
 .../moduleAugmentationInDependency2.js        |   2 +-
 .../reference/moduleAugmentationNoNewNames.js |   4 +-
 .../moduleAugmentationsBundledOutput1.js      |  10 +-
 .../reference/moduleAugmentationsImports1.js  |   8 +-
 .../reference/moduleAugmentationsImports2.js  |  10 +-
 .../reference/moduleAugmentationsImports3.js  |   8 +-
 .../reference/moduleAugmentationsImports4.js  |   6 +-
 .../baselines/reference/moduleCodeGenTest5.js |   2 +-
 .../baselines/reference/moduleCodegenTest4.js |   2 +-
 .../reference/moduleDuplicateIdentifiers.js   |   2 +-
 tests/baselines/reference/moduleExports1.js   |   2 +-
 .../moduleImportedForTypeArgumentPosition.js  |   2 +-
 .../reference/moduleInTypePosition1.js        |   4 +-
 .../reference/moduleMergeConstructor.js       |   2 +-
 tests/baselines/reference/moduleNoneErrors.js |   2 +-
 .../baselines/reference/modulePrologueAMD.js  |   2 +-
 .../reference/modulePrologueCommonjs.js       |   2 +-
 .../baselines/reference/modulePrologueUmd.js  |   2 +-
 .../reference/moduleResolutionNoResolve.js    |   2 +-
 .../reference/moduleResolutionNoTs.js         |   4 +-
 .../moduleResolutionWithExtensions.js         |   2 +-
 ...moduleResolutionWithExtensions_preferTs.js |   2 +-
 ...duleResolutionWithExtensions_unexpected.js |   2 +-
 ...uleResolutionWithExtensions_unexpected2.js |   2 +-
 .../reference/moduleResolutionWithSymlinks.js |   6 +-
 ...ResolutionWithSymlinks_notInNodeModules.js |   6 +-
 ...moduleResolutionWithSymlinks_withOutDir.js |   6 +-
 ...duleSameValueDuplicateExportedBindings1.js |   6 +-
 ...duleSameValueDuplicateExportedBindings2.js |   6 +-
 tests/baselines/reference/moduleScoping.js    |   4 +-
 .../baselines/reference/multiImportExport.js  |   4 +-
 .../reference/multipleDefaultExports01.js     |   4 +-
 .../reference/multipleDefaultExports02.js     |   4 +-
 .../reference/multipleDefaultExports03.js     |  24 +-
 .../reference/multipleDefaultExports04.js     |  12 +-
 .../reference/multipleExportDefault1.js       |   2 +-
 .../reference/multipleExportDefault2.js       |   2 +-
 .../reference/multipleExportDefault3.js       |   2 +-
 .../reference/multipleExportDefault4.js       |   2 +-
 .../reference/multipleExportDefault5.js       |   2 +-
 .../reference/multipleExportDefault6.js       |   2 +-
 tests/baselines/reference/multipleExports.js  |   2 +-
 .../reference/nameDelimitedBySlashes.js       |   4 +-
 .../reference/nameWithFileExtension.js        |   4 +-
 .../reference/nameWithRelativePaths.js        |   8 +-
 .../reference/project/baseline/amd/decl.js    |   2 +-
 .../reference/project/baseline/amd/emit.js    |   2 +-
 .../reference/project/baseline/node/decl.js   |   2 +-
 .../reference/project/baseline/node/emit.js   |   2 +-
 .../reference/project/baseline2/amd/decl.js   |   2 +-
 .../project/baseline2/amd/dont_emit.js        |   2 +-
 .../reference/project/baseline2/node/decl.js  |   2 +-
 .../project/baseline2/node/dont_emit.js       |   2 +-
 .../project/baseline3/amd/nestedModule.js     |   2 +-
 .../project/baseline3/node/nestedModule.js    |   2 +-
 .../reference/project/declarationDir/amd/a.js |   2 +-
 .../project/declarationDir/amd/subfolder/b.js |   2 +-
 .../project/declarationDir/amd/subfolder/c.js |   2 +-
 .../project/declarationDir/node/a.js          |   2 +-
 .../declarationDir/node/subfolder/b.js        |   2 +-
 .../declarationDir/node/subfolder/c.js        |   2 +-
 .../project/declarationDir2/amd/out/a.js      |   2 +-
 .../declarationDir2/amd/out/subfolder/b.js    |   2 +-
 .../declarationDir2/amd/out/subfolder/c.js    |   2 +-
 .../project/declarationDir2/node/out/a.js     |   2 +-
 .../declarationDir2/node/out/subfolder/b.js   |   2 +-
 .../declarationDir2/node/out/subfolder/c.js   |   2 +-
 .../project/declarationDir3/amd/out.js        |   6 +-
 .../declarationsCascadingImports/amd/m4.js    |   2 +-
 .../declarationsCascadingImports/node/m4.js   |   2 +-
 .../declarationsGlobalImport/amd/glo_m4.js    |   2 +-
 .../declarationsGlobalImport/amd/useModule.js |   2 +-
 .../declarationsGlobalImport/node/glo_m4.js   |   2 +-
 .../node/useModule.js                         |   2 +-
 .../amd/private_m4.js                         |   2 +-
 .../amd/useModule.js                          |   2 +-
 .../node/private_m4.js                        |   2 +-
 .../node/useModule.js                         |   2 +-
 .../amd/fncOnly_m4.js                         |   2 +-
 .../amd/useModule.js                          |   2 +-
 .../node/fncOnly_m4.js                        |   2 +-
 .../node/useModule.js                         |   2 +-
 .../amd/m4.js                                 |   2 +-
 .../amd/m5.js                                 |   2 +-
 .../amd/useModule.js                          |   2 +-
 .../node/m4.js                                |   2 +-
 .../node/m5.js                                |   2 +-
 .../node/useModule.js                         |   2 +-
 .../declarationsMultipleTimesImport/amd/m4.js |   2 +-
 .../amd/useModule.js                          |   2 +-
 .../node/m4.js                                |   2 +-
 .../node/useModule.js                         |   2 +-
 .../amd/m4.js                                 |   2 +-
 .../amd/m5.js                                 |   2 +-
 .../amd/useModule.js                          |   2 +-
 .../node/m4.js                                |   2 +-
 .../node/m5.js                                |   2 +-
 .../node/useModule.js                         |   2 +-
 .../declarationsSimpleImport/amd/m4.js        |   2 +-
 .../declarationsSimpleImport/amd/useModule.js |   2 +-
 .../declarationsSimpleImport/node/m4.js       |   2 +-
 .../node/useModule.js                         |   2 +-
 .../amd/main.js                               |   2 +-
 .../node/main.js                              |   2 +-
 .../amd/main.js                               |   2 +-
 .../node/main.js                              |   2 +-
 .../emitDecoratorMetadataSystemJS/amd/main.js |   2 +-
 .../node/main.js                              |   2 +-
 .../amd/main.js                               |   2 +-
 .../node/main.js                              |   2 +-
 .../amd/main.js                               |   2 +-
 .../node/main.js                              |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/m1.js                                 |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/m1.js                                |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/m1.js                                 |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/m1.js                                |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../maprootUrlModuleSimpleNoOutdir/amd/m1.js  |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../maprootUrlModuleSimpleNoOutdir/node/m1.js |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/m1.js                                 |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/m1.js                                |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/importHigher/root.js                  |   2 +-
 .../node/importHigher/root.js                 |   2 +-
 .../amd/maxDepthExceeded/built/root.js        |   2 +-
 .../node/maxDepthExceeded/built/root.js       |   2 +-
 .../amd/maxDepthIncreased/root.js             |   2 +-
 .../node/maxDepthIncreased/root.js            |   2 +-
 .../project/nonRelative/amd/consume.js        |   2 +-
 .../reference/project/nonRelative/amd/decl.js |   2 +-
 .../project/nonRelative/amd/lib/bar/a.js      |   2 +-
 .../project/nonRelative/amd/lib/foo/a.js      |   2 +-
 .../project/nonRelative/amd/lib/foo/b.js      |   2 +-
 .../project/nonRelative/node/consume.js       |   2 +-
 .../project/nonRelative/node/decl.js          |   2 +-
 .../project/nonRelative/node/lib/bar/a.js     |   2 +-
 .../project/nonRelative/node/lib/foo/a.js     |   2 +-
 .../project/nonRelative/node/lib/foo/b.js     |   2 +-
 .../outMixedSubfolderNoOutdir/amd/ref/m2.js   |   2 +-
 .../outMixedSubfolderNoOutdir/node/ref/m2.js  |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/diskFile0.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../outModuleMultifolderNoOutdir/amd/test.js  |   2 +-
 .../node/diskFile0.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../outModuleMultifolderNoOutdir/node/test.js |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../project/outModuleSimpleNoOutdir/amd/m1.js |   2 +-
 .../outModuleSimpleNoOutdir/amd/test.js       |   2 +-
 .../outModuleSimpleNoOutdir/node/m1.js        |   2 +-
 .../outModuleSimpleNoOutdir/node/test.js      |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../outModuleSubfolderNoOutdir/amd/ref/m1.js  |   2 +-
 .../outModuleSubfolderNoOutdir/amd/test.js    |   2 +-
 .../outModuleSubfolderNoOutdir/node/ref/m1.js |   2 +-
 .../outModuleSubfolderNoOutdir/node/test.js   |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/m1.js                                 |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/m1.js                                |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/m1.js                                 |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/m1.js                                |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../sourcemapModuleSimpleNoOutdir/amd/m1.js   |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../sourcemapModuleSimpleNoOutdir/amd/test.js |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../sourcemapModuleSimpleNoOutdir/node/m1.js  |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m2.js                             |   2 +-
 .../amd/ref/m2.js.map                         |   2 +-
 .../node/ref/m2.js                            |   2 +-
 .../node/ref/m2.js.map                        |   2 +-
 .../amd/outdir/simple/ref/m2.js               |   2 +-
 .../amd/outdir/simple/ref/m2.js.map           |   2 +-
 .../node/outdir/simple/ref/m2.js              |   2 +-
 .../node/outdir/simple/ref/m2.js.map          |   2 +-
 .../amd/bin/test.js                           |   2 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/bin/outAndOutDirFile.js               |   2 +-
 .../amd/bin/outAndOutDirFile.js.map           |   2 +-
 .../amd/diskFile0.js.map                      |   2 +-
 .../amd/diskFile1.js                          |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/diskFile0.js.map                     |   2 +-
 .../node/diskFile1.js                         |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../outputdir_module_multifolder/ref/m1.js    |   2 +-
 .../ref/m1.js.map                             |   2 +-
 .../outputdir_module_multifolder/test.js      |   2 +-
 .../outputdir_module_multifolder/test.js.map  |   2 +-
 .../outputdir_module_multifolder_ref/m2.js    |   2 +-
 .../m2.js.map                                 |   2 +-
 .../amd/bin/test.js                           |   6 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/m1.js                                 |   2 +-
 .../amd/m1.js.map                             |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/m1.js                                |   2 +-
 .../node/m1.js.map                            |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/m1.js                   |   2 +-
 .../amd/outdir/simple/m1.js.map               |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/m1.js                  |   2 +-
 .../node/outdir/simple/m1.js.map              |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/ref/m1.js                             |   2 +-
 .../amd/ref/m1.js.map                         |   2 +-
 .../amd/test.js                               |   2 +-
 .../amd/test.js.map                           |   2 +-
 .../node/ref/m1.js                            |   2 +-
 .../node/ref/m1.js.map                        |   2 +-
 .../node/test.js                              |   2 +-
 .../node/test.js.map                          |   2 +-
 .../amd/outdir/simple/ref/m1.js               |   2 +-
 .../amd/outdir/simple/ref/m1.js.map           |   2 +-
 .../amd/outdir/simple/test.js                 |   2 +-
 .../amd/outdir/simple/test.js.map             |   2 +-
 .../node/outdir/simple/ref/m1.js              |   2 +-
 .../node/outdir/simple/ref/m1.js.map          |   2 +-
 .../node/outdir/simple/test.js                |   2 +-
 .../node/outdir/simple/test.js.map            |   2 +-
 .../amd/bin/test.js                           |   4 +-
 .../amd/bin/test.js.map                       |   2 +-
 .../amd/fs.js                                 |   2 +-
 .../node/fs.js                                |   2 +-
 ...ata when transpile with CommonJS option.js |   2 +-
 .../Does not generate semantic diagnostics.js |   2 +-
 ...enerates expected syntactic diagnostics.js |   2 +-
 .../transpile/Generates module output.js      |   2 +-
 ...diagnostics for missing file references.js |   2 +-
 ...erates no diagnostics with valid inputs.js |   2 +-
 ...extra errors for file without extension.js |   2 +-
 .../transpile/Rename dependencies - AMD.js    |   2 +-
 .../transpile/Rename dependencies - UMD.js    |   2 +-
 .../Support options with lib values.js        |   2 +-
 .../Support options with types values.js      |   2 +-
 .../Supports backslashes in file name.js      |   2 +-
 .../transpile/Supports setting allowJs.js     |   2 +-
 ...ts setting allowSyntheticDefaultImports.js |   2 +-
 .../Supports setting allowUnreachableCode.js  |   2 +-
 .../Supports setting allowUnusedLabels.js     |   2 +-
 .../Supports setting alwaysStrict.js          |   2 +-
 .../transpile/Supports setting baseUrl.js     |   2 +-
 .../transpile/Supports setting charset.js     |   2 +-
 .../transpile/Supports setting declaration.js |   2 +-
 .../Supports setting declarationDir.js        |   2 +-
 .../transpile/Supports setting emitBOM.js     |   2 +-
 .../Supports setting emitDecoratorMetadata.js |   2 +-
 ...Supports setting experimentalDecorators.js |   2 +-
 ...etting forceConsistentCasingInFileNames.js |   2 +-
 .../Supports setting isolatedModules.js       |   2 +-
 .../transpile/Supports setting jsx.js         |   2 +-
 .../transpile/Supports setting jsxFactory.js  |   2 +-
 .../transpile/Supports setting lib.js         |   2 +-
 .../transpile/Supports setting locale.js      |   2 +-
 .../transpile/Supports setting module.js      |   2 +-
 .../Supports setting moduleResolution.js      |   2 +-
 .../transpile/Supports setting newLine.js     |   2 +-
 .../transpile/Supports setting noEmit.js      |   2 +-
 .../Supports setting noEmitHelpers.js         |   2 +-
 .../Supports setting noEmitOnError.js         |   2 +-
 .../Supports setting noErrorTruncation.js     |   2 +-
 ...orts setting noFallthroughCasesInSwitch.js |   2 +-
 .../Supports setting noImplicitAny.js         |   2 +-
 .../Supports setting noImplicitReturns.js     |   2 +-
 .../Supports setting noImplicitThis.js        |   2 +-
 .../Supports setting noImplicitUseStrict.js   |   2 +-
 .../transpile/Supports setting noLib.js       |   2 +-
 .../transpile/Supports setting noResolve.js   |   2 +-
 .../transpile/Supports setting out.js         |   2 +-
 .../transpile/Supports setting outDir.js      |   2 +-
 .../transpile/Supports setting outFile.js     |   2 +-
 .../transpile/Supports setting paths.js       |   2 +-
 .../Supports setting preserveConstEnums.js    |   2 +-
 .../Supports setting reactNamespace.js        |   2 +-
 .../Supports setting removeComments.js        |   2 +-
 .../transpile/Supports setting rootDir.js     |   2 +-
 .../transpile/Supports setting rootDirs.js    |   2 +-
 .../Supports setting skipDefaultLibCheck.js   |   2 +-
 .../Supports setting skipLibCheck.js          |   2 +-
 .../Supports setting strictNullChecks.js      |   2 +-
 .../Supports setting stripInternal.js         |   2 +-
 ...ts setting suppressExcessPropertyErrors.js |   2 +-
 ... setting suppressImplicitAnyIndexErrors.js |   2 +-
 .../transpile/Supports setting typeRoots.js   |   2 +-
 .../transpile/Supports setting types.js       |   2 +-
 .../transpile/Supports urls in file name.js   |   2 +-
 ... with emit decorators and emit metadata.js |   2 +-
 .../Uses correct newLine character.js         |   2 +-
 .../transpile/transpile .js files.js          |   2 +-
 ...anspile file as tsx if jsx is specified.js |   2 +-
 tests/baselines/reference/withExportDecl.js   |   2 +-
 tests/baselines/reference/withImportDecl.js   |   4 +-
 1328 files changed, 2004 insertions(+), 2006 deletions(-)

diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
index cdd3380b3b7..bf963bdc0e5 100644
--- a/src/compiler/transformers/module/module.ts
+++ b/src/compiler/transformers/module/module.ts
@@ -83,15 +83,16 @@ namespace ts {
 
             const statements: Statement[] = [];
             const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
-            append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true));
-            addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
-            addRange(statements, endLexicalEnvironment());
-            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
 
             if (!currentModuleInfo.exportEquals) {
                 append(statements, createUnderscoreUnderscoreESModule());
             }
 
+            append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true));
+            addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
+            addRange(statements, endLexicalEnvironment());
+            addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
+
             const updated = updateSourceFileNode(node, setTextRange(createNodeArray(statements), node.statements));
             if (currentModuleInfo.hasExportStarsToExportValues) {
                 addEmitHelper(updated, exportStarHelper);
@@ -374,6 +375,10 @@ namespace ts {
             const statements: Statement[] = [];
             const statementOffset = addPrologueDirectives(statements, node.statements, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict, sourceElementVisitor);
 
+            if (!currentModuleInfo.exportEquals) {
+                append(statements, createUnderscoreUnderscoreESModule());
+            }
+
             // Visit each statement of the module body.
             append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true));
             addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
@@ -385,10 +390,6 @@ namespace ts {
             // Append the 'export =' statement if provided.
             addExportEqualsIfNeeded(statements, /*emitAsReturn*/ true);
 
-            if (!currentModuleInfo.exportEquals) {
-                append(statements, createUnderscoreUnderscoreESModule());
-            }
-
             const body = createBlock(statements, /*multiLine*/ true);
             if (currentModuleInfo.hasExportStarsToExportValues) {
                 // If we have any `export * from ...` declarations
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index 37383082983..0315fd516b5 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -41,6 +41,7 @@ compile(process.argv.slice(2), {
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 function compile(fileNames, options) {
     var program = ts.createProgram(fileNames, options);
@@ -60,4 +61,3 @@ compile(process.argv.slice(2), {
     noEmitOnError: true, noImplicitAny: true,
     target: ts.ScriptTarget.ES5, module: ts.ModuleKind.CommonJS
 });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index cc57b184960..57ebd64c4e2 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -71,6 +71,7 @@ fileNames.forEach(fileName => {
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 function delint(sourceFile) {
     delintNode(sourceFile);
@@ -117,4 +118,3 @@ fileNames.forEach(function (fileName) {
     // delint it
     delint(sourceFile);
 });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/APISample_parseConfig.js b/tests/baselines/reference/APISample_parseConfig.js
index d97acbdc14f..77f0a07c1df 100644
--- a/tests/baselines/reference/APISample_parseConfig.js
+++ b/tests/baselines/reference/APISample_parseConfig.js
@@ -43,6 +43,7 @@ export function createProgram(rootFiles: string[], compilerOptionsJson: string):
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 function printError(error) {
     if (!error) {
@@ -68,4 +69,3 @@ function createProgram(rootFiles, compilerOptionsJson) {
     return ts.createProgram(rootFiles, settings.options);
 }
 exports.createProgram = createProgram;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index 1156d643354..0716e59edb7 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/tests/baselines/reference/APISample_transform.js
@@ -23,8 +23,8 @@ console.log(JSON.stringify(result));
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 var source = "let x: string  = 'string'";
 var result = ts.transpile(source, { module: ts.ModuleKind.CommonJS });
 console.log(JSON.stringify(result));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index d877071a228..f4400ccda4c 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/tests/baselines/reference/APISample_watcher.js
@@ -116,6 +116,7 @@ watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS });
  *       Please log a "breaking change" issue for any API breaking change affecting this issue
  */
 "use strict";
+exports.__esModule = true;
 var ts = require("typescript");
 function watch(rootFileNames, options) {
     var files = {};
@@ -189,4 +190,3 @@ var currentDirectoryFiles = fs.readdirSync(process.cwd()).
     filter(function (fileName) { return fileName.length >= 3 && fileName.substr(fileName.length - 3, 3) === ".ts"; });
 // Start the watcher
 watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasAssignments.js b/tests/baselines/reference/aliasAssignments.js
index 84e20daa7c7..c21fe575e76 100644
--- a/tests/baselines/reference/aliasAssignments.js
+++ b/tests/baselines/reference/aliasAssignments.js
@@ -15,18 +15,18 @@ y = moduleA; // should be error
 
 //// [aliasAssignments_moduleA.js]
 "use strict";
+exports.__esModule = true;
 var someClass = (function () {
     function someClass() {
     }
     return someClass;
 }());
 exports.someClass = someClass;
-exports.__esModule = true;
 //// [aliasAssignments_1.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasAssignments_moduleA");
 var x = moduleA;
 x = 1; // Should be error
 var y = 1;
 y = moduleA; // should be error
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.js b/tests/baselines/reference/aliasOnMergedModuleInterface.js
index 8fbeaf78d95..d3d312e53bb 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.js
+++ b/tests/baselines/reference/aliasOnMergedModuleInterface.js
@@ -24,7 +24,7 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err
 //// [aliasOnMergedModuleInterface_0.js]
 //// [aliasOnMergedModuleInterface_1.js]
 "use strict";
+exports.__esModule = true;
 var z;
 z.bar("hello"); // This should be ok
 var x = foo.bar("hello"); // foo.A should be ok but foo.bar should be error
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
index 03888704e70..883cbb84ee3 100644
--- a/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
+++ b/tests/baselines/reference/aliasUsageInAccessorsOfClass.js
@@ -29,13 +29,13 @@ class C2 {
 
 //// [aliasUsage1_backbone.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [aliasUsage1_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -48,6 +48,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var Backbone = require("./aliasUsage1_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -57,9 +58,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [aliasUsage1_main.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var moduleA = require("./aliasUsage1_moduleA");
 var C2 = (function () {
     function C2() {
@@ -76,4 +77,3 @@ var C2 = (function () {
     });
     return C2;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/aliasUsageInArray.js b/tests/baselines/reference/aliasUsageInArray.js
index 5be50e00f30..1ccbc958aec 100644
--- a/tests/baselines/reference/aliasUsageInArray.js
+++ b/tests/baselines/reference/aliasUsageInArray.js
@@ -23,13 +23,13 @@ var xs2: typeof moduleA[] = [moduleA];
 
 //// [aliasUsageInArray_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInArray_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -42,6 +42,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInArray_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -51,10 +52,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInArray_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInArray_moduleA");
 var xs = [moduleA];
 var xs2 = [moduleA];
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInFunctionExpression.js b/tests/baselines/reference/aliasUsageInFunctionExpression.js
index 0f15ecda6ac..de661ae803e 100644
--- a/tests/baselines/reference/aliasUsageInFunctionExpression.js
+++ b/tests/baselines/reference/aliasUsageInFunctionExpression.js
@@ -22,13 +22,13 @@ f = (x) => moduleA;
 
 //// [aliasUsageInFunctionExpression_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInFunctionExpression_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -41,6 +41,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInFunctionExpression_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -50,10 +51,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInFunctionExpression_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInFunctionExpression_moduleA");
 var f = function (x) { return x; };
 f = function (x) { return moduleA; };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInGenericFunction.js b/tests/baselines/reference/aliasUsageInGenericFunction.js
index 8c61ddeefb8..2ca49ea8dfc 100644
--- a/tests/baselines/reference/aliasUsageInGenericFunction.js
+++ b/tests/baselines/reference/aliasUsageInGenericFunction.js
@@ -26,13 +26,13 @@ var r2 = foo({ a: <IHasVisualizationModel>null });
 
 //// [aliasUsageInGenericFunction_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInGenericFunction_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -45,6 +45,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInGenericFunction_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -54,13 +55,12 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInGenericFunction_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInGenericFunction_moduleA");
 function foo(x) {
     return x;
 }
 var r = foo({ a: moduleA });
 var r2 = foo({ a: null });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInIndexerOfClass.js b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
index acd4dd1f533..81084b8b92f 100644
--- a/tests/baselines/reference/aliasUsageInIndexerOfClass.js
+++ b/tests/baselines/reference/aliasUsageInIndexerOfClass.js
@@ -28,13 +28,13 @@ class N2 {
 
 //// [aliasUsageInIndexerOfClass_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInIndexerOfClass_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -47,6 +47,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInIndexerOfClass_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -56,9 +57,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInIndexerOfClass_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInIndexerOfClass_moduleA");
 var N = (function () {
     function N() {
@@ -71,4 +72,3 @@ var N2 = (function () {
     }
     return N2;
 }());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInObjectLiteral.js b/tests/baselines/reference/aliasUsageInObjectLiteral.js
index 10dcc50083c..6f4adfae58c 100644
--- a/tests/baselines/reference/aliasUsageInObjectLiteral.js
+++ b/tests/baselines/reference/aliasUsageInObjectLiteral.js
@@ -23,13 +23,13 @@ var c: { y: { z: IHasVisualizationModel } } = { y: { z: moduleA } };
 
 //// [aliasUsageInObjectLiteral_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInObjectLiteral_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -42,6 +42,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInObjectLiteral_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -51,11 +52,10 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInObjectLiteral_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInObjectLiteral_moduleA");
 var a = { x: moduleA };
 var b = { x: moduleA };
 var c = { y: { z: moduleA } };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInOrExpression.js b/tests/baselines/reference/aliasUsageInOrExpression.js
index 07dea7ea22d..178ccaaee23 100644
--- a/tests/baselines/reference/aliasUsageInOrExpression.js
+++ b/tests/baselines/reference/aliasUsageInOrExpression.js
@@ -26,13 +26,13 @@ var f: { x: IHasVisualizationModel } = <{ x: IHasVisualizationModel }>null ? { x
 
 //// [aliasUsageInOrExpression_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInOrExpression_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -45,6 +45,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInOrExpression_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -54,9 +55,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInOrExpression_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInOrExpression_moduleA");
 var i;
 var d1 = i || moduleA;
@@ -64,4 +65,3 @@ var d2 = i || moduleA;
 var d2 = moduleA || i;
 var e = null || { x: moduleA };
 var f = null ? { x: moduleA } : null;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
index 509797bd260..5ac28396fba 100644
--- a/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
+++ b/tests/baselines/reference/aliasUsageInTypeArgumentOfExtendsClause.js
@@ -26,13 +26,13 @@ class D extends C<IHasVisualizationModel> {
 
 //// [aliasUsageInTypeArgumentOfExtendsClause_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInTypeArgumentOfExtendsClause_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -45,6 +45,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInTypeArgumentOfExtendsClause_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -54,7 +55,6 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInTypeArgumentOfExtendsClause_main.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -67,6 +67,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var moduleA = require("./aliasUsageInTypeArgumentOfExtendsClause_moduleA");
 var C = (function () {
     function C() {
@@ -82,4 +83,3 @@ var D = (function (_super) {
     }
     return D;
 }(C));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsageInVarAssignment.js b/tests/baselines/reference/aliasUsageInVarAssignment.js
index e5c7af13078..a85d61fd34c 100644
--- a/tests/baselines/reference/aliasUsageInVarAssignment.js
+++ b/tests/baselines/reference/aliasUsageInVarAssignment.js
@@ -22,13 +22,13 @@ var m: typeof moduleA = i;
 
 //// [aliasUsageInVarAssignment_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [aliasUsageInVarAssignment_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -41,6 +41,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./aliasUsageInVarAssignment_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -50,9 +51,8 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [aliasUsageInVarAssignment_main.js]
 "use strict";
+exports.__esModule = true;
 var i;
 var m = i;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasUsedAsNameValue.js b/tests/baselines/reference/aliasUsedAsNameValue.js
index b86051d7b19..168567eb80f 100644
--- a/tests/baselines/reference/aliasUsedAsNameValue.js
+++ b/tests/baselines/reference/aliasUsedAsNameValue.js
@@ -23,11 +23,12 @@ export var a = function () {
 exports.__esModule = true;
 //// [aliasUsedAsNameValue_1.js]
 "use strict";
+exports.__esModule = true;
 function b(a) { return null; }
 exports.b = b;
-exports.__esModule = true;
 //// [aliasUsedAsNameValue_2.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='aliasUsedAsNameValue_0.ts' />
 ///<reference path='aliasUsedAsNameValue_1.ts' />
 var mod = require("./aliasUsedAsNameValue_0");
@@ -36,4 +37,3 @@ exports.a = function () {
     //var x = mod.id; // TODO needed hack that mod is loaded
     b.b(mod);
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
index 9cc8372a0bb..58565bbb916 100644
--- a/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
+++ b/tests/baselines/reference/aliasWithInterfaceExportAssignmentUsedInVarInitializer.js
@@ -15,5 +15,5 @@ var d = b.q3;
 exports.__esModule = true;
 //// [aliasWithInterfaceExportAssignmentUsedInVarInitializer_1.js]
 "use strict";
-var d = b.q3;
 exports.__esModule = true;
+var d = b.q3;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports1.js b/tests/baselines/reference/allowSyntheticDefaultImports1.js
index dceecdd4001..a659eb60151 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports1.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports1.js
@@ -12,15 +12,15 @@ export class Foo {
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-exports.__esModule = true;
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var b_1 = require("./b");
 exports.x = new b_1["default"].Foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports10.js b/tests/baselines/reference/allowSyntheticDefaultImports10.js
index 09e80cc799f..ad3ed5715c0 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports10.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports10.js
@@ -12,7 +12,7 @@ Foo.default.default.foo();
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Foo = require("./b");
 Foo["default"].bar();
 Foo["default"]["default"].foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports4.js b/tests/baselines/reference/allowSyntheticDefaultImports4.js
index 69bfedadc49..762c032b812 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports4.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports4.js
@@ -13,6 +13,6 @@ export var x = new Foo();
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var b_1 = require("./b");
 exports.x = new b_1["default"]();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports9.js b/tests/baselines/reference/allowSyntheticDefaultImports9.js
index a455f0e7570..2d8ab463d83 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports9.js
+++ b/tests/baselines/reference/allowSyntheticDefaultImports9.js
@@ -12,7 +12,7 @@ Foo.foo();
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var b_1 = require("./b");
 b_1["default"].bar();
 b_1["default"].foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/alwaysStrictModule4.js b/tests/baselines/reference/alwaysStrictModule4.js
index 7ca68d85000..dcaafdfeee6 100644
--- a/tests/baselines/reference/alwaysStrictModule4.js
+++ b/tests/baselines/reference/alwaysStrictModule4.js
@@ -5,6 +5,6 @@ export const a = 1
 
 //// [alwaysStrictModule4.js]
 "use strict";
+exports.__esModule = true;
 // Module commonjs
 exports.a = 1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/alwaysStrictModule6.js b/tests/baselines/reference/alwaysStrictModule6.js
index 161e341ba79..cd97b55b67b 100644
--- a/tests/baselines/reference/alwaysStrictModule6.js
+++ b/tests/baselines/reference/alwaysStrictModule6.js
@@ -5,6 +5,6 @@ export const a = 1;
 
 //// [alwaysStrictModule6.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // Targeting ES5
 exports.a = 1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/ambientDeclarationsExternal.js b/tests/baselines/reference/ambientDeclarationsExternal.js
index 7f8741d3baf..dfff030b78f 100644
--- a/tests/baselines/reference/ambientDeclarationsExternal.js
+++ b/tests/baselines/reference/ambientDeclarationsExternal.js
@@ -28,8 +28,8 @@ var n: number;
 // Ambient external import declaration referencing ambient external module using top level module name 
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 // Ambient external module members are always exported with or without export keyword when module lacks export assignment
 var imp3 = require("equ2");
 var n = imp3.x;
 var n;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.js b/tests/baselines/reference/ambientDeclarationsPatterns.js
index fac34990e5e..84088d11d4e 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns.js
+++ b/tests/baselines/reference/ambientDeclarationsPatterns.js
@@ -34,6 +34,7 @@ foo(fileText);
 
 //// [user.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path="declarations.d.ts" />
 var foobarbaz_1 = require("foobarbaz");
 foobarbaz_1.foo(foobarbaz_1.baz);
@@ -42,4 +43,3 @@ foobarbaz_1.foo(foosball_1.foos);
 // Works with relative file name
 var file_text_1 = require("./file!text");
 foobarbaz_1.foo(file_text_1["default"]);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/ambientExternalModuleMerging.js b/tests/baselines/reference/ambientExternalModuleMerging.js
index 0dddb3a307c..6c2de62c90a 100644
--- a/tests/baselines/reference/ambientExternalModuleMerging.js
+++ b/tests/baselines/reference/ambientExternalModuleMerging.js
@@ -19,9 +19,9 @@ declare module "M" {
 //// [ambientExternalModuleMerging_use.js]
 define(["require", "exports", "M"], function (require, exports, M) {
     "use strict";
+    exports.__esModule = true;
     // Should be strings
     var x = M.x;
     var y = M.y;
-    exports.__esModule = true;
 });
 //// [ambientExternalModuleMerging_declare.js]
diff --git a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
index 537c765a482..9efd9e4ada9 100644
--- a/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
+++ b/tests/baselines/reference/ambientExternalModuleWithInternalImportDeclaration.js
@@ -22,6 +22,6 @@ var c = new A();
 //// [ambientExternalModuleWithInternalImportDeclaration_1.js]
 define(["require", "exports", "M"], function (require, exports, A) {
     "use strict";
-    var c = new A();
     exports.__esModule = true;
+    var c = new A();
 });
diff --git a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
index 692c5707332..98d3d46912a 100644
--- a/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
+++ b/tests/baselines/reference/ambientExternalModuleWithoutInternalImportDeclaration.js
@@ -21,6 +21,6 @@ var c = new A();
 //// [ambientExternalModuleWithoutInternalImportDeclaration_1.js]
 define(["require", "exports", "M"], function (require, exports, A) {
     "use strict";
-    var c = new A();
     exports.__esModule = true;
+    var c = new A();
 });
diff --git a/tests/baselines/reference/ambientShorthand.js b/tests/baselines/reference/ambientShorthand.js
index 5dd15c8e0ef..a7513e7eb58 100644
--- a/tests/baselines/reference/ambientShorthand.js
+++ b/tests/baselines/reference/ambientShorthand.js
@@ -15,9 +15,9 @@ foo(bar, baz, boom);
 
 //// [user.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path="declarations.d.ts"/>
 var jquery_1 = require("jquery");
 var baz = require("fs");
 var boom = require("jquery");
 jquery_1["default"](jquery_1.bar, baz, boom);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/ambientShorthand_reExport.js b/tests/baselines/reference/ambientShorthand_reExport.js
index 6818cca28d3..6842d0f7554 100644
--- a/tests/baselines/reference/ambientShorthand_reExport.js
+++ b/tests/baselines/reference/ambientShorthand_reExport.js
@@ -18,20 +18,20 @@ x($);
 
 //// [reExportX.js]
 "use strict";
+exports.__esModule = true;
 var jquery_1 = require("jquery");
 exports.x = jquery_1.x;
-exports.__esModule = true;
 //// [reExportAll.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-__export(require("jquery"));
 exports.__esModule = true;
+__export(require("jquery"));
 //// [reExportUser.js]
 "use strict";
+exports.__esModule = true;
 var reExportX_1 = require("./reExportX");
 var $ = require("./reExportAll");
 // '$' is not callable, it is an object.
 reExportX_1.x($);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/amdDependencyComment1.js b/tests/baselines/reference/amdDependencyComment1.js
index 1c5594ea7c3..6be26909f3a 100644
--- a/tests/baselines/reference/amdDependencyComment1.js
+++ b/tests/baselines/reference/amdDependencyComment1.js
@@ -7,6 +7,6 @@ m1.f();
 //// [amdDependencyComment1.js]
 ///<amd-dependency path='bar'/>
 "use strict";
+exports.__esModule = true;
 var m1 = require("m2");
 m1.f();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/amdDependencyComment2.js b/tests/baselines/reference/amdDependencyComment2.js
index db87e4e9422..222093cf159 100644
--- a/tests/baselines/reference/amdDependencyComment2.js
+++ b/tests/baselines/reference/amdDependencyComment2.js
@@ -8,6 +8,6 @@ m1.f();
 ///<amd-dependency path='bar'/>
 define(["require", "exports", "m2", "bar"], function (require, exports, m1) {
     "use strict";
-    m1.f();
     exports.__esModule = true;
+    m1.f();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName1.js b/tests/baselines/reference/amdDependencyCommentName1.js
index e886d4b1579..d0e4d73fb7a 100644
--- a/tests/baselines/reference/amdDependencyCommentName1.js
+++ b/tests/baselines/reference/amdDependencyCommentName1.js
@@ -7,6 +7,6 @@ m1.f();
 //// [amdDependencyCommentName1.js]
 ///<amd-dependency path='bar' name='b'/>
 "use strict";
+exports.__esModule = true;
 var m1 = require("m2");
 m1.f();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js
index bb2fc9a2389..c39902371a0 100644
--- a/tests/baselines/reference/amdDependencyCommentName2.js
+++ b/tests/baselines/reference/amdDependencyCommentName2.js
@@ -8,6 +8,6 @@ m1.f();
 ///<amd-dependency path='bar' name='b'/>
 define(["require", "exports", "bar", "m2"], function (require, exports, b, m1) {
     "use strict";
-    m1.f();
     exports.__esModule = true;
+    m1.f();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js
index dafbe2463f9..f842ad0cbf8 100644
--- a/tests/baselines/reference/amdDependencyCommentName3.js
+++ b/tests/baselines/reference/amdDependencyCommentName3.js
@@ -12,6 +12,6 @@ m1.f();
 ///<amd-dependency path='goo' name='c'/>
 define(["require", "exports", "bar", "goo", "m2", "foo"], function (require, exports, b, c, m1) {
     "use strict";
-    m1.f();
     exports.__esModule = true;
+    m1.f();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js
index d82eab0d12f..6542aa14fa2 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.js
+++ b/tests/baselines/reference/amdDependencyCommentName4.js
@@ -27,9 +27,9 @@ import "unaliasedModule2";
 ///<amd-dependency path='unaliasedModule4'/>
 define(["require", "exports", "aliasedModule5", "aliasedModule6", "aliasedModule1", "aliasedModule2", "aliasedModule3", "aliasedModule4", "unaliasedModule3", "unaliasedModule4", "unaliasedModule1", "unaliasedModule2"], function (require, exports, n1, n2, r1, aliasedModule2_1, aliasedModule3_1, ns) {
     "use strict";
+    exports.__esModule = true;
     r1;
     aliasedModule2_1.p1;
     aliasedModule3_1["default"];
     ns;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/amdImportAsPrimaryExpression.js b/tests/baselines/reference/amdImportAsPrimaryExpression.js
index b1275322069..7819c0c7205 100644
--- a/tests/baselines/reference/amdImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportAsPrimaryExpression.js
@@ -15,18 +15,18 @@ if(foo.E1.A === 0){
 //// [foo_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var E1;
     (function (E1) {
         E1[E1["A"] = 0] = "A";
         E1[E1["B"] = 1] = "B";
         E1[E1["C"] = 2] = "C";
     })(E1 = exports.E1 || (exports.E1 = {}));
-    exports.__esModule = true;
 });
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.E1.A === 0) {
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
index 7f75124dba7..651ae7a6d39 100644
--- a/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/amdImportNotAsPrimaryExpression.js
@@ -34,6 +34,7 @@ var e: number = <foo.E1>0;
 //// [foo_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
             this.m1 = 42;
@@ -48,15 +49,14 @@ define(["require", "exports"], function (require, exports) {
         E1[E1["B"] = 1] = "B";
         E1[E1["C"] = 2] = "C";
     })(E1 = exports.E1 || (exports.E1 = {}));
-    exports.__esModule = true;
 });
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var i;
     var x = {};
     var y = false;
     var z;
     var e = 0;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/anonymousDefaultExportsAmd.js b/tests/baselines/reference/anonymousDefaultExportsAmd.js
index a3b8b7cd98a..24e833b7542 100644
--- a/tests/baselines/reference/anonymousDefaultExportsAmd.js
+++ b/tests/baselines/reference/anonymousDefaultExportsAmd.js
@@ -9,15 +9,15 @@ export default function() {}
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class default_1 {
     }
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function default_1() { }
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
index dbfdfd0f420..e22000856d6 100644
--- a/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
+++ b/tests/baselines/reference/anonymousDefaultExportsCommonjs.js
@@ -8,12 +8,12 @@ export default function() {}
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class default_1 {
 }
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function default_1() { }
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/anonymousDefaultExportsUmd.js b/tests/baselines/reference/anonymousDefaultExportsUmd.js
index a8984434c9c..484238b8722 100644
--- a/tests/baselines/reference/anonymousDefaultExportsUmd.js
+++ b/tests/baselines/reference/anonymousDefaultExportsUmd.js
@@ -17,10 +17,10 @@ export default function() {}
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class default_1 {
     }
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 (function (factory) {
@@ -33,7 +33,7 @@ export default function() {}
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function default_1() { }
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/asOperator4.js b/tests/baselines/reference/asOperator4.js
index b19fa3ca14c..3a43f328f35 100644
--- a/tests/baselines/reference/asOperator4.js
+++ b/tests/baselines/reference/asOperator4.js
@@ -14,13 +14,13 @@ import { foo } from './foo';
 
 //// [foo.js]
 "use strict";
+exports.__esModule = true;
 function foo() { }
 exports.foo = foo;
-exports.__esModule = true;
 //// [bar.js]
 "use strict";
+exports.__esModule = true;
 var foo_1 = require("./foo");
 // These should emit identically
 foo_1.foo;
 foo_1.foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
index 06b9fd14682..bd05f90a26e 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
@@ -77,6 +77,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 var _this = this;
+Object.defineProperty(exports, "__esModule", { value: true });
 var missing_1 = require("missing");
 function f0() {
     return __awaiter(this, void 0, void 0, function () { return __generator(this, function (_a) {
@@ -190,4 +191,3 @@ var M;
     }
     M.f1 = f1;
 })(M || (M = {}));
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js
index 25a771ffbfb..550f0d2357e 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var Task = (function (_super) {
     __extends(Task, _super);
     function Task() {
@@ -29,7 +30,6 @@ var Task = (function (_super) {
     return Task;
 }(Promise));
 exports.Task = Task;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -67,6 +67,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var task_1 = require("./task");
 var Test = (function () {
     function Test() {
@@ -78,4 +79,3 @@ var Test = (function () {
     };
     return Test;
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/asyncImportedPromise_es6.js b/tests/baselines/reference/asyncImportedPromise_es6.js
index b3fa2c4b491..6b84f5615b3 100644
--- a/tests/baselines/reference/asyncImportedPromise_es6.js
+++ b/tests/baselines/reference/asyncImportedPromise_es6.js
@@ -11,10 +11,10 @@ class Test {
 
 //// [task.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class Task extends Promise {
 }
 exports.Task = Task;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -25,9 +25,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 class Test {
     example() {
         return __awaiter(this, void 0, void 0, function* () { return; });
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js
index ef176ac90da..7b0bfcf7335 100644
--- a/tests/baselines/reference/augmentExportEquals1.js
+++ b/tests/baselines/reference/augmentExportEquals1.js
@@ -33,6 +33,6 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
-    var a; // should not work
     exports.__esModule = true;
+    var a; // should not work
 });
diff --git a/tests/baselines/reference/augmentExportEquals1_1.js b/tests/baselines/reference/augmentExportEquals1_1.js
index 1e094701f79..51bc67e7fa4 100644
--- a/tests/baselines/reference/augmentExportEquals1_1.js
+++ b/tests/baselines/reference/augmentExportEquals1_1.js
@@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
-    var a; // should not work
     exports.__esModule = true;
+    var a; // should not work
 });
diff --git a/tests/baselines/reference/augmentExportEquals2.js b/tests/baselines/reference/augmentExportEquals2.js
index fe55906b657..efdce1bc0cf 100644
--- a/tests/baselines/reference/augmentExportEquals2.js
+++ b/tests/baselines/reference/augmentExportEquals2.js
@@ -32,6 +32,6 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
-    var a; // should not work
     exports.__esModule = true;
+    var a; // should not work
 });
diff --git a/tests/baselines/reference/augmentExportEquals2_1.js b/tests/baselines/reference/augmentExportEquals2_1.js
index 5b80ef1d512..322ab3b36bf 100644
--- a/tests/baselines/reference/augmentExportEquals2_1.js
+++ b/tests/baselines/reference/augmentExportEquals2_1.js
@@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
-    var a; // should not work
     exports.__esModule = true;
+    var a; // should not work
 });
diff --git a/tests/baselines/reference/augmentExportEquals3.js b/tests/baselines/reference/augmentExportEquals3.js
index 3e12c9968d2..387ef86ff79 100644
--- a/tests/baselines/reference/augmentExportEquals3.js
+++ b/tests/baselines/reference/augmentExportEquals3.js
@@ -36,13 +36,13 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
-    x.b = 1;
     exports.__esModule = true;
+    x.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = x.b;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals3_1.js b/tests/baselines/reference/augmentExportEquals3_1.js
index 9fd08cb8f7f..e91ca4498dd 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.js
+++ b/tests/baselines/reference/augmentExportEquals3_1.js
@@ -30,13 +30,13 @@ let b = x.b;
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, x) {
     "use strict";
-    x.b = 1;
     exports.__esModule = true;
+    x.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "file1", "file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = x.b;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals4.js b/tests/baselines/reference/augmentExportEquals4.js
index 1a83e86f3fc..37be30731de 100644
--- a/tests/baselines/reference/augmentExportEquals4.js
+++ b/tests/baselines/reference/augmentExportEquals4.js
@@ -40,13 +40,13 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
-    x.b = 1;
     exports.__esModule = true;
+    x.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = x.b;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals4_1.js b/tests/baselines/reference/augmentExportEquals4_1.js
index e039e7dcda6..71d39aedb1f 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.js
+++ b/tests/baselines/reference/augmentExportEquals4_1.js
@@ -31,13 +31,13 @@ let b = x.b;
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, x) {
     "use strict";
-    x.b = 1;
     exports.__esModule = true;
+    x.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "file1", "file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = x.b;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals5.js b/tests/baselines/reference/augmentExportEquals5.js
index ee26ddda90e..7bc5102ca9d 100644
--- a/tests/baselines/reference/augmentExportEquals5.js
+++ b/tests/baselines/reference/augmentExportEquals5.js
@@ -90,7 +90,7 @@ define(["require", "exports"], function (require, exports) {
 //// [consumer.js]
 define(["require", "exports", "./augmentation"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     var y = x.id;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals6.js b/tests/baselines/reference/augmentExportEquals6.js
index 2db5bc66e3c..4299f8653dd 100644
--- a/tests/baselines/reference/augmentExportEquals6.js
+++ b/tests/baselines/reference/augmentExportEquals6.js
@@ -52,14 +52,14 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
-    x.B.b = 1;
     exports.__esModule = true;
+    x.B.b = 1;
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.a;
     var c = x.B.b;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentExportEquals6_1.js b/tests/baselines/reference/augmentExportEquals6_1.js
index 6ba35346109..e69728a766b 100644
--- a/tests/baselines/reference/augmentExportEquals6_1.js
+++ b/tests/baselines/reference/augmentExportEquals6_1.js
@@ -34,7 +34,7 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.a;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js
index 32111846162..0a8b7404bd1 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.js
+++ b/tests/baselines/reference/augmentedTypesExternalModule1.js
@@ -6,6 +6,7 @@ module c5 { } // should be ok everywhere
 //// [augmentedTypesExternalModule1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 1;
     var c5 = (function () {
         function c5() {
@@ -13,5 +14,4 @@ define(["require", "exports"], function (require, exports) {
         c5.prototype.foo = function () { };
         return c5;
     }());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/cacheResolutions.js b/tests/baselines/reference/cacheResolutions.js
index 1c8c6ec0168..6b28c90e321 100644
--- a/tests/baselines/reference/cacheResolutions.js
+++ b/tests/baselines/reference/cacheResolutions.js
@@ -13,18 +13,18 @@ export let x = 1;
 //// [app.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [lib1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [lib2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
diff --git a/tests/baselines/reference/chainedImportAlias.js b/tests/baselines/reference/chainedImportAlias.js
index 3af2cc7a5f9..8fcdd501707 100644
--- a/tests/baselines/reference/chainedImportAlias.js
+++ b/tests/baselines/reference/chainedImportAlias.js
@@ -13,15 +13,15 @@ y.m.foo();
 
 //// [chainedImportAlias_file0.js]
 "use strict";
+exports.__esModule = true;
 var m;
 (function (m) {
     function foo() { }
     m.foo = foo;
 })(m = exports.m || (exports.m = {}));
-exports.__esModule = true;
 //// [chainedImportAlias_file1.js]
 "use strict";
+exports.__esModule = true;
 var x = require("./chainedImportAlias_file0");
 var y = x;
 y.m.foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/circularReference.js b/tests/baselines/reference/circularReference.js
index 8d3419f1db6..198a886f026 100644
--- a/tests/baselines/reference/circularReference.js
+++ b/tests/baselines/reference/circularReference.js
@@ -35,6 +35,7 @@ export module M1 {
 
 //// [foo1.js]
 "use strict";
+exports.__esModule = true;
 var foo2 = require("./foo2");
 var M1;
 (function (M1) {
@@ -48,9 +49,9 @@ var M1;
     }());
     M1.C1 = C1;
 })(M1 = exports.M1 || (exports.M1 = {}));
-exports.__esModule = true;
 //// [foo2.js]
 "use strict";
+exports.__esModule = true;
 var foo1 = require("./foo1");
 var M1;
 (function (M1) {
@@ -67,4 +68,3 @@ var M1;
     }());
     M1.C1 = C1;
 })(M1 = exports.M1 || (exports.M1 = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/circularReferenceInImport.js b/tests/baselines/reference/circularReferenceInImport.js
index 28f43fa7985..8b49f45dbd2 100644
--- a/tests/baselines/reference/circularReferenceInImport.js
+++ b/tests/baselines/reference/circularReferenceInImport.js
@@ -17,11 +17,11 @@ export function foo() {
 
 //// [app.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     return new Object();
 }
 exports.foo = foo;
-exports.__esModule = true;
 
 
 //// [app.d.ts]
diff --git a/tests/baselines/reference/classAbstractManyKeywords.js b/tests/baselines/reference/classAbstractManyKeywords.js
index 298395a232c..8ba50dcee1c 100644
--- a/tests/baselines/reference/classAbstractManyKeywords.js
+++ b/tests/baselines/reference/classAbstractManyKeywords.js
@@ -6,6 +6,7 @@ import abstract class D {}
 
 //// [classAbstractManyKeywords.js]
 "use strict";
+exports.__esModule = true;
 exports["default"] = abstract;
 var A = (function () {
     function A() {
@@ -29,4 +30,3 @@ var D = (function () {
     }
     return D;
 }());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/classExtendsAcrossFiles.js b/tests/baselines/reference/classExtendsAcrossFiles.js
index 8a648cc62cd..933f92cad64 100644
--- a/tests/baselines/reference/classExtendsAcrossFiles.js
+++ b/tests/baselines/reference/classExtendsAcrossFiles.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var a_1 = require("./a");
 exports.b = {
     f: function () {
@@ -49,7 +50,6 @@ exports.b = {
         a_1.a.f();
     }
 };
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [a.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -62,6 +62,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var b_1 = require("./b");
 exports.a = {
     f: function () {
@@ -80,4 +81,3 @@ exports.a = {
         b_1.b.f();
     }
 };
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
index ce46e75bed8..d4df05f2ea3 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.js
@@ -21,6 +21,7 @@ export class Test1 {
 var field1;
 //// [classMemberInitializerWithLamdaScoping3_1.js]
 "use strict";
+exports.__esModule = true;
 var Test1 = (function () {
     function Test1(field1) {
         this.field1 = field1;
@@ -33,4 +34,3 @@ var Test1 = (function () {
     return Test1;
 }());
 exports.Test1 = Test1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
index 890d2bbd500..76835e757e0 100644
--- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
+++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.js
@@ -20,6 +20,7 @@ export class Test1 {
 exports.__esModule = true;
 //// [classMemberInitializerWithLamdaScoping3_1.js]
 "use strict";
+exports.__esModule = true;
 var Test1 = (function () {
     function Test1(field1) {
         this.field1 = field1;
@@ -30,4 +31,3 @@ var Test1 = (function () {
     return Test1;
 }());
 exports.Test1 = Test1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAlias.js b/tests/baselines/reference/collisionExportsRequireAndAlias.js
index b6d3159b0f9..487553bb004 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAlias.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAlias.js
@@ -20,22 +20,23 @@ export function foo2() {
 //// [collisionExportsRequireAndAlias_file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function bar() {
     }
     exports.bar = bar;
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAlias_file3333.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function bar2() {
     }
     exports.bar2 = bar2;
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAlias_file2.js]
 define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisionExportsRequireAndAlias_file3333"], function (require, exports, require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() {
         require.bar();
     }
@@ -44,5 +45,4 @@ define(["require", "exports", "collisionExportsRequireAndAlias_file1", "collisio
         exports.bar2();
     }
     exports.foo2 = foo2;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
index cbe0104ebce..1a16f4a2d5f 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientClass.js
@@ -40,10 +40,10 @@ module m4 {
 //// [collisionExportsRequireAndAmbientClass_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m2;
     (function (m2) {
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientClass_globalFile.js]
 var m4;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
index b931a6210cf..0e717b01d3b 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientEnum.js
@@ -63,10 +63,10 @@ module m4 {
 //// [collisionExportsRequireAndAmbientEnum_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m2;
     (function (m2) {
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientEnum_globalFile.js]
 var m4;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
index 5d462fb1ce2..050799d4c2b 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientFunction.js
@@ -16,9 +16,9 @@ module m2 {
 //// [collisionExportsRequireAndAmbientFunction.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m2;
     (function (m2) {
         var a = 10;
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
index 045e7dcb796..2eb5ea74f92 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientModule.js
@@ -97,6 +97,7 @@ module m4 {
 //// [collisionExportsRequireAndAmbientModule_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() {
         return null;
     }
@@ -109,7 +110,6 @@ define(["require", "exports"], function (require, exports) {
     (function (m2) {
         var a = 10;
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientModule_globalFile.js]
 var m4;
diff --git a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
index a75732a65ba..8454248845a 100644
--- a/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
+++ b/tests/baselines/reference/collisionExportsRequireAndAmbientVar.js
@@ -29,11 +29,11 @@ module m4 {
 //// [collisionExportsRequireAndAmbientVar_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m2;
     (function (m2) {
         var a = 10;
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndAmbientVar_globalFile.js]
 var m4;
diff --git a/tests/baselines/reference/collisionExportsRequireAndClass.js b/tests/baselines/reference/collisionExportsRequireAndClass.js
index ca16128e9cd..0bc56b97cf1 100644
--- a/tests/baselines/reference/collisionExportsRequireAndClass.js
+++ b/tests/baselines/reference/collisionExportsRequireAndClass.js
@@ -39,6 +39,7 @@ module m4 {
 //// [collisionExportsRequireAndClass_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var require = (function () {
         function require() {
         }
@@ -79,7 +80,6 @@ define(["require", "exports"], function (require, exports) {
         }());
         m2.exports = exports;
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndClass_globalFile.js]
 var require = (function () {
diff --git a/tests/baselines/reference/collisionExportsRequireAndEnum.js b/tests/baselines/reference/collisionExportsRequireAndEnum.js
index d6fb21ba60a..4bb6614ffe7 100644
--- a/tests/baselines/reference/collisionExportsRequireAndEnum.js
+++ b/tests/baselines/reference/collisionExportsRequireAndEnum.js
@@ -63,6 +63,7 @@ module m4 {
 //// [collisionExportsRequireAndEnum_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var require;
     (function (require) {
         require[require["_thisVal1"] = 0] = "_thisVal1";
@@ -99,7 +100,6 @@ define(["require", "exports"], function (require, exports) {
             exports[exports["_thisVal2"] = 1] = "_thisVal2";
         })(exports = m2.exports || (m2.exports = {}));
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndEnum_globalFile.js]
 var require;
diff --git a/tests/baselines/reference/collisionExportsRequireAndFunction.js b/tests/baselines/reference/collisionExportsRequireAndFunction.js
index 7e538d462b2..1da8cf29d66 100644
--- a/tests/baselines/reference/collisionExportsRequireAndFunction.js
+++ b/tests/baselines/reference/collisionExportsRequireAndFunction.js
@@ -25,6 +25,7 @@ module m2 {
 //// [collisionExportsRequireAndFunction.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function exports() {
         return 1;
     }
@@ -53,5 +54,4 @@ define(["require", "exports"], function (require, exports) {
         }
         m2.require = require;
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
index 7ac6ba06ed6..9cb3c4e797e 100644
--- a/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
+++ b/tests/baselines/reference/collisionExportsRequireAndInternalModuleAlias.js
@@ -25,6 +25,7 @@ module m2 {
 //// [collisionExportsRequireAndInternalModuleAlias.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var m;
     (function (m) {
         var c = (function () {
@@ -52,5 +53,4 @@ define(["require", "exports"], function (require, exports) {
         new m2.exports();
         new m2.require();
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndModule.js b/tests/baselines/reference/collisionExportsRequireAndModule.js
index d1ca4d3a75c..42820955004 100644
--- a/tests/baselines/reference/collisionExportsRequireAndModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndModule.js
@@ -94,6 +94,7 @@ module m4 {
 //// [collisionExportsRequireAndModule_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var require;
     (function (require) {
         var C = (function () {
@@ -162,7 +163,6 @@ define(["require", "exports"], function (require, exports) {
             exports.C = C;
         })(exports = m2.exports || (m2.exports = {}));
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndModule_globalFile.js]
 var require;
diff --git a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
index ba1926dd965..b9552c16223 100644
--- a/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
+++ b/tests/baselines/reference/collisionExportsRequireAndUninstantiatedModule.js
@@ -17,6 +17,7 @@ export function foo2(): exports.I {
 //// [collisionExportsRequireAndUninstantiatedModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() {
         return null;
     }
@@ -25,5 +26,4 @@ define(["require", "exports"], function (require, exports) {
         return null;
     }
     exports.foo2 = foo2;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/collisionExportsRequireAndVar.js b/tests/baselines/reference/collisionExportsRequireAndVar.js
index 9c7a24b176f..9a20472ea68 100644
--- a/tests/baselines/reference/collisionExportsRequireAndVar.js
+++ b/tests/baselines/reference/collisionExportsRequireAndVar.js
@@ -29,6 +29,7 @@ module m4 {
 //// [collisionExportsRequireAndVar_externalmodule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() {
     }
     exports.foo = foo;
@@ -44,7 +45,6 @@ define(["require", "exports"], function (require, exports) {
         m2.exports = 0;
         m2.require = "require";
     })(m2 || (m2 = {}));
-    exports.__esModule = true;
 });
 //// [collisionExportsRequireAndVar_globalFile.js]
 var exports = 0;
diff --git a/tests/baselines/reference/commentOnExportEnumDeclaration.js b/tests/baselines/reference/commentOnExportEnumDeclaration.js
index 33ea3d7fcfb..353b70f4d3c 100644
--- a/tests/baselines/reference/commentOnExportEnumDeclaration.js
+++ b/tests/baselines/reference/commentOnExportEnumDeclaration.js
@@ -8,6 +8,7 @@ export enum Color {
 
 //// [commentOnExportEnumDeclaration.js]
 "use strict";
+exports.__esModule = true;
 /**
  * comment
  */
@@ -17,4 +18,3 @@ var Color;
     Color[Color["g"] = 1] = "g";
     Color[Color["b"] = 2] = "b";
 })(Color = exports.Color || (exports.Color = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/commentsDottedModuleName.js b/tests/baselines/reference/commentsDottedModuleName.js
index cdba9542f54..1c1df104039 100644
--- a/tests/baselines/reference/commentsDottedModuleName.js
+++ b/tests/baselines/reference/commentsDottedModuleName.js
@@ -10,6 +10,7 @@ export module outerModule.InnerModule {
 //// [commentsDottedModuleName.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** this is multi declare module*/
     var outerModule;
     (function (outerModule) {
@@ -24,7 +25,6 @@ define(["require", "exports"], function (require, exports) {
             InnerModule.b = b;
         })(InnerModule = outerModule.InnerModule || (outerModule.InnerModule = {}));
     })(outerModule = exports.outerModule || (exports.outerModule = {}));
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules.js b/tests/baselines/reference/commentsExternalModules.js
index 57cc701941a..39002f90d91 100644
--- a/tests/baselines/reference/commentsExternalModules.js
+++ b/tests/baselines/reference/commentsExternalModules.js
@@ -64,6 +64,7 @@ var newVar2 = new extMod.m4.m2.c();
 //// [commentsExternalModules_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** Module comment*/
     var m1;
     (function (m1) {
@@ -124,16 +125,15 @@ define(["require", "exports"], function (require, exports) {
     })(m4 = exports.m4 || (exports.m4 = {}));
     m4.fooExport();
     var myvar2 = new m4.m2.c();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [commentsExternalModules_1.js]
 define(["require", "exports", "commentsExternalModules_0"], function (require, exports, extMod) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     extMod.m1.fooExport();
     var newVar = new extMod.m1.m2.c();
     extMod.m4.fooExport();
     var newVar2 = new extMod.m4.m2.c();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules2.js b/tests/baselines/reference/commentsExternalModules2.js
index 6ee40426994..d06c588425f 100644
--- a/tests/baselines/reference/commentsExternalModules2.js
+++ b/tests/baselines/reference/commentsExternalModules2.js
@@ -64,6 +64,7 @@ export var newVar2 = new extMod.m4.m2.c();
 //// [commentsExternalModules2_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** Module comment*/
     var m1;
     (function (m1) {
@@ -124,16 +125,15 @@ define(["require", "exports"], function (require, exports) {
     })(m4 = exports.m4 || (exports.m4 = {}));
     m4.fooExport();
     var myvar2 = new m4.m2.c();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [commentsExternalModules_1.js]
 define(["require", "exports", "commentsExternalModules2_0"], function (require, exports, extMod) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     extMod.m1.fooExport();
     exports.newVar = new extMod.m1.m2.c();
     extMod.m4.fooExport();
     exports.newVar2 = new extMod.m4.m2.c();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/commentsExternalModules3.js b/tests/baselines/reference/commentsExternalModules3.js
index ee48cfde328..81e90a159d5 100644
--- a/tests/baselines/reference/commentsExternalModules3.js
+++ b/tests/baselines/reference/commentsExternalModules3.js
@@ -63,6 +63,7 @@ export var newVar2 = new extMod.m4.m2.c();
 
 //// [commentsExternalModules2_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /** Module comment*/
 var m1;
 (function (m1) {
@@ -123,16 +124,15 @@ var m4;
 })(m4 = exports.m4 || (exports.m4 = {}));
 m4.fooExport();
 var myvar2 = new m4.m2.c();
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [commentsExternalModules_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /**This is on import declaration*/
 var extMod = require("./commentsExternalModules2_0"); // trailing comment 1
 extMod.m1.fooExport();
 exports.newVar = new extMod.m1.m2.c();
 extMod.m4.fooExport();
 exports.newVar2 = new extMod.m4.m2.c();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [commentsExternalModules2_0.d.ts]
diff --git a/tests/baselines/reference/commentsMultiModuleMultiFile.js b/tests/baselines/reference/commentsMultiModuleMultiFile.js
index 2c26b93b82d..25dd8a90780 100644
--- a/tests/baselines/reference/commentsMultiModuleMultiFile.js
+++ b/tests/baselines/reference/commentsMultiModuleMultiFile.js
@@ -39,6 +39,7 @@ new multiM.d();
 //// [commentsMultiModuleMultiFile_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** this is multi declare module*/
     var multiM;
     (function (multiM) {
@@ -69,11 +70,11 @@ define(["require", "exports"], function (require, exports) {
     })(multiM = exports.multiM || (exports.multiM = {}));
     new multiM.b();
     new multiM.c();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [commentsMultiModuleMultiFile_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     /** this is multi module 3 comment*/
     var multiM;
     (function (multiM) {
@@ -93,7 +94,6 @@ define(["require", "exports"], function (require, exports) {
         multiM.f = f;
     })(multiM = exports.multiM || (exports.multiM = {}));
     new multiM.d();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/commentsOnRequireStatement.js b/tests/baselines/reference/commentsOnRequireStatement.js
index 6feff1bd813..eee05c80493 100644
--- a/tests/baselines/reference/commentsOnRequireStatement.js
+++ b/tests/baselines/reference/commentsOnRequireStatement.js
@@ -19,14 +19,15 @@ export {subject1} from './1';
 
 //// [0.js]
 "use strict";
-exports.subject = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.subject = 10;
 //// [1.js]
 "use strict";
-exports.subject1 = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.subject1 = 10;
 //// [2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /* blah0 */
 // blah 
 // blah 
@@ -36,4 +37,3 @@ exports.subject = _0_1.subject;
 /* blah1 */
 var _1_1 = require("./1");
 exports.subject1 = _1_1.subject1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
index c1d2a303d7a..ee2846d4a60 100644
--- a/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportAsPrimaryExpression.js
@@ -15,6 +15,7 @@ if(foo.C1.s1){
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 var C1 = (function () {
     function C1() {
         this.m1 = 42;
@@ -23,10 +24,9 @@ var C1 = (function () {
 }());
 C1.s1 = true;
 exports.C1 = C1;
-exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 if (foo.C1.s1) {
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
index 1f37d83c815..5ac0e3fcc64 100644
--- a/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
+++ b/tests/baselines/reference/commonJSImportNotAsPrimaryExpression.js
@@ -33,6 +33,7 @@ var e: number = <foo.E1>0;
 
 //// [foo_0.js]
 "use strict";
+exports.__esModule = true;
 var C1 = (function () {
     function C1() {
         this.m1 = 42;
@@ -47,12 +48,11 @@ var E1;
     E1[E1["B"] = 1] = "B";
     E1[E1["C"] = 2] = "C";
 })(E1 = exports.E1 || (exports.E1 = {}));
-exports.__esModule = true;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var i;
 var x = {};
 var y = false;
 var z;
 var e = 0;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/commonSourceDir5.js b/tests/baselines/reference/commonSourceDir5.js
index f1ec275cf73..ef6e97f4d5e 100644
--- a/tests/baselines/reference/commonSourceDir5.js
+++ b/tests/baselines/reference/commonSourceDir5.js
@@ -19,18 +19,18 @@ export var y = x * i;
 //// [concat.js]
 define("B:/baz", ["require", "exports", "A:/bar", "A:/foo"], function (require, exports, bar_1, foo_1) {
     "use strict";
+    exports.__esModule = true;
     exports.pi = Math.PI;
     exports.y = bar_1.x * foo_1.i;
-    exports.__esModule = true;
 });
 define("A:/foo", ["require", "exports", "B:/baz"], function (require, exports, baz_1) {
     "use strict";
+    exports.__esModule = true;
     exports.i = Math.sqrt(-1);
     exports.z = baz_1.pi * baz_1.pi;
-    exports.__esModule = true;
 });
 define("A:/bar", ["require", "exports", "A:/foo"], function (require, exports, foo_2) {
     "use strict";
-    exports.x = foo_2.z + foo_2.z;
     exports.__esModule = true;
+    exports.x = foo_2.z + foo_2.z;
 });
diff --git a/tests/baselines/reference/commonSourceDir6.js b/tests/baselines/reference/commonSourceDir6.js
index d52fde52cf2..071953afcdc 100644
--- a/tests/baselines/reference/commonSourceDir6.js
+++ b/tests/baselines/reference/commonSourceDir6.js
@@ -18,18 +18,18 @@ export var y = x * i;
 //// [concat.js]
 define("baz", ["require", "exports", "a/bar", "a/foo"], function (require, exports, bar_1, foo_1) {
     "use strict";
+    exports.__esModule = true;
     exports.pi = Math.PI;
     exports.y = bar_1.x * foo_1.i;
-    exports.__esModule = true;
 });
 define("a/foo", ["require", "exports", "baz"], function (require, exports, baz_1) {
     "use strict";
+    exports.__esModule = true;
     exports.i = Math.sqrt(-1);
     exports.z = baz_1.pi * baz_1.pi;
-    exports.__esModule = true;
 });
 define("a/bar", ["require", "exports", "a/foo"], function (require, exports, foo_2) {
     "use strict";
-    exports.x = foo_2.z + foo_2.z;
     exports.__esModule = true;
+    exports.x = foo_2.z + foo_2.z;
 });
diff --git a/tests/baselines/reference/commonSourceDirectory.js b/tests/baselines/reference/commonSourceDirectory.js
index 08e628cac2a..5569ae6d52b 100644
--- a/tests/baselines/reference/commonSourceDirectory.js
+++ b/tests/baselines/reference/commonSourceDirectory.js
@@ -19,11 +19,11 @@ x + y;
 
 //// [/app/bin/index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="../types/bar.d.ts"/>
 var foo_1 = require("foo");
 var bar_1 = require("bar");
 foo_1.x + bar_1.y;
-exports.__esModule = true;
 //# sourceMappingURL=/app/myMapRoot/index.js.map
 
 //// [/app/bin/index.d.ts]
diff --git a/tests/baselines/reference/commonSourceDirectory.js.map b/tests/baselines/reference/commonSourceDirectory.js.map
index 8e3f925eee9..fd88719859b 100644
--- a/tests/baselines/reference/commonSourceDirectory.js.map
+++ b/tests/baselines/reference/commonSourceDirectory.js.map
@@ -1,2 +1,2 @@
 //// [/app/bin/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,yCAAyC;AACzC,2BAAwB;AACxB,2BAAwB;AACxB,OAAC,GAAG,OAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
index 5675c05e34b..c880d2d0059 100644
--- a/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
+++ b/tests/baselines/reference/commonSourceDirectory.sourcemap.txt
@@ -9,13 +9,14 @@ emittedFile:/app/bin/index.js
 sourceFile:index.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>exports.__esModule = true;
 >>>/// <reference path="../types/bar.d.ts"/>
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
 2 >/// <reference path="../types/bar.d.ts"/>
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 42) Source(1, 42) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 42) Source(1, 42) + SourceIndex(0)
 ---
 >>>var foo_1 = require("foo");
 1 >
@@ -24,8 +25,8 @@ sourceFile:index.ts
 1 >
   >
 2 >import { x } from "foo";
-1 >Emitted(3, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(3, 28) Source(2, 25) + SourceIndex(0)
+1 >Emitted(4, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(4, 28) Source(2, 25) + SourceIndex(0)
 ---
 >>>var bar_1 = require("bar");
 1->
@@ -33,8 +34,8 @@ sourceFile:index.ts
 1->
   >
 2 >import { y } from "bar";
-1->Emitted(4, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(4, 28) Source(3, 25) + SourceIndex(0)
+1->Emitted(5, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(5, 28) Source(3, 25) + SourceIndex(0)
 ---
 >>>foo_1.x + bar_1.y;
 1 >
@@ -42,18 +43,17 @@ sourceFile:index.ts
 3 >       ^^^
 4 >          ^^^^^^^
 5 >                 ^
-6 >                  ^^^^^^^^^->
+6 >                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >x
 3 >        + 
 4 >          y
 5 >                 ;
-1 >Emitted(5, 1) Source(4, 1) + SourceIndex(0)
-2 >Emitted(5, 8) Source(4, 2) + SourceIndex(0)
-3 >Emitted(5, 11) Source(4, 5) + SourceIndex(0)
-4 >Emitted(5, 18) Source(4, 6) + SourceIndex(0)
-5 >Emitted(5, 19) Source(4, 7) + SourceIndex(0)
+1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 8) Source(4, 2) + SourceIndex(0)
+3 >Emitted(6, 11) Source(4, 5) + SourceIndex(0)
+4 >Emitted(6, 18) Source(4, 6) + SourceIndex(0)
+5 >Emitted(6, 19) Source(4, 7) + SourceIndex(0)
 ---
->>>exports.__esModule = true;
 >>>//# sourceMappingURL=/app/myMapRoot/index.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js b/tests/baselines/reference/commonSourceDirectory_dts.js
index e49192dbe2f..249edeceddd 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.js
+++ b/tests/baselines/reference/commonSourceDirectory_dts.js
@@ -12,9 +12,9 @@ export const x = y;
 
 //// [/app/bin/index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="../lib/bar.d.ts" />
 exports.x = y;
-exports.__esModule = true;
 //# sourceMappingURL=/app/myMapRoot/index.js.map
 
 //// [/app/bin/index.d.ts]
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.js.map b/tests/baselines/reference/commonSourceDirectory_dts.js.map
index b33518dd04c..552da577884 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.js.map
+++ b/tests/baselines/reference/commonSourceDirectory_dts.js.map
@@ -1,2 +1,2 @@
 //// [/app/bin/index.js.map]
-{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"index.js","sourceRoot":"/app/mySourceRoot/","sources":["index.ts"],"names":[],"mappings":";;AAAA,wCAAwC;AAC3B,QAAA,CAAC,GAAG,CAAC,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
index ccbbc89465d..925a3d30ed4 100644
--- a/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
+++ b/tests/baselines/reference/commonSourceDirectory_dts.sourcemap.txt
@@ -9,13 +9,14 @@ emittedFile:/app/bin/index.js
 sourceFile:index.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>exports.__esModule = true;
 >>>/// <reference path="../lib/bar.d.ts" />
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
 2 >/// <reference path="../lib/bar.d.ts" />
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 41) Source(1, 41) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 41) Source(1, 41) + SourceIndex(0)
 ---
 >>>exports.x = y;
 1 >
@@ -24,7 +25,7 @@ sourceFile:index.ts
 4 >         ^^^
 5 >            ^
 6 >             ^
-7 >              ^^^^^^^^^^^^^->
+7 >              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >export const 
 2 >
@@ -32,12 +33,11 @@ sourceFile:index.ts
 4 >          = 
 5 >            y
 6 >             ;
-1 >Emitted(3, 1) Source(2, 14) + SourceIndex(0)
-2 >Emitted(3, 9) Source(2, 14) + SourceIndex(0)
-3 >Emitted(3, 10) Source(2, 15) + SourceIndex(0)
-4 >Emitted(3, 13) Source(2, 18) + SourceIndex(0)
-5 >Emitted(3, 14) Source(2, 19) + SourceIndex(0)
-6 >Emitted(3, 15) Source(2, 20) + SourceIndex(0)
+1 >Emitted(4, 1) Source(2, 14) + SourceIndex(0)
+2 >Emitted(4, 9) Source(2, 14) + SourceIndex(0)
+3 >Emitted(4, 10) Source(2, 15) + SourceIndex(0)
+4 >Emitted(4, 13) Source(2, 18) + SourceIndex(0)
+5 >Emitted(4, 14) Source(2, 19) + SourceIndex(0)
+6 >Emitted(4, 15) Source(2, 20) + SourceIndex(0)
 ---
->>>exports.__esModule = true;
 >>>//# sourceMappingURL=/app/myMapRoot/index.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/commonjsSafeImport.js b/tests/baselines/reference/commonjsSafeImport.js
index da7c5710610..e7a251e9cee 100644
--- a/tests/baselines/reference/commonjsSafeImport.js
+++ b/tests/baselines/reference/commonjsSafeImport.js
@@ -12,14 +12,14 @@ Foo();
 
 //// [10_lib.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function Foo() { }
 exports.Foo = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var _10_lib_1 = require("./10_lib");
 _10_lib_1.Foo();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [10_lib.d.ts]
diff --git a/tests/baselines/reference/complexNarrowingWithAny.js b/tests/baselines/reference/complexNarrowingWithAny.js
index 5c665a52cb3..4408d64acbf 100644
--- a/tests/baselines/reference/complexNarrowingWithAny.js
+++ b/tests/baselines/reference/complexNarrowingWithAny.js
@@ -562,6 +562,7 @@ export function viewFactory_AppComponent0(viewUtils:any,parentInjector:any,decla
 //// [complexNarrowingWithAny.js]
 // Repro from #10869
 "use strict";
+exports.__esModule = true;
 /**
  * This file is generated by the Angular 2 template compiler.
  * Do not edit.
@@ -1025,4 +1026,3 @@ function viewFactory_AppComponent0(viewUtils, parentInjector, declarationEl) {
     return new _View_AppComponent0(viewUtils, parentInjector, declarationEl);
 }
 exports.viewFactory_AppComponent0 = viewFactory_AppComponent0;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/constDeclarations-access5.js b/tests/baselines/reference/constDeclarations-access5.js
index 9c7c78ad626..f02b9611541 100644
--- a/tests/baselines/reference/constDeclarations-access5.js
+++ b/tests/baselines/reference/constDeclarations-access5.js
@@ -51,12 +51,13 @@ m.x.toString();
 //// [constDeclarations_access_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 0;
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = 0;
 });
 //// [constDeclarations_access_2.js]
 define(["require", "exports", "constDeclarations_access_1"], function (require, exports, m) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     // Errors
     m.x = 1;
     m.x += 2;
@@ -87,5 +88,4 @@ define(["require", "exports", "constDeclarations_access_1"], function (require,
     -m.x;
     +m.x;
     m.x.toString();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/constEnumExternalModule.js b/tests/baselines/reference/constEnumExternalModule.js
index e658dc17347..8ea5625ac07 100644
--- a/tests/baselines/reference/constEnumExternalModule.js
+++ b/tests/baselines/reference/constEnumExternalModule.js
@@ -18,6 +18,6 @@ define(["require", "exports"], function (require, exports) {
 //// [m2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var v = 100 /* V */;
     exports.__esModule = true;
+    var v = 100 /* V */;
 });
diff --git a/tests/baselines/reference/controlFlowBinaryOrExpression.js b/tests/baselines/reference/controlFlowBinaryOrExpression.js
index 8b65f916dfa..752479cf4e9 100644
--- a/tests/baselines/reference/controlFlowBinaryOrExpression.js
+++ b/tests/baselines/reference/controlFlowBinaryOrExpression.js
@@ -38,6 +38,7 @@ if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
 
 //// [controlFlowBinaryOrExpression.js]
 "use strict";
+exports.__esModule = true;
 var x;
 var cond;
 (x = "") || (x = 0);
@@ -55,4 +56,3 @@ if (isHTMLCollection(sourceObj)) {
 if (isNodeList(sourceObj) || isHTMLCollection(sourceObj)) {
     sourceObj.length;
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/controlFlowPropertyDeclarations.js b/tests/baselines/reference/controlFlowPropertyDeclarations.js
index be61fc2c75a..27fce9a9a12 100644
--- a/tests/baselines/reference/controlFlowPropertyDeclarations.js
+++ b/tests/baselines/reference/controlFlowPropertyDeclarations.js
@@ -151,6 +151,7 @@ export class StyleParser {
 //// [controlFlowPropertyDeclarations.js]
 // Repro from ##8913
 "use strict";
+exports.__esModule = true;
 var HTMLDOMPropertyConfig = require('react/lib/HTMLDOMPropertyConfig');
 // Populate property map with ReactJS's attribute and property mappings
 // TODO handle/use .Properties value eg: MUST_USE_PROPERTY is not HTML attr
@@ -289,4 +290,3 @@ var StyleParser = (function () {
     return StyleParser;
 }());
 exports.StyleParser = StyleParser;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/controlFlowSelfReferentialLoop.js b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
index d1422112fff..0a7eff198ff 100644
--- a/tests/baselines/reference/controlFlowSelfReferentialLoop.js
+++ b/tests/baselines/reference/controlFlowSelfReferentialLoop.js
@@ -104,6 +104,7 @@ export default md5;
 //// [controlFlowSelfReferentialLoop.js]
 // Repro from #12319
 "use strict";
+exports.__esModule = true;
 function md5(string) {
     function FF(a, b, c, d, x, s, ac) {
         return 0;
@@ -204,4 +205,3 @@ function md5(string) {
     }
 }
 exports["default"] = md5;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/copyrightWithNewLine1.js b/tests/baselines/reference/copyrightWithNewLine1.js
index 7fa40a63a10..f7c1ac602dd 100644
--- a/tests/baselines/reference/copyrightWithNewLine1.js
+++ b/tests/baselines/reference/copyrightWithNewLine1.js
@@ -15,9 +15,9 @@ greeter.start();
 ****************************/
 define(["require", "exports", "./greeter"], function (require, exports, model) {
     "use strict";
+    exports.__esModule = true;
     var el = document.getElementById('content');
     var greeter = new model.Greeter(el);
     /** things */
     greeter.start();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/copyrightWithoutNewLine1.js b/tests/baselines/reference/copyrightWithoutNewLine1.js
index 4b31d599713..0f479c3db7f 100644
--- a/tests/baselines/reference/copyrightWithoutNewLine1.js
+++ b/tests/baselines/reference/copyrightWithoutNewLine1.js
@@ -11,9 +11,9 @@ greeter.start();
 //// [copyrightWithoutNewLine1.js]
 define(["require", "exports", "./greeter"], function (require, exports, model) {
     "use strict";
+    exports.__esModule = true;
     var el = document.getElementById('content');
     var greeter = new model.Greeter(el);
     /** things */
     greeter.start();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
index 67eba038d46..d555d3f3bca 100644
--- a/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckInvocationExpression.js
@@ -15,6 +15,7 @@ export var compileServer = task<number, number, any>(<P0, P1, P2>() => {
 //// [crashIntypeCheckInvocationExpression.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var nake;
     function doCompile(fileset, moduleType) {
         return undefined;
@@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) {
         var folder = path.join(), fileset = nake.fileSetSync(folder);
         return doCompile(fileset, moduleType);
     });
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
index 48fe4dad45f..a115e7ab0a3 100644
--- a/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
+++ b/tests/baselines/reference/crashIntypeCheckObjectCreationExpression.js
@@ -11,6 +11,7 @@ export class BuildWorkspaceService {
 //// [crashIntypeCheckObjectCreationExpression.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var BuildWorkspaceService = (function () {
         function BuildWorkspaceService() {
         }
@@ -22,5 +23,4 @@ define(["require", "exports"], function (require, exports) {
         return BuildWorkspaceService;
     }());
     exports.BuildWorkspaceService = BuildWorkspaceService;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/declFileAccessors.js b/tests/baselines/reference/declFileAccessors.js
index b0cc0c8fbaa..64a99bb8438 100644
--- a/tests/baselines/reference/declFileAccessors.js
+++ b/tests/baselines/reference/declFileAccessors.js
@@ -103,6 +103,7 @@ class c2 {
 
 //// [declFileAccessors_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /** This is comment for c1*/
 var c1 = (function () {
     function c1() {
@@ -185,7 +186,6 @@ var c1 = (function () {
     return c1;
 }());
 exports.c1 = c1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileAccessors_1.js]
 /** This is comment for c2 - the global class*/
 var c2 = (function () {
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
index f89863a3029..56b8992811b 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration.js
@@ -10,18 +10,18 @@ import foo = require("./declFileAliasUseBeforeDeclaration_foo");
 
 //// [declFileAliasUseBeforeDeclaration_foo.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-exports.__esModule = true;
 //// [declFileAliasUseBeforeDeclaration_test.js]
 "use strict";
+exports.__esModule = true;
 function bar(a) { }
 exports.bar = bar;
-exports.__esModule = true;
 
 
 //// [declFileAliasUseBeforeDeclaration_foo.d.ts]
diff --git a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
index 218157185af..ee1964415c9 100644
--- a/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
+++ b/tests/baselines/reference/declFileClassWithStaticMethodReturningConstructor.js
@@ -8,6 +8,7 @@ export class Enhancement {
 
 //// [declFileClassWithStaticMethodReturningConstructor.js]
 "use strict";
+exports.__esModule = true;
 var Enhancement = (function () {
     function Enhancement() {
     }
@@ -17,7 +18,6 @@ var Enhancement = (function () {
     return Enhancement;
 }());
 exports.Enhancement = Enhancement;
-exports.__esModule = true;
 
 
 //// [declFileClassWithStaticMethodReturningConstructor.d.ts]
diff --git a/tests/baselines/reference/declFileConstructors.js b/tests/baselines/reference/declFileConstructors.js
index 87cf77e733e..214620193b7 100644
--- a/tests/baselines/reference/declFileConstructors.js
+++ b/tests/baselines/reference/declFileConstructors.js
@@ -99,6 +99,7 @@ class GlobalConstructorWithParameterInitializer {
 
 //// [declFileConstructors_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SimpleConstructor = (function () {
     /** This comment should appear for foo*/
     function SimpleConstructor() {
@@ -162,7 +163,6 @@ var ConstructorWithParameterInitializer = (function () {
     return ConstructorWithParameterInitializer;
 }());
 exports.ConstructorWithParameterInitializer = ConstructorWithParameterInitializer;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileConstructors_1.js]
 var GlobalSimpleConstructor = (function () {
     /** This comment should appear for foo*/
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
index e9d140ae2e2..1caa9207193 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
@@ -20,8 +20,8 @@ define(["require", "exports"], function (require, exports) {
 //// [declFileExportAssignmentOfGenericInterface_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x.a;
     exports.__esModule = true;
+    exports.x.a;
 });
 
 
diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js
index a03fa43afff..2af2103b62a 100644
--- a/tests/baselines/reference/declFileExportImportChain.js
+++ b/tests/baselines/reference/declFileExportImportChain.js
@@ -44,8 +44,8 @@ define(["require", "exports"], function (require, exports) {
 //// [declFileExportImportChain_b.js]
 define(["require", "exports", "declFileExportImportChain_a"], function (require, exports, a) {
     "use strict";
-    exports.a = a;
     exports.__esModule = true;
+    exports.a = a;
 });
 //// [declFileExportImportChain_b1.js]
 define(["require", "exports", "declFileExportImportChain_b"], function (require, exports, b) {
@@ -55,8 +55,8 @@ define(["require", "exports", "declFileExportImportChain_b"], function (require,
 //// [declFileExportImportChain_c.js]
 define(["require", "exports", "declFileExportImportChain_b1"], function (require, exports, b1) {
     "use strict";
-    exports.b1 = b1;
     exports.__esModule = true;
+    exports.b1 = b1;
 });
 //// [declFileExportImportChain_d.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js
index c7feeec7e8c..70478fdf430 100644
--- a/tests/baselines/reference/declFileExportImportChain2.js
+++ b/tests/baselines/reference/declFileExportImportChain2.js
@@ -46,8 +46,8 @@ define(["require", "exports", "declFileExportImportChain2_a"], function (require
 //// [declFileExportImportChain2_c.js]
 define(["require", "exports", "declFileExportImportChain2_b"], function (require, exports, b) {
     "use strict";
-    exports.b = b;
     exports.__esModule = true;
+    exports.b = b;
 });
 //// [declFileExportImportChain2_d.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/declFileForExportedImport.js b/tests/baselines/reference/declFileForExportedImport.js
index 0bb2c7dfe55..809f01878d4 100644
--- a/tests/baselines/reference/declFileForExportedImport.js
+++ b/tests/baselines/reference/declFileForExportedImport.js
@@ -16,12 +16,12 @@ var z = b.x;
 exports.__esModule = true;
 //// [declFileForExportedImport_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='declFileForExportedImport_0.ts'/>
 exports.a = require("./declFileForExportedImport_0");
 var y = exports.a.x;
 exports.b = exports.a;
 var z = exports.b.x;
-exports.__esModule = true;
 
 
 //// [declFileForExportedImport_0.d.ts]
diff --git a/tests/baselines/reference/declFileFunctions.js b/tests/baselines/reference/declFileFunctions.js
index c93dee4e30e..f62b7772b41 100644
--- a/tests/baselines/reference/declFileFunctions.js
+++ b/tests/baselines/reference/declFileFunctions.js
@@ -79,6 +79,7 @@ function globalfooWithOverloads(a: any): any {
 
 //// [declFileFunctions_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 /** This comment should appear for foo*/
 function foo() {
 }
@@ -145,7 +146,6 @@ function nonExportedFooWithRestParameters(a) {
 function nonExportedFooWithOverloads(a) {
     return a;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileFunctions_1.js]
 /** This comment should appear for foo*/
 function globalfoo() {
diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js
index ab3fc63f450..f56abaf6b97 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -51,6 +51,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var C;
 (function (C) {
     var A = (function () {
@@ -102,7 +103,6 @@ var h = (function (_super) {
 }(C.A));
 exports.h = h;
 exports.j = C.F6;
-exports.__esModule = true;
 
 
 //// [declFileGenericType.d.ts]
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
index d1d9589e8c7..110539774df 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
@@ -32,11 +32,11 @@ var m2;
 module.exports = m2;
 //// [declFileImportModuleWithExportAssignment_1.js]
 "use strict";
+exports.__esModule = true;
 /**This is on import declaration*/
 var a1 = require("./declFileImportModuleWithExportAssignment_0");
 exports.a = a1;
 exports.a.test1(null, null, null);
-exports.__esModule = true;
 
 
 //// [declFileImportModuleWithExportAssignment_0.d.ts]
diff --git a/tests/baselines/reference/declFileMethods.js b/tests/baselines/reference/declFileMethods.js
index dee10473f2c..61e2bfab700 100644
--- a/tests/baselines/reference/declFileMethods.js
+++ b/tests/baselines/reference/declFileMethods.js
@@ -192,6 +192,7 @@ interface I2 {
 
 //// [declFileMethods_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c1 = (function () {
     function c1() {
     }
@@ -274,7 +275,6 @@ var c1 = (function () {
     return c1;
 }());
 exports.c1 = c1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [declFileMethods_1.js]
 var c2 = (function () {
     function c2() {
diff --git a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
index 35a861a6046..698622a8650 100644
--- a/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
+++ b/tests/baselines/reference/declarationEmitClassMemberNameConflict.js
@@ -38,6 +38,7 @@ export class C4 {
 
 //// [declarationEmitClassMemberNameConflict.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var C1 = (function () {
     function C1() {
     }
@@ -91,7 +92,6 @@ var C4 = (function () {
     return C4;
 }());
 exports.C4 = C4;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [declarationEmitClassMemberNameConflict.d.ts]
diff --git a/tests/baselines/reference/declarationEmitExportAssignment.js b/tests/baselines/reference/declarationEmitExportAssignment.js
index 5557ff71020..223376ef8ff 100644
--- a/tests/baselines/reference/declarationEmitExportAssignment.js
+++ b/tests/baselines/reference/declarationEmitExportAssignment.js
@@ -12,11 +12,11 @@ export = foo;
 
 //// [utils.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() { }
 exports.foo = foo;
 function bar() { }
 exports.bar = bar;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [index.js]
 "use strict";
 var utils_1 = require("./utils");
diff --git a/tests/baselines/reference/declarationEmitExportDeclaration.js b/tests/baselines/reference/declarationEmitExportDeclaration.js
index e019203030e..57c39b95e64 100644
--- a/tests/baselines/reference/declarationEmitExportDeclaration.js
+++ b/tests/baselines/reference/declarationEmitExportDeclaration.js
@@ -15,18 +15,18 @@ export {bar};
 
 //// [utils.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() { }
 exports.foo = foo;
 function bar() { }
 exports.bar = bar;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [index.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("./utils");
 exports.bar = utils_1.bar;
 utils_1.foo();
 var obj;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [utils.d.ts]
diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends3.js b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
index a1e3aac8823..a02eac46dba 100644
--- a/tests/baselines/reference/declarationEmitExpressionInExtends3.js
+++ b/tests/baselines/reference/declarationEmitExpressionInExtends3.js
@@ -55,6 +55,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var ExportedClass = (function () {
     function ExportedClass() {
     }
@@ -104,4 +105,3 @@ var MyClass4 = (function (_super) {
     return MyClass4;
 }(getExportedClass(undefined)));
 exports.MyClass4 = MyClass4;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
index 87141cfb699..08208c2435d 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicates01.js
@@ -6,11 +6,11 @@ export function f(x: any): x is number {
 
 //// [declarationEmitIdentifierPredicates01.js]
 "use strict";
+exports.__esModule = true;
 function f(x) {
     return typeof x === "number";
 }
 exports.f = f;
-exports.__esModule = true;
 
 
 //// [declarationEmitIdentifierPredicates01.d.ts]
diff --git a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
index f20654d508c..5829e9b4427 100644
--- a/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitIdentifierPredicatesWithPrivateName01.js
@@ -10,8 +10,8 @@ export function f(x: any): x is I {
 
 //// [declarationEmitIdentifierPredicatesWithPrivateName01.js]
 "use strict";
+exports.__esModule = true;
 function f(x) {
     return typeof x.a === "number";
 }
 exports.f = f;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
index 55500652830..608f172cd1f 100644
--- a/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
+++ b/tests/baselines/reference/declarationEmitInferedDefaultExportType.js
@@ -9,13 +9,13 @@ export default {
 
 //// [declarationEmitInferedDefaultExportType.js]
 "use strict";
+exports.__esModule = true;
 // test.ts
 exports["default"] = {
     foo: [],
     bar: undefined,
     baz: null
 };
-exports.__esModule = true;
 
 
 //// [declarationEmitInferedDefaultExportType.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
index dca7f142dc9..4e41c8558c6 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias1.js
@@ -14,15 +14,15 @@ export { v }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
-exports.__esModule = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
index 9228b766d3f..601026ab6f3 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias2.js
@@ -17,19 +17,19 @@ export { v, bar }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
-exports.__esModule = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
 function bar() {
     return v;
 }
 exports.bar = bar;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
index 8b2783a73fd..30df7e38b01 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias3.js
@@ -14,15 +14,15 @@ export default x;
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
-exports.__esModule = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var x = "hi" || 5;
 exports["default"] = x;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
index 3020721dfc8..24f2a52c5d8 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias5.js
@@ -13,14 +13,14 @@ export { v }
 
 //// [0.js]
 "use strict";
-var obj = true;
 exports.__esModule = true;
+var obj = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 //let v2: Z.Data;
 var v = "str" || true;
 exports.v = v;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
index c7be3aca6b4..5b14a3738e4 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias6.js
@@ -14,15 +14,15 @@ export { v }
 
 //// [0.js]
 "use strict";
+exports.__esModule = true;
 {
     var obj = true;
 }
-exports.__esModule = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
index 2177a17efa5..9a9b1247e24 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias7.js
@@ -11,13 +11,13 @@ export { v }
 
 //// [0.js]
 "use strict";
-var obj = true;
 exports.__esModule = true;
+var obj = true;
 //// [1.js]
 "use strict";
+exports.__esModule = true;
 var v = "str" || true;
 exports.v = v;
-exports.__esModule = true;
 
 
 //// [0.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
index 70560f5a54d..cddb4630740 100644
--- a/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
+++ b/tests/baselines/reference/declarationEmitInferedTypeAlias9.js
@@ -9,12 +9,12 @@ export function returnSomeGlobalValue() {
 
 //// [declarationEmitInferedTypeAlias9.js]
 "use strict";
+exports.__esModule = true;
 var x;
 function returnSomeGlobalValue() {
     return x;
 }
 exports.returnSomeGlobalValue = returnSomeGlobalValue;
-exports.__esModule = true;
 
 
 //// [declarationEmitInferedTypeAlias9.d.ts]
diff --git a/tests/baselines/reference/declarationEmitInvalidExport.js b/tests/baselines/reference/declarationEmitInvalidExport.js
index 4188b673b0b..d4280cd00c6 100644
--- a/tests/baselines/reference/declarationEmitInvalidExport.js
+++ b/tests/baselines/reference/declarationEmitInvalidExport.js
@@ -9,7 +9,7 @@ export type MyClass = typeof myClass;
 
 //// [declarationEmitInvalidExport.js]
 "use strict";
+exports.__esModule = true;
 if (false) {
     export var myClass = 0;
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitNameConflicts.js b/tests/baselines/reference/declarationEmitNameConflicts.js
index 08747bbe198..5440f3d3584 100644
--- a/tests/baselines/reference/declarationEmitNameConflicts.js
+++ b/tests/baselines/reference/declarationEmitNameConflicts.js
@@ -63,6 +63,7 @@ var f;
 module.exports = f;
 //// [declarationEmit_nameConflicts_0.js]
 "use strict";
+exports.__esModule = true;
 var im = require("./declarationEmit_nameConflicts_1");
 var M;
 (function (M) {
@@ -129,7 +130,6 @@ var M;
         })(N = Q.N || (Q.N = {}));
     })(Q = M.Q || (M.Q = {}));
 })(M = exports.M || (exports.M = {}));
-exports.__esModule = true;
 
 
 //// [declarationEmit_nameConflicts_1.d.ts]
diff --git a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
index e5c10ab3484..4b4aca4f4b2 100644
--- a/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
+++ b/tests/baselines/reference/declarationEmitNameConflictsWithAlias.js
@@ -8,10 +8,10 @@ export module M {
 
 //// [declarationEmitNameConflictsWithAlias.js]
 "use strict";
+exports.__esModule = true;
 var M;
 (function (M) {
 })(M = exports.M || (exports.M = {}));
-exports.__esModule = true;
 
 
 //// [declarationEmitNameConflictsWithAlias.d.ts]
diff --git a/tests/baselines/reference/declarationEmitPromise.js b/tests/baselines/reference/declarationEmitPromise.js
index 4f56ad91864..7444a956a2a 100644
--- a/tests/baselines/reference/declarationEmitPromise.js
+++ b/tests/baselines/reference/declarationEmitPromise.js
@@ -32,6 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 class bluebird {
 }
 exports.bluebird = bluebird;
@@ -53,7 +54,6 @@ function runSampleBreaks(a, b, c, d, e) {
     });
 }
 exports.runSampleBreaks = runSampleBreaks;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [declarationEmitPromise.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicates01.js b/tests/baselines/reference/declarationEmitThisPredicates01.js
index 2845a120b74..e95a7db05ed 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates01.js
@@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
@@ -38,7 +39,6 @@ var D = (function (_super) {
     return D;
 }(C));
 exports.D = D;
-exports.__esModule = true;
 
 
 //// [declarationEmitThisPredicates01.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicates02.js b/tests/baselines/reference/declarationEmitThisPredicates02.js
index b9a81b2fb8e..0e7c99df1f3 100644
--- a/tests/baselines/reference/declarationEmitThisPredicates02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicates02.js
@@ -15,13 +15,13 @@ export const obj = {
 
 //// [declarationEmitThisPredicates02.js]
 "use strict";
+exports.__esModule = true;
 exports.obj = {
     m: function () {
         var dis = this;
         return dis.a != null && dis.b != null && dis.c != null;
     }
 };
-exports.__esModule = true;
 
 
 //// [declarationEmitThisPredicates02.d.ts]
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
index 16ae267bc3c..a0f611d2d29 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName01.js
@@ -21,6 +21,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
@@ -37,4 +38,3 @@ var D = (function (_super) {
     }
     return D;
 }(C));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
index fcc373ccbe8..7ec7ba5dec8 100644
--- a/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
+++ b/tests/baselines/reference/declarationEmitThisPredicatesWithPrivateName02.js
@@ -15,10 +15,10 @@ export const obj = {
 
 //// [declarationEmitThisPredicatesWithPrivateName02.js]
 "use strict";
+exports.__esModule = true;
 exports.obj = {
     m: function () {
         var dis = this;
         return dis.a != null && dis.b != null && dis.c != null;
     }
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
index 303959f5504..84b55a9792f 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters1.js
@@ -6,8 +6,8 @@ export const y = (x: Foo<string>) => 1
 
 //// [declarationEmitTypeAliasWithTypeParameters1.js]
 "use strict";
-exports.y = function (x) { return 1; };
 exports.__esModule = true;
+exports.y = function (x) { return 1; };
 
 
 //// [declarationEmitTypeAliasWithTypeParameters1.d.ts]
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
index 52f696a9448..1bb6beac9e1 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters2.js
@@ -7,8 +7,8 @@ export const y = (x: Baa<number>) => 1
 
 //// [declarationEmitTypeAliasWithTypeParameters2.js]
 "use strict";
-exports.y = function (x) { return 1; };
 exports.__esModule = true;
+exports.y = function (x) { return 1; };
 
 
 //// [declarationEmitTypeAliasWithTypeParameters2.d.ts]
diff --git a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
index e6ef1234c3a..28997a75496 100644
--- a/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
+++ b/tests/baselines/reference/declarationEmitTypeAliasWithTypeParameters5.js
@@ -12,7 +12,7 @@ function foo() {
 
 //// [declarationEmitTypeAliasWithTypeParameters5.js]
 "use strict";
+exports.__esModule = true;
 function foo() {
     return {};
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/declarationEmitUnknownImport.js b/tests/baselines/reference/declarationEmitUnknownImport.js
index 686ed8dce2c..1ac1e934578 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport.js
+++ b/tests/baselines/reference/declarationEmitUnknownImport.js
@@ -5,6 +5,6 @@ export {Foo}
 
 //// [declarationEmitUnknownImport.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Foo = SomeNonExistingName;
 exports.Foo = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/declarationEmitUnknownImport2.js b/tests/baselines/reference/declarationEmitUnknownImport2.js
index 10b8b1b9886..1f291312913 100644
--- a/tests/baselines/reference/declarationEmitUnknownImport2.js
+++ b/tests/baselines/reference/declarationEmitUnknownImport2.js
@@ -5,7 +5,7 @@ export default Foo
 
 //// [declarationEmitUnknownImport2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Foo = From;
 './Foo'; // Syntax error
 exports.default = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/declarationMerging2.js b/tests/baselines/reference/declarationMerging2.js
index a08b36e2781..64a6cf2d849 100644
--- a/tests/baselines/reference/declarationMerging2.js
+++ b/tests/baselines/reference/declarationMerging2.js
@@ -18,6 +18,7 @@ declare module "./a" {
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS1.js b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
index d0e8504713d..b624c11e79d 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS1.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS1.js
@@ -14,6 +14,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 let Testing123 = Testing123_1 = class Testing123 {
 };
 Testing123.prop1 = Testing123_1.prop0;
@@ -22,4 +23,3 @@ Testing123 = Testing123_1 = __decorate([
 ], Testing123);
 exports.Testing123 = Testing123;
 var Testing123_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedClassExportsCommonJS2.js b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
index 3e24af5f427..978d8f18402 100644
--- a/tests/baselines/reference/decoratedClassExportsCommonJS2.js
+++ b/tests/baselines/reference/decoratedClassExportsCommonJS2.js
@@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 let Testing123 = Testing123_1 = class Testing123 {
 };
 Testing123 = Testing123_1 = __decorate([
@@ -20,4 +21,3 @@ Testing123 = Testing123_1 = __decorate([
 ], Testing123);
 exports.Testing123 = Testing123;
 var Testing123_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
index bf5e9e5dcfc..dadaa5ed6df 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedAmd.js
@@ -22,6 +22,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let Foo = class Foo {
     };
@@ -29,7 +30,6 @@ define(["require", "exports"], function (require, exports) {
         decorator
     ], Foo);
     exports.default = Foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -40,6 +40,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let default_1 = class {
     };
@@ -47,5 +48,4 @@ define(["require", "exports"], function (require, exports) {
         decorator
     ], default_1);
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
index fe62d15c27f..f6c7b7cbc8b 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedCommonjs.js
@@ -21,6 +21,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var decorator;
 let Foo = class Foo {
 };
@@ -28,7 +29,6 @@ Foo = __decorate([
     decorator
 ], Foo);
 exports.default = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -37,6 +37,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var decorator;
 let default_1 = class {
 };
@@ -44,4 +45,3 @@ default_1 = __decorate([
     decorator
 ], default_1);
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
index e6f4773df7d..beb5fa26755 100644
--- a/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/decoratedDefaultExportsGetExportedUmd.js
@@ -30,6 +30,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let Foo = class Foo {
     };
@@ -37,7 +38,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
         decorator
     ], Foo);
     exports.default = Foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -56,6 +56,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var decorator;
     let default_1 = class {
     };
@@ -63,5 +64,4 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
         decorator
     ], default_1);
     exports.default = default_1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
index 8c4bb8c1266..22e4a448f1e 100644
--- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
+++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
@@ -23,9 +23,9 @@ class Wat {
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 // from #3108
 exports.test = 'abc';
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -34,6 +34,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var a_1 = require("./a");
 function filter(handler) {
     return function (target, propertyKey) {
@@ -51,4 +52,3 @@ var Wat = (function () {
 __decorate([
     filter(function () { return a_1.test == 'abc'; })
 ], Wat, "whatever", null);
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
index 50dbe2cafdc..9998ae3d08a 100644
--- a/tests/baselines/reference/decoratorMetadata.js
+++ b/tests/baselines/reference/decoratorMetadata.js
@@ -20,13 +20,13 @@ class MyComponent {
 
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Service = (function () {
     function Service() {
     }
     return Service;
 }());
 exports.default = Service;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [component.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -38,6 +38,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var service_1 = require("./service");
 var MyComponent = (function () {
     function MyComponent(Service) {
@@ -57,4 +58,3 @@ MyComponent = __decorate([
     decorator,
     __metadata("design:paramtypes", [service_1.default])
 ], MyComponent);
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataOnInferredType.js b/tests/baselines/reference/decoratorMetadataOnInferredType.js
index 653bc911ed4..6f247637729 100644
--- a/tests/baselines/reference/decoratorMetadataOnInferredType.js
+++ b/tests/baselines/reference/decoratorMetadataOnInferredType.js
@@ -19,6 +19,7 @@ export class B {
 
 //// [decoratorMetadataOnInferredType.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
         console.log('new A');
@@ -38,4 +39,3 @@ __decorate([
     __metadata("design:type", Object)
 ], B.prototype, "x", void 0);
 exports.B = B;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
index 9cbc514d932..a65ba5b2f73 100644
--- a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
+++ b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
@@ -42,31 +42,31 @@ export class ClassA {
 
 //// [aux.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SomeClass = (function () {
     function SomeClass() {
     }
     return SomeClass;
 }());
 exports.SomeClass = SomeClass;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [aux1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SomeClass1 = (function () {
     function SomeClass1() {
     }
     return SomeClass1;
 }());
 exports.SomeClass1 = SomeClass1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [aux2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var SomeClass2 = (function () {
     function SomeClass2() {
     }
     return SomeClass2;
 }());
 exports.SomeClass2 = SomeClass2;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -78,6 +78,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var aux_1 = require("./aux");
 var aux1_1 = require("./aux1");
 function annotation() {
@@ -113,4 +114,3 @@ ClassA = __decorate([
     __metadata("design:paramtypes", [aux_1.SomeClass])
 ], ClassA);
 exports.ClassA = ClassA;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithConstructorType.js b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
index 91c3814774c..10aa42ddce7 100644
--- a/tests/baselines/reference/decoratorMetadataWithConstructorType.js
+++ b/tests/baselines/reference/decoratorMetadataWithConstructorType.js
@@ -19,6 +19,7 @@ export class B {
 
 //// [decoratorMetadataWithConstructorType.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
         console.log('new A');
@@ -38,4 +39,3 @@ __decorate([
     __metadata("design:type", A)
 ], B.prototype, "x", void 0);
 exports.B = B;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
index e2cd357f14a..b0e23a78971 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.db])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
index 19c8bafa4c1..f03190cff0c 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.db])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
index 63177201f1d..c1eca081527 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db.db])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index 1979adf9c82..7d78cf7adbe 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db"); // error no default export
 function someDecorator(target) {
     return target;
@@ -53,4 +54,3 @@ MyClass = __decorate([
 ], MyClass);
 exports.MyClass = MyClass;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
index f3f82342fad..3f7069902ce 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.default = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.default])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
index 34f63af38ea..66eb30dc710 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.default = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [db_1.default])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
index 4b0d77b9d2f..1dd09c3a177 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.default = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [Object])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
index a587baf1d05..830e6bc80ee 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
@@ -25,6 +25,7 @@ export {MyClass};
 
 //// [db.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db = (function () {
     function db() {
     }
@@ -33,9 +34,9 @@ var db = (function () {
     return db;
 }());
 exports.db = db;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [service.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var database = require("./db");
 function someDecorator(target) {
     return target;
@@ -52,4 +53,3 @@ MyClass = __decorate([
     __metadata("design:paramtypes", [database.db])
 ], MyClass);
 exports.MyClass = MyClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js
index 6ec7a58da66..77020e7cb77 100644
--- a/tests/baselines/reference/decoratorOnClass2.js
+++ b/tests/baselines/reference/decoratorOnClass2.js
@@ -13,6 +13,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var C = (function () {
     function C() {
     }
@@ -22,4 +23,3 @@ C = __decorate([
     dec
 ], C);
 exports.C = C;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js
index 0e289d51c71..2af3b0426dc 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -16,6 +16,7 @@ export class C  extends base{
 
 //// [0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var base = (function () {
     function base() {
     }
@@ -24,7 +25,6 @@ var base = (function () {
 exports.base = base;
 function foo(target, propertyKey, parameterIndex) { }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [2.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -46,6 +46,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var _0_ts_1 = require("./0.ts");
 var _0_ts_2 = require("./0.ts");
 var C = (function (_super) {
@@ -59,4 +60,3 @@ C = __decorate([
     __param(0, _0_ts_2.foo)
 ], C);
 exports.C = C;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js
index 518ddee0a81..4ed401284a9 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -18,6 +18,7 @@ export class C  extends base{
 
 //// [0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var base = (function () {
     function base() {
     }
@@ -26,7 +27,6 @@ var base = (function () {
 exports.base = base;
 function foo(target, propertyKey, parameterIndex) { }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [2.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -48,6 +48,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var _0_1 = require("./0");
 var _0_2 = require("./0");
 /* Comment on the Class Declaration */
@@ -62,4 +63,3 @@ C = __decorate([
     __param(0, _0_2.foo)
 ], C);
 exports.C = C;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression01.js b/tests/baselines/reference/defaultExportInAwaitExpression01.js
index cba3d6e115c..6a31461fe3c 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression01.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression01.js
@@ -23,9 +23,9 @@ import x from './a';
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     const x = new Promise((resolve, reject) => { resolve({}); });
     exports.default = x;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -46,11 +46,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     const a_1 = require("./a");
     (function () {
         return __awaiter(this, void 0, void 0, function* () {
             const value = yield a_1.default;
         });
     }());
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/defaultExportInAwaitExpression02.js b/tests/baselines/reference/defaultExportInAwaitExpression02.js
index ea597359a03..565cfb41617 100644
--- a/tests/baselines/reference/defaultExportInAwaitExpression02.js
+++ b/tests/baselines/reference/defaultExportInAwaitExpression02.js
@@ -14,9 +14,9 @@ import x from './a';
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const x = new Promise((resolve, reject) => { resolve({}); });
 exports.default = x;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -27,10 +27,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 const a_1 = require("./a");
 (function () {
     return __awaiter(this, void 0, void 0, function* () {
         const value = yield a_1.default;
     });
 }());
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportWithOverloads01.js b/tests/baselines/reference/defaultExportWithOverloads01.js
index d74cc416e28..a273b891679 100644
--- a/tests/baselines/reference/defaultExportWithOverloads01.js
+++ b/tests/baselines/reference/defaultExportWithOverloads01.js
@@ -7,6 +7,7 @@ export default function f(...args: any[]) {
 
 //// [defaultExportWithOverloads01.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
@@ -14,4 +15,3 @@ function f() {
     }
 }
 exports.default = f;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge01.js b/tests/baselines/reference/defaultExportsCannotMerge01.js
index bd186fa279d..aaadfaefebb 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge01.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge01.js
@@ -32,6 +32,7 @@ Entity.y;
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function Decl() {
     return 0;
 }
@@ -41,13 +42,12 @@ var Decl;
     Decl.x = 10;
     Decl.y = 20;
 })(Decl = exports.Decl || (exports.Decl = {}));
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("m1");
 m1_1.default();
 var x;
 var y;
 m1_1.default.x;
 m1_1.default.y;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge02.js b/tests/baselines/reference/defaultExportsCannotMerge02.js
index 7b26a1aa59f..b83d54548ca 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge02.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge02.js
@@ -27,19 +27,19 @@ var sum = z.p1 + z.p2
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Decl = (function () {
     function Decl() {
     }
     return Decl;
 }());
 exports.default = Decl;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("m1");
 m1_1.default();
 var x;
 var y;
 var z = new m1_1.default();
 var sum = z.p1 + z.p2;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge03.js b/tests/baselines/reference/defaultExportsCannotMerge03.js
index 1b2e53f0304..254723ec5f1 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge03.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge03.js
@@ -27,19 +27,19 @@ var sum = z.p1 + z.p2
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Decl = (function () {
     function Decl() {
     }
     return Decl;
 }());
 exports.default = Decl;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("m1");
 m1_1.default();
 var x;
 var y;
 var z = new m1_1.default();
 var sum = z.p1 + z.p2;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsCannotMerge04.js b/tests/baselines/reference/defaultExportsCannotMerge04.js
index baade857296..38ab4861c62 100644
--- a/tests/baselines/reference/defaultExportsCannotMerge04.js
+++ b/tests/baselines/reference/defaultExportsCannotMerge04.js
@@ -15,10 +15,10 @@ export interface Foo {
 
 //// [defaultExportsCannotMerge04.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function Foo() {
 }
 exports.default = Foo;
 var Foo;
 (function (Foo) {
 })(Foo || (Foo = {}));
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsGetExportedAmd.js b/tests/baselines/reference/defaultExportsGetExportedAmd.js
index 214522a56c8..c5037364b00 100644
--- a/tests/baselines/reference/defaultExportsGetExportedAmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedAmd.js
@@ -10,15 +10,15 @@ export default function foo() {}
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class Foo {
     }
     exports.default = Foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function foo() { }
     exports.default = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
index c31174a5acd..051ab7bbf03 100644
--- a/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
+++ b/tests/baselines/reference/defaultExportsGetExportedCommonjs.js
@@ -9,12 +9,12 @@ export default function foo() {}
 
 //// [a.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class Foo {
 }
 exports.default = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [b.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() { }
 exports.default = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/defaultExportsGetExportedUmd.js b/tests/baselines/reference/defaultExportsGetExportedUmd.js
index 8eb92f872bb..5417b9b9a96 100644
--- a/tests/baselines/reference/defaultExportsGetExportedUmd.js
+++ b/tests/baselines/reference/defaultExportsGetExportedUmd.js
@@ -18,10 +18,10 @@ export default function foo() {}
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class Foo {
     }
     exports.default = Foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 (function (factory) {
@@ -34,7 +34,7 @@ export default function foo() {}
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function foo() { }
     exports.default = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/dependencyViaImportAlias.js b/tests/baselines/reference/dependencyViaImportAlias.js
index fd2f277c71a..285cfbcda16 100644
--- a/tests/baselines/reference/dependencyViaImportAlias.js
+++ b/tests/baselines/reference/dependencyViaImportAlias.js
@@ -13,13 +13,13 @@ export = A;
 //// [A.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 //// [B.js]
 define(["require", "exports", "A"], function (require, exports, a) {
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations1.js b/tests/baselines/reference/destructuringInVariableDeclarations1.js
index 37eed711067..a7645ceabe9 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations1.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations1.js
@@ -7,8 +7,8 @@ export let { toString } = 1;
 
 //// [destructuringInVariableDeclarations1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.toString = (1).toString;
 {
     let { toFixed } = 1;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations2.js b/tests/baselines/reference/destructuringInVariableDeclarations2.js
index 21f272d22a6..43a2f740c94 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations2.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations2.js
@@ -8,8 +8,8 @@ export {};
 
 //// [destructuringInVariableDeclarations2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 let { toString } = 1;
 {
     let { toFixed } = 1;
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations3.js b/tests/baselines/reference/destructuringInVariableDeclarations3.js
index 11e242da1a2..2522a704e18 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations3.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations3.js
@@ -8,9 +8,9 @@ export let { toString } = 1;
 //// [destructuringInVariableDeclarations3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.toString = (1).toString;
     {
         let { toFixed } = 1;
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations4.js b/tests/baselines/reference/destructuringInVariableDeclarations4.js
index 0f25ca3827f..867417cf01f 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations4.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations4.js
@@ -9,9 +9,9 @@ export {};
 //// [destructuringInVariableDeclarations4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     let { toString } = 1;
     {
         let { toFixed } = 1;
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations5.js b/tests/baselines/reference/destructuringInVariableDeclarations5.js
index 6c799d10803..20a094a0375 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations5.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations5.js
@@ -16,9 +16,9 @@ export let { toString } = 1;
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.toString = (1).toString;
     {
         let { toFixed } = 1;
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/destructuringInVariableDeclarations6.js b/tests/baselines/reference/destructuringInVariableDeclarations6.js
index fcdefe72df6..583a2cd1f1d 100644
--- a/tests/baselines/reference/destructuringInVariableDeclarations6.js
+++ b/tests/baselines/reference/destructuringInVariableDeclarations6.js
@@ -17,9 +17,9 @@ export {};
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     let { toString } = 1;
     {
         let { toFixed } = 1;
     }
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/downlevelLetConst13.js b/tests/baselines/reference/downlevelLetConst13.js
index b1983c82d15..324c0cd9293 100644
--- a/tests/baselines/reference/downlevelLetConst13.js
+++ b/tests/baselines/reference/downlevelLetConst13.js
@@ -21,6 +21,7 @@ export module M {
 
 //// [downlevelLetConst13.js]
 'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
 // exported let\const bindings should not be renamed
 exports.foo = 10;
 exports.bar = "123";
@@ -37,4 +38,3 @@ var M;
     M.bar7 = { a: 1 }.a;
     M.bar8 = { a: 1 }.a;
 })(M = exports.M || (exports.M = {}));
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/duplicateLocalVariable1.js b/tests/baselines/reference/duplicateLocalVariable1.js
index c348443fb29..0deb672456c 100644
--- a/tests/baselines/reference/duplicateLocalVariable1.js
+++ b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -347,6 +347,7 @@ export var tests: TestRunner = (function () {
 
 //// [duplicateLocalVariable1.js]
 "use strict";
+exports.__esModule = true;
 / /;
 commonjs;
 var TestFileDir = ".\\TempTestFiles";
@@ -636,4 +637,3 @@ exports.tests = (function () {
     }, "Codepoint at index: 3 has control value: 8"));
     return testRunner;
 })();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/duplicateLocalVariable2.js b/tests/baselines/reference/duplicateLocalVariable2.js
index 3e89e88fd3c..2962e544b9b 100644
--- a/tests/baselines/reference/duplicateLocalVariable2.js
+++ b/tests/baselines/reference/duplicateLocalVariable2.js
@@ -38,6 +38,7 @@ export var tests: TestRunner = (function () {
 //// [duplicateLocalVariable2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var TestCase = (function () {
         function TestCase(name, test, errorMessageRegEx) {
             this.name = name;
@@ -77,5 +78,4 @@ define(["require", "exports"], function (require, exports) {
         }));
         return testRunner;
     })();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js
index 05af7a2bac8..5f5590e2b41 100644
--- a/tests/baselines/reference/duplicateSymbolsExportMatching.js
+++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js
@@ -68,6 +68,7 @@ export interface D { }
 //// [duplicateSymbolsExportMatching.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     // Should report error only once for instantiated module
     var M;
     (function (M) {
@@ -103,5 +104,4 @@ define(["require", "exports"], function (require, exports) {
             var t;
         })(C = M.C || (M.C = {}));
     })(M || (M = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/dynamicModuleTypecheckError.js b/tests/baselines/reference/dynamicModuleTypecheckError.js
index 9fc3f440414..2c94e692dd0 100644
--- a/tests/baselines/reference/dynamicModuleTypecheckError.js
+++ b/tests/baselines/reference/dynamicModuleTypecheckError.js
@@ -10,8 +10,8 @@ for(var i = 0; i < 30; i++) {
 
 //// [dynamicModuleTypecheckError.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 for (var i = 0; i < 30; i++) {
     exports.x = i * 1000; // should not be an error here
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/elidingImportNames.js b/tests/baselines/reference/elidingImportNames.js
index ee6fbd2b07f..f878c5044ea 100644
--- a/tests/baselines/reference/elidingImportNames.js
+++ b/tests/baselines/reference/elidingImportNames.js
@@ -17,17 +17,17 @@ export var main = 10;
 
 //// [elidingImportNames_main.js]
 "use strict";
-exports.main = 10;
 exports.__esModule = true;
+exports.main = 10;
 //// [elidingImportNames_main1.js]
 "use strict";
-exports.main = 10;
 exports.__esModule = true;
+exports.main = 10;
 //// [elidingImportNames_test.js]
 "use strict";
+exports.__esModule = true;
 var a = require("./elidingImportNames_main"); // alias used in typeof
 var b = a;
 var x;
 var a2 = require("./elidingImportNames_main1"); // alias not used in typeof
 var b2 = a2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/emptyModuleName.js b/tests/baselines/reference/emptyModuleName.js
index e8915e406af..d98359d94bb 100644
--- a/tests/baselines/reference/emptyModuleName.js
+++ b/tests/baselines/reference/emptyModuleName.js
@@ -15,6 +15,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var A = require("");
 var B = (function (_super) {
     __extends(B, _super);
@@ -23,4 +24,3 @@ var B = (function (_super) {
     }
     return B;
 }(A));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/enumFromExternalModule.js b/tests/baselines/reference/enumFromExternalModule.js
index 9125b5126b2..2a1865d3ccd 100644
--- a/tests/baselines/reference/enumFromExternalModule.js
+++ b/tests/baselines/reference/enumFromExternalModule.js
@@ -12,14 +12,14 @@ var x = f.Mode.Open;
 
 //// [enumFromExternalModule_0.js]
 "use strict";
+exports.__esModule = true;
 var Mode;
 (function (Mode) {
     Mode[Mode["Open"] = 0] = "Open";
 })(Mode = exports.Mode || (exports.Mode = {}));
-exports.__esModule = true;
 //// [enumFromExternalModule_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='enumFromExternalModule_0.ts'/>
 var f = require("./enumFromExternalModule_0");
 var x = f.Mode.Open;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/errorsOnImportedSymbol.js b/tests/baselines/reference/errorsOnImportedSymbol.js
index 52d144c1e49..15ae0c90bd1 100644
--- a/tests/baselines/reference/errorsOnImportedSymbol.js
+++ b/tests/baselines/reference/errorsOnImportedSymbol.js
@@ -20,6 +20,6 @@ var y = Sammy.Sammy();
 Object.defineProperty(exports, "__esModule", { value: true });
 //// [errorsOnImportedSymbol_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var x = new Sammy.Sammy();
 var y = Sammy.Sammy();
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es3defaultAliasIsQuoted.js b/tests/baselines/reference/es3defaultAliasIsQuoted.js
index 0ad02c848fd..d3bb3d006e5 100644
--- a/tests/baselines/reference/es3defaultAliasIsQuoted.js
+++ b/tests/baselines/reference/es3defaultAliasIsQuoted.js
@@ -16,6 +16,7 @@ assert(Foo.CONSTANT === "Foo");
 
 //// [es3defaultAliasQuoted_file0.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
@@ -28,9 +29,8 @@ function assert(value) {
         throw new Error("Assertion failed!");
 }
 exports["default"] = assert;
-exports.__esModule = true;
 //// [es3defaultAliasQuoted_file1.js]
 "use strict";
+exports.__esModule = true;
 var es3defaultAliasQuoted_file0_1 = require("./es3defaultAliasQuoted_file0");
 es3defaultAliasQuoted_file0_1["default"](es3defaultAliasQuoted_file0_1.Foo.CONSTANT === "Foo");
-exports.__esModule = true;
diff --git a/tests/baselines/reference/es5-commonjs.js b/tests/baselines/reference/es5-commonjs.js
index 72c954b02f2..8ebcfb01be6 100644
--- a/tests/baselines/reference/es5-commonjs.js
+++ b/tests/baselines/reference/es5-commonjs.js
@@ -16,6 +16,7 @@ export default class A
 
 //// [es5-commonjs.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -25,4 +26,3 @@ var A = (function () {
     return A;
 }());
 exports.default = A;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs2.js b/tests/baselines/reference/es5-commonjs2.js
index ce15d3a5ce4..2c38edef6ae 100644
--- a/tests/baselines/reference/es5-commonjs2.js
+++ b/tests/baselines/reference/es5-commonjs2.js
@@ -5,5 +5,5 @@ export default 1;
 
 //// [es5-commonjs2.js]
 "use strict";
-exports.default = 1;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = 1;
diff --git a/tests/baselines/reference/es5-commonjs3.js b/tests/baselines/reference/es5-commonjs3.js
index 5fc9462b955..15c11b189a3 100644
--- a/tests/baselines/reference/es5-commonjs3.js
+++ b/tests/baselines/reference/es5-commonjs3.js
@@ -6,6 +6,6 @@ export var __esModule = 1;
 
 //// [es5-commonjs3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "test";
 exports.__esModule = 1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs4.js b/tests/baselines/reference/es5-commonjs4.js
index bf28e064500..d2530d1bdf2 100644
--- a/tests/baselines/reference/es5-commonjs4.js
+++ b/tests/baselines/reference/es5-commonjs4.js
@@ -17,6 +17,7 @@ export var __esModule = 1;
 
 //// [es5-commonjs4.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -27,4 +28,3 @@ var A = (function () {
 }());
 exports.default = A;
 exports.__esModule = 1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs5.js b/tests/baselines/reference/es5-commonjs5.js
index 93a0ed94a5c..bbc9bbba7c2 100644
--- a/tests/baselines/reference/es5-commonjs5.js
+++ b/tests/baselines/reference/es5-commonjs5.js
@@ -7,8 +7,8 @@ export default function () {
 
 //// [es5-commonjs5.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function default_1() {
     return "test";
 }
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-commonjs6.js b/tests/baselines/reference/es5-commonjs6.js
index 33015271d7a..87d2f7d62a6 100644
--- a/tests/baselines/reference/es5-commonjs6.js
+++ b/tests/baselines/reference/es5-commonjs6.js
@@ -6,6 +6,6 @@ var __esModule = 1;
 
 //// [es5-commonjs6.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "test";
 var __esModule = 1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
index 5bb6f87e4e5..f62c861b7c9 100644
--- a/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
+++ b/tests/baselines/reference/es5-importHelpersAsyncFunctions.js
@@ -19,6 +19,7 @@ export declare function __generator(body: Function): any;
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 function foo() {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -28,7 +29,6 @@ function foo() {
     });
 }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     return new (P || (P = Promise))(function (resolve, reject) {
diff --git a/tests/baselines/reference/es5-umd2.js b/tests/baselines/reference/es5-umd2.js
index 6f129f5e58d..b55422ca7b1 100644
--- a/tests/baselines/reference/es5-umd2.js
+++ b/tests/baselines/reference/es5-umd2.js
@@ -25,6 +25,7 @@ export class A
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -34,5 +35,4 @@ export class A
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5-umd3.js b/tests/baselines/reference/es5-umd3.js
index 1291c739fcb..37b19ece1ac 100644
--- a/tests/baselines/reference/es5-umd3.js
+++ b/tests/baselines/reference/es5-umd3.js
@@ -25,6 +25,7 @@ export default class A
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -34,5 +35,4 @@ export default class A
         return A;
     }());
     exports.default = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
index f6817129fb3..25a1db0a25f 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration.js
@@ -7,6 +7,7 @@ export default class C {
 
 //// [es5ExportDefaultClassDeclaration.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var C = (function () {
     function C() {
     }
@@ -14,7 +15,6 @@ var C = (function () {
     return C;
 }());
 exports.default = C;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
index 5cf3405c437..931eab75c72 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration2.js
@@ -7,6 +7,7 @@ export default class {
 
 //// [es5ExportDefaultClassDeclaration2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var default_1 = (function () {
     function default_1() {
     }
@@ -14,7 +15,6 @@ var default_1 = (function () {
     return default_1;
 }());
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration2.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
index d28148d1416..927536114ef 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration3.js
@@ -16,6 +16,7 @@ var t: typeof C = C;
 
 //// [es5ExportDefaultClassDeclaration3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var before = new C();
 var C = (function () {
     function C() {
@@ -28,7 +29,6 @@ var C = (function () {
 exports.default = C;
 var after = new C();
 var t = C;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultClassDeclaration3.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultExpression.js b/tests/baselines/reference/es5ExportDefaultExpression.js
index 6ebab2a4b0d..0821543134c 100644
--- a/tests/baselines/reference/es5ExportDefaultExpression.js
+++ b/tests/baselines/reference/es5ExportDefaultExpression.js
@@ -5,8 +5,8 @@ export default (1 + 2);
 
 //// [es5ExportDefaultExpression.js]
 "use strict";
-exports.default = (1 + 2);
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = (1 + 2);
 
 
 //// [es5ExportDefaultExpression.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
index 1060607886a..068a966faa2 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
@@ -5,9 +5,9 @@ export default function f() { }
 
 //// [es5ExportDefaultFunctionDeclaration.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() { }
 exports.default = f;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
index 13f9e014be6..ab44c4cb584 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js
@@ -5,9 +5,9 @@ export default function () { }
 
 //// [es5ExportDefaultFunctionDeclaration2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function default_1() { }
 exports.default = default_1;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration2.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
index 47ed66880e6..c4bbcd4373e 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration3.js
@@ -10,13 +10,13 @@ var after: typeof func = func();
 
 //// [es5ExportDefaultFunctionDeclaration3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var before = func();
 function func() {
     return func;
 }
 exports.default = func;
 var after = func();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultFunctionDeclaration3.d.ts]
diff --git a/tests/baselines/reference/es5ExportDefaultIdentifier.js b/tests/baselines/reference/es5ExportDefaultIdentifier.js
index 1102eab997d..d60fba590ac 100644
--- a/tests/baselines/reference/es5ExportDefaultIdentifier.js
+++ b/tests/baselines/reference/es5ExportDefaultIdentifier.js
@@ -7,10 +7,10 @@ export default f;
 
 //// [es5ExportDefaultIdentifier.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f() { }
 exports.f = f;
 exports.default = f;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es5ExportDefaultIdentifier.d.ts]
diff --git a/tests/baselines/reference/es5ModuleInternalNamedImports.js b/tests/baselines/reference/es5ModuleInternalNamedImports.js
index 28516a541f5..abc81b3dc94 100644
--- a/tests/baselines/reference/es5ModuleInternalNamedImports.js
+++ b/tests/baselines/reference/es5ModuleInternalNamedImports.js
@@ -39,6 +39,7 @@ import M3 from "M3";
 //// [es5ModuleInternalNamedImports.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var M;
     (function (M) {
         // variable
@@ -65,5 +66,4 @@ define(["require", "exports"], function (require, exports) {
         // alias
         M.M_A = M_M;
     })(M = exports.M || (exports.M = {}));
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
index 02774139add..dc55545617d 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenAmd.js
@@ -14,6 +14,7 @@ export class A
 //// [es5ModuleWithModuleGenAmd.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
@@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
index 4c58c0bd20f..93056203f9b 100644
--- a/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
+++ b/tests/baselines/reference/es5ModuleWithModuleGenCommonjs.js
@@ -13,6 +13,7 @@ export class A
 
 //// [es5ModuleWithModuleGenCommonjs.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -22,4 +23,3 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
index 4479259a523..89d11045dda 100644
--- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
+++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.js
@@ -13,6 +13,7 @@ export class A
 
 //// [es5ModuleWithoutModuleGenTarget.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
@@ -22,4 +23,3 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6-umd2.js b/tests/baselines/reference/es6-umd2.js
index 6f1d083ebe8..c0707b869cc 100644
--- a/tests/baselines/reference/es6-umd2.js
+++ b/tests/baselines/reference/es6-umd2.js
@@ -24,6 +24,7 @@ export class A
     }
 })(function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class A {
         constructor() {
         }
@@ -32,5 +33,4 @@ export class A
         }
     }
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es6ExportAllInEs5.js b/tests/baselines/reference/es6ExportAllInEs5.js
index 80d31b41695..91910ba2616 100644
--- a/tests/baselines/reference/es6ExportAllInEs5.js
+++ b/tests/baselines/reference/es6ExportAllInEs5.js
@@ -18,6 +18,7 @@ export * from "./server";
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
@@ -29,14 +30,13 @@ var m;
     m.x = 10;
 })(m = exports.m || (exports.m = {}));
 exports.x = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-__export(require("./server"));
 Object.defineProperty(exports, "__esModule", { value: true });
+__export(require("./server"));
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportClauseInEs5.js b/tests/baselines/reference/es6ExportClauseInEs5.js
index 98940523143..3d3625aad18 100644
--- a/tests/baselines/reference/es6ExportClauseInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseInEs5.js
@@ -18,6 +18,7 @@ export { x };
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
@@ -32,7 +33,6 @@ var m;
 exports.instantiatedModule = m;
 var x = 10;
 exports.x = x;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
index f1cb97ad0f6..d8aa8e607e3 100644
--- a/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithAssignmentInEs5.js
@@ -19,6 +19,7 @@ export { foo, baz, baz as quux, buzz, bizz };
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var foo = 2;
 exports.foo = foo;
 exports.foo = foo = 3;
@@ -34,4 +35,3 @@ exports.bizz = bizz;
 exports.bizz = bizz += 1; // compiles to exports.bizz = bizz += 1
 exports.bizz = bizz -= 1; // similarly
 exports.bizz = ++bizz; // compiles to exports.bizz = ++bizz
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
index 5891de57310..ecfccd5d843 100644
--- a/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
+++ b/tests/baselines/reference/es6ExportClauseWithoutModuleSpecifierInEs5.js
@@ -22,6 +22,7 @@ export { x } from "./server";
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
@@ -33,9 +34,9 @@ var m;
     m.x = 10;
 })(m = exports.m || (exports.m = {}));
 exports.x = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.c = server_1.c;
 var server_2 = require("./server");
@@ -44,7 +45,6 @@ var server_3 = require("./server");
 exports.instantiatedModule = server_3.m;
 var server_4 = require("./server");
 exports.x = server_4.x;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.js b/tests/baselines/reference/es6ExportEqualsInterop.js
index c84c76839ee..d1f8de5faa7 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.js
+++ b/tests/baselines/reference/es6ExportEqualsInterop.js
@@ -213,6 +213,7 @@ export * from "class-module";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 var z2 = require("variable");
 var z3 = require("interface-variable");
 var z4 = require("module");
@@ -304,4 +305,3 @@ __export(require("function"));
 __export(require("function-module"));
 __export(require("class"));
 __export(require("class-module"));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingAmd.js b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
index 035a8c0be25..977b94f8790 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingAmd.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingAmd.js
@@ -14,15 +14,15 @@ import defaultBinding2 from "es6ImportDefaultBindingAmd_0"; // elide this import
 //// [es6ImportDefaultBindingAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = 10;
     exports.default = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [es6ImportDefaultBindingAmd_1.js]
 define(["require", "exports", "es6ImportDefaultBindingAmd_0"], function (require, exports, es6ImportDefaultBindingAmd_0_1) {
     "use strict";
-    var x = es6ImportDefaultBindingAmd_0_1.default;
     Object.defineProperty(exports, "__esModule", { value: true });
+    var x = es6ImportDefaultBindingAmd_0_1.default;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingDts.js
index 6f4836a6680..94b824a3766 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingDts.js
@@ -13,18 +13,18 @@ import defaultBinding2 from "./server"; // elide this import since defaultBindin
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var c = (function () {
     function c() {
     }
     return c;
 }());
 exports.default = c;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.x = new server_1.default();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
index 66be06536f0..8335a1953de 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
@@ -24,13 +24,14 @@ var x1: number = m;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
 exports.default = {};
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImport_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const es6ImportDefaultBindingFollowedWithNamedImport_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_1.a;
 const es6ImportDefaultBindingFollowedWithNamedImport_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
@@ -42,7 +43,6 @@ const es6ImportDefaultBindingFollowedWithNamedImport_0_4 = require("./es6ImportD
 var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_4.x;
 const es6ImportDefaultBindingFollowedWithNamedImport_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImport_0_5.m;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
index 4712a432503..8eb76b487f8 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js
@@ -22,11 +22,12 @@ var x: number = defaultBinding6;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default;
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
@@ -39,7 +40,6 @@ var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6Imp
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default;
 var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
index 5d2518bb774..d72751c7610 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js
@@ -22,11 +22,12 @@ export var x1: number = defaultBinding6;
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.x1 = server_1.default;
 var server_2 = require("./server");
@@ -39,7 +40,6 @@ var server_5 = require("./server");
 exports.x1 = server_5.default;
 var server_6 = require("./server");
 exports.x1 = server_6.default;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
index 0556d872480..5bf268709d3 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
@@ -26,6 +26,7 @@ export var x6 = new m();
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var a = (function () {
     function a() {
     }
@@ -62,9 +63,9 @@ var x11 = (function () {
     return x11;
 }());
 exports.x11 = x11;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server");
 exports.x1 = new server_1.a();
 var server_2 = require("./server");
@@ -76,7 +77,6 @@ var server_4 = require("./server");
 exports.x3 = new server_4.x11();
 var server_5 = require("./server");
 exports.x6 = new server_5.m();
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
index f52c590f44e..307dcc92f46 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts1.js
@@ -21,15 +21,16 @@ export var x6 = new defaultBinding6();
 
 //// [server.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = (function () {
     function a() {
     }
     return a;
 }());
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [client.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var server_1 = require("./server");
 exports.x1 = new server_1.default();
 var server_2 = require("./server");
@@ -42,7 +43,6 @@ var server_5 = require("./server");
 exports.x5 = new server_5.default();
 var server_6 = require("./server");
 exports.x6 = new server_6.default();
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
index dcc2ec2c785..2e9d8104a39 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
@@ -23,12 +23,13 @@ var x1: number = m;
 
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1.a;
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
@@ -40,7 +41,6 @@ var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4 = require("./es6Impo
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4.x;
 var es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
 var x1 = es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
index 247c64c3e7f..77266084bda 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
@@ -25,22 +25,22 @@ export var x1: number = m;
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.a = 10;
     exports.x = exports.a;
     exports.m = exports.a;
     exports.default = {};
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server", "server", "server", "server", "server"], function (require, exports, server_1, server_2, server_3, server_4, server_5) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x1 = server_1.a;
     exports.x1 = server_2.a;
     exports.x1 = server_3.x;
     exports.x1 = server_3.a;
     exports.x1 = server_4.x;
     exports.x1 = server_5.m;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
index db922cb2200..c1c41968934 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js
@@ -11,14 +11,14 @@ var x: number = defaultBinding;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
 var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
index fbd045e81de..b82fb9aeee9 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding1WithExport.js
@@ -12,15 +12,15 @@ export var x: number = defaultBinding;
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = 10;
     exports.default = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
-    exports.x = server_1.default;
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = server_1.default;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
index 8b430e2cf46..8d033c69536 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js
@@ -10,18 +10,18 @@ export var x = new nameSpaceBinding.a();
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var a = (function () {
     function a() {
     }
     return a;
 }());
 exports.a = a;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.a();
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
index 09caf0db18a..c488db3e88e 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts1.js
@@ -12,19 +12,19 @@ export var x = new defaultBinding();
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = (function () {
         function a() {
         }
         return a;
     }());
     exports.default = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
-    exports.x = new server_1.default();
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = new server_1.default();
 });
 
 
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
index 92e3fe0a33f..0db21dfd064 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js
@@ -10,13 +10,13 @@ var x: number = nameSpaceBinding.a;
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0");
 var x = nameSpaceBinding.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
index 0b5670b18a9..96720294a8a 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js
@@ -10,13 +10,13 @@ export var x: number = nameSpaceBinding.a;
 
 //// [server.js]
 "use strict";
-exports.a = 10;
 exports.__esModule = true;
+exports.a = 10;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var nameSpaceBinding = require("./server");
 exports.x = nameSpaceBinding.a;
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
index b9f73ac47eb..4c51a54462d 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingMergeErrors.js
@@ -18,12 +18,12 @@ import defaultBinding3 from "./es6ImportDefaultBindingMergeErrors_0"; // SHould
 
 //// [es6ImportDefaultBindingMergeErrors_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = 10;
 exports.default = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportDefaultBindingMergeErrors_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0");
 var x = es6ImportDefaultBindingMergeErrors_0_1.default;
 var defaultBinding2 = "hello world";
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
index 265be908b85..e294c08befa 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingNoDefaultProperty.js
@@ -10,8 +10,8 @@ import defaultBinding from "./es6ImportDefaultBindingNoDefaultProperty_0";
 
 //// [es6ImportDefaultBindingNoDefaultProperty_0.js]
 "use strict";
-exports.a = 10;
 exports.__esModule = true;
+exports.a = 10;
 //// [es6ImportDefaultBindingNoDefaultProperty_1.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
index 6ea0812d40b..a9f760f1278 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
@@ -13,15 +13,15 @@ export import defaultBinding2 from "server"; // non referenced
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var a = 10;
     exports.default = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
-    exports.x = server_1.default;
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.x = server_1.default;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImport.js b/tests/baselines/reference/es6ImportNameSpaceImport.js
index 510750edc50..b5296d15f9b 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImport.js
@@ -12,13 +12,13 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImport_0"; // elide this
 
 //// [es6ImportNameSpaceImport_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportNameSpaceImport_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const nameSpaceBinding = require("./es6ImportNameSpaceImport_0");
 var x = nameSpaceBinding.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNameSpaceImport_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
index ea240338316..200f49a2986 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportAmd.js
@@ -13,14 +13,14 @@ import * as nameSpaceBinding2 from "es6ImportNameSpaceImportAmd_0"; // elide thi
 //// [es6ImportNameSpaceImportAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.a = 10;
     exports.__esModule = true;
+    exports.a = 10;
 });
 //// [es6ImportNameSpaceImportAmd_1.js]
 define(["require", "exports", "es6ImportNameSpaceImportAmd_0"], function (require, exports, nameSpaceBinding) {
     "use strict";
-    var x = nameSpaceBinding.a;
     exports.__esModule = true;
+    var x = nameSpaceBinding.a;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
index 20b9d3af20b..cae90885ce2 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
@@ -11,6 +11,7 @@ import * as nameSpaceBinding2 from "./server"; // unreferenced
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var c = (function () {
     function c() {
     }
@@ -18,12 +19,11 @@ var c = (function () {
 }());
 exports.c = c;
 ;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.c();
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
index 88bf937c69c..ee00df9a2cc 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportInEs5.js
@@ -12,13 +12,13 @@ import * as nameSpaceBinding2 from "./es6ImportNameSpaceImportInEs5_0"; // elide
 
 //// [es6ImportNameSpaceImportInEs5_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportNameSpaceImportInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0");
 var x = nameSpaceBinding.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNameSpaceImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
index 696659cb1f7..39594102007 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportMergeErrors.js
@@ -17,9 +17,9 @@ var nameSpaceBinding3 = 10;
 
 //// [es6ImportNameSpaceImportMergeErrors_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportNameSpaceImportMergeErrors_1.js]
 "use strict";
-var nameSpaceBinding3 = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+var nameSpaceBinding3 = 10;
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
index 1663d7ec923..3c8b40f550e 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportWithExport.js
@@ -13,14 +13,14 @@ export import * as nameSpaceBinding2 from "server"; // Not referenced imports
 //// [server.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.a = 10;
     exports.__esModule = true;
+    exports.a = 10;
 });
 //// [client.js]
 define(["require", "exports", "server"], function (require, exports, nameSpaceBinding) {
     "use strict";
-    exports.x = nameSpaceBinding.a;
     exports.__esModule = true;
+    exports.x = nameSpaceBinding.a;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImport.js b/tests/baselines/reference/es6ImportNamedImport.js
index 9719305e62b..a9fcb861ec5 100644
--- a/tests/baselines/reference/es6ImportNamedImport.js
+++ b/tests/baselines/reference/es6ImportNamedImport.js
@@ -43,6 +43,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImport_0";
 
 //// [es6ImportNamedImport_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
@@ -51,9 +52,9 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNamedImport_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const es6ImportNamedImport_0_1 = require("./es6ImportNamedImport_0");
 var xxxx = es6ImportNamedImport_0_1.a;
 const es6ImportNamedImport_0_2 = require("./es6ImportNamedImport_0");
@@ -75,7 +76,6 @@ const es6ImportNamedImport_0_8 = require("./es6ImportNamedImport_0");
 var z111 = es6ImportNamedImport_0_8.z1;
 const es6ImportNamedImport_0_9 = require("./es6ImportNamedImport_0");
 var z2 = es6ImportNamedImport_0_9.z2; // z2 shouldn't give redeclare error
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNamedImport_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportAmd.js b/tests/baselines/reference/es6ImportNamedImportAmd.js
index 31582223c52..bd6213f259f 100644
--- a/tests/baselines/reference/es6ImportNamedImportAmd.js
+++ b/tests/baselines/reference/es6ImportNamedImportAmd.js
@@ -44,6 +44,7 @@ import { aaaa as bbbb } from "es6ImportNamedImportAmd_0";
 //// [es6ImportNamedImportAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 10;
     exports.x = exports.a;
     exports.m = exports.a;
@@ -52,11 +53,11 @@ define(["require", "exports"], function (require, exports) {
     exports.z1 = 10;
     exports.z2 = 10;
     exports.aaaa = 10;
-    exports.__esModule = true;
 });
 //// [es6ImportNamedImportAmd_1.js]
 define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0"], function (require, exports, es6ImportNamedImportAmd_0_1, es6ImportNamedImportAmd_0_2, es6ImportNamedImportAmd_0_3, es6ImportNamedImportAmd_0_4, es6ImportNamedImportAmd_0_5, es6ImportNamedImportAmd_0_6, es6ImportNamedImportAmd_0_7, es6ImportNamedImportAmd_0_8, es6ImportNamedImportAmd_0_9) {
     "use strict";
+    exports.__esModule = true;
     var xxxx = es6ImportNamedImportAmd_0_1.a;
     var xxxx = es6ImportNamedImportAmd_0_2.a;
     var xxxx = es6ImportNamedImportAmd_0_3.x;
@@ -69,7 +70,6 @@ define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImport
     var xxxx = es6ImportNamedImportAmd_0_7.x1;
     var z111 = es6ImportNamedImportAmd_0_8.z1;
     var z2 = es6ImportNamedImportAmd_0_9.z2; // z2 shouldn't give redeclare error
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportNamedImportDts.js b/tests/baselines/reference/es6ImportNamedImportDts.js
index f8fdf461644..d68ffd794a7 100644
--- a/tests/baselines/reference/es6ImportNamedImportDts.js
+++ b/tests/baselines/reference/es6ImportNamedImportDts.js
@@ -48,6 +48,7 @@ import { aaaa1 as bbbb } from "./server";
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var a = (function () {
     function a() {
     }
@@ -132,9 +133,9 @@ var aaaa1 = (function () {
     return aaaa1;
 }());
 exports.aaaa1 = aaaa1;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server");
 exports.xxxx = new server_1.a();
 var server_2 = require("./server");
@@ -156,7 +157,6 @@ var server_8 = require("./server");
 exports.z111 = new server_8.z1();
 var server_9 = require("./server");
 exports.z2 = new server_9.z2(); // z2 shouldn't give redeclare error
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportInEs5.js b/tests/baselines/reference/es6ImportNamedImportInEs5.js
index 5c6f3573c7f..9e025dca61b 100644
--- a/tests/baselines/reference/es6ImportNamedImportInEs5.js
+++ b/tests/baselines/reference/es6ImportNamedImportInEs5.js
@@ -43,6 +43,7 @@ import { aaaa as bbbb } from "./es6ImportNamedImportInEs5_0";
 
 //// [es6ImportNamedImportInEs5_0.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
@@ -51,9 +52,9 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [es6ImportNamedImportInEs5_1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var es6ImportNamedImportInEs5_0_1 = require("./es6ImportNamedImportInEs5_0");
 var xxxx = es6ImportNamedImportInEs5_0_1.a;
 var es6ImportNamedImportInEs5_0_2 = require("./es6ImportNamedImportInEs5_0");
@@ -75,7 +76,6 @@ var es6ImportNamedImportInEs5_0_8 = require("./es6ImportNamedImportInEs5_0");
 var z111 = es6ImportNamedImportInEs5_0_8.z1;
 var es6ImportNamedImportInEs5_0_9 = require("./es6ImportNamedImportInEs5_0");
 var z2 = es6ImportNamedImportInEs5_0_9.z2; // z2 shouldn't give redeclare error
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [es6ImportNamedImportInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
index 0743f1658b4..d64b517c50f 100644
--- a/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
@@ -10,8 +10,8 @@ export = a;
 
 //// [es6ImportNamedImportInExportAssignment_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportNamedImportInExportAssignment_1.js]
 "use strict";
 const es6ImportNamedImportInExportAssignment_0_1 = require("./es6ImportNamedImportInExportAssignment_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
index ce878ca0216..38cda17bd7e 100644
--- a/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
+++ b/tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
@@ -14,6 +14,7 @@ export = x;
 
 //// [es6ImportNamedImportInIndirectExportAssignment_0.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var c = (function () {
@@ -23,7 +24,6 @@ var a;
     }());
     a.c = c;
 })(a = exports.a || (exports.a = {}));
-exports.__esModule = true;
 //// [es6ImportNamedImportInIndirectExportAssignment_1.js]
 "use strict";
 var es6ImportNamedImportInIndirectExportAssignment_0_1 = require("./es6ImportNamedImportInIndirectExportAssignment_0");
diff --git a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
index 11bd3b73a9e..261039bcc10 100644
--- a/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
+++ b/tests/baselines/reference/es6ImportNamedImportMergeErrors.js
@@ -22,13 +22,13 @@ import { z1 as z } from "./es6ImportNamedImportMergeErrors_0"; // should be erro
 
 //// [es6ImportNamedImportMergeErrors_0.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 exports.x = exports.a;
 exports.z = exports.a;
 exports.z1 = exports.a;
-exports.__esModule = true;
 //// [es6ImportNamedImportMergeErrors_1.js]
 "use strict";
+exports.__esModule = true;
 var x = 10;
 var x44 = 10;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
index 87f3c1d5d07..4e78df34b6d 100644
--- a/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
+++ b/tests/baselines/reference/es6ImportNamedImportNoExportMember.js
@@ -11,9 +11,9 @@ import { x1 as x } from "./es6ImportNamedImportNoExportMember_0";
 
 //// [es6ImportNamedImportNoExportMember_0.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 exports.x = exports.a;
-exports.__esModule = true;
 //// [es6ImportNamedImport_1.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/es6ImportNamedImportWithExport.js b/tests/baselines/reference/es6ImportNamedImportWithExport.js
index 7377f737e47..13e2d40144b 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithExport.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithExport.js
@@ -42,6 +42,7 @@ export import { aaaa as bbbb } from "./server";
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 exports.a = 10;
 exports.x = exports.a;
 exports.m = exports.a;
@@ -50,9 +51,9 @@ exports.x1 = 10;
 exports.z1 = 10;
 exports.z2 = 10;
 exports.aaaa = 10;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server");
 exports.xxxx = server_1.a;
 var server_2 = require("./server");
@@ -74,7 +75,6 @@ var server_8 = require("./server");
 exports.z111 = server_8.z1;
 var server_9 = require("./server");
 exports.z2 = server_9.z2; // z2 shouldn't give redeclare error
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
index 1bbab226ae8..0aa3214e5d7 100644
--- a/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
+++ b/tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
@@ -22,6 +22,7 @@ export var cVal = new C();
 
 //// [server.js]
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
         this.prop = "hello";
@@ -36,12 +37,11 @@ var C2 = (function () {
     return C2;
 }());
 exports.C2 = C2;
-exports.__esModule = true;
 //// [client.js]
 "use strict";
+exports.__esModule = true;
 var server_1 = require("./server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
 exports.cVal = new server_1.C();
-exports.__esModule = true;
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
index c90ea418f26..d83ba9370ee 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
@@ -16,21 +16,21 @@ var _b = 10;
 //// [es6ImportWithoutFromClauseAmd_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.a = 10;
     exports.__esModule = true;
+    exports.a = 10;
 });
 //// [es6ImportWithoutFromClauseAmd_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.b = 10;
     exports.__esModule = true;
+    exports.b = 10;
 });
 //// [es6ImportWithoutFromClauseAmd_2.js]
 define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var _a = 10;
     var _b = 10;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
index 0262cfdd045..b11e2ea9a07 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseInEs5.js
@@ -9,12 +9,12 @@ import "es6ImportWithoutFromClauseInEs5_0";
 
 //// [es6ImportWithoutFromClauseInEs5_0.js]
 "use strict";
-exports.a = 10;
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.a = 10;
 //// [es6ImportWithoutFromClauseInEs5_1.js]
 "use strict";
-require("es6ImportWithoutFromClauseInEs5_0");
 Object.defineProperty(exports, "__esModule", { value: true });
+require("es6ImportWithoutFromClauseInEs5_0");
 
 
 //// [es6ImportWithoutFromClauseInEs5_0.d.ts]
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
index 71874fc7b40..99214d2a2c6 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseWithExport.js
@@ -9,12 +9,12 @@ export import "server";
 
 //// [server.js]
 "use strict";
-exports.a = 10;
 exports.__esModule = true;
+exports.a = 10;
 //// [client.js]
 "use strict";
-require("server");
 exports.__esModule = true;
+require("server");
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
index bd45a62e2f4..4ced3a35ab2 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetAmd.js
@@ -14,6 +14,7 @@ export class A
 //// [es6ModuleWithModuleGenTargetAmd.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     class A {
         constructor() {
         }
@@ -22,5 +23,4 @@ define(["require", "exports"], function (require, exports) {
         }
     }
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
index a7cf0599e54..187ece7e718 100644
--- a/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
+++ b/tests/baselines/reference/es6ModuleWithModuleGenTargetCommonjs.js
@@ -13,6 +13,7 @@ export class A
 
 //// [es6ModuleWithModuleGenTargetCommonjs.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class A {
     constructor() {
     }
@@ -21,4 +22,3 @@ class A {
     }
 }
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportAndImport-es3-amd.js b/tests/baselines/reference/exportAndImport-es3-amd.js
index b2a01bbb552..d19de0c78b0 100644
--- a/tests/baselines/reference/exportAndImport-es3-amd.js
+++ b/tests/baselines/reference/exportAndImport-es3-amd.js
@@ -15,17 +15,17 @@ export default function f2() {
 //// [m1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function f1() {
     }
     exports["default"] = f1;
-    exports.__esModule = true;
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     "use strict";
+    exports.__esModule = true;
     function f2() {
         m1_1["default"]();
     }
     exports["default"] = f2;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAndImport-es3.js b/tests/baselines/reference/exportAndImport-es3.js
index 898261ef7fe..13b6f1eaf48 100644
--- a/tests/baselines/reference/exportAndImport-es3.js
+++ b/tests/baselines/reference/exportAndImport-es3.js
@@ -14,15 +14,15 @@ export default function f2() {
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 function f1() {
 }
 exports["default"] = f1;
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 function f2() {
     m1_1["default"]();
 }
 exports["default"] = f2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAndImport-es5-amd.js b/tests/baselines/reference/exportAndImport-es5-amd.js
index fcc918bb8ce..60b1246b616 100644
--- a/tests/baselines/reference/exportAndImport-es5-amd.js
+++ b/tests/baselines/reference/exportAndImport-es5-amd.js
@@ -15,17 +15,17 @@ export default function f2() {
 //// [m1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function f1() {
     }
     exports.default = f1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [m2.js]
 define(["require", "exports", "./m1"], function (require, exports, m1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function f2() {
         m1_1.default();
     }
     exports.default = f2;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportAndImport-es5.js b/tests/baselines/reference/exportAndImport-es5.js
index fa1652c603e..f4bc496e6b2 100644
--- a/tests/baselines/reference/exportAndImport-es5.js
+++ b/tests/baselines/reference/exportAndImport-es5.js
@@ -14,15 +14,15 @@ export default function f2() {
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function f1() {
 }
 exports.default = f1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 function f2() {
     m1_1.default();
 }
 exports.default = f2;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportArrayBindingPattern.js b/tests/baselines/reference/exportArrayBindingPattern.js
index 641500fa09d..b5568109763 100644
--- a/tests/baselines/reference/exportArrayBindingPattern.js
+++ b/tests/baselines/reference/exportArrayBindingPattern.js
@@ -5,8 +5,8 @@ export { a, b };
 
 //// [exportArrayBindingPattern.js]
 "use strict";
+exports.__esModule = true;
 // issue: https://github.com/Microsoft/TypeScript/issues/10778
 var _a = [1, 2, 3], a = _a[0], b = _a[2];
 exports.a = a;
 exports.b = b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignClassAndModule.js b/tests/baselines/reference/exportAssignClassAndModule.js
index f557bc5d9a4..9f3eaf78480 100644
--- a/tests/baselines/reference/exportAssignClassAndModule.js
+++ b/tests/baselines/reference/exportAssignClassAndModule.js
@@ -28,7 +28,7 @@ var Foo = (function () {
 module.exports = Foo;
 //// [exportAssignClassAndModule_1.js]
 "use strict";
+exports.__esModule = true;
 var z;
 var zz;
 zz.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignDottedName.js b/tests/baselines/reference/exportAssignDottedName.js
index a39a7aa04cd..592d97dbaa0 100644
--- a/tests/baselines/reference/exportAssignDottedName.js
+++ b/tests/baselines/reference/exportAssignDottedName.js
@@ -12,11 +12,11 @@ export = foo1.x; // Ok
 
 //// [foo1.js]
 "use strict";
+exports.__esModule = true;
 function x() {
     return true;
 }
 exports.x = x;
-exports.__esModule = true;
 //// [foo2.js]
 "use strict";
 var foo1 = require("./foo1");
diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.js b/tests/baselines/reference/exportAssignImportedIdentifier.js
index 09daa469ef4..208df4eff63 100644
--- a/tests/baselines/reference/exportAssignImportedIdentifier.js
+++ b/tests/baselines/reference/exportAssignImportedIdentifier.js
@@ -16,11 +16,11 @@ var x = foo2(); // should be boolean
 
 //// [foo1.js]
 "use strict";
+exports.__esModule = true;
 function x() {
     return true;
 }
 exports.x = x;
-exports.__esModule = true;
 //// [foo2.js]
 "use strict";
 var foo1 = require("./foo1");
@@ -28,6 +28,6 @@ var x = foo1.x;
 module.exports = x;
 //// [foo3.js]
 "use strict";
+exports.__esModule = true;
 var foo2 = require("./foo2");
 var x = foo2(); // should be boolean
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignTypes.js b/tests/baselines/reference/exportAssignTypes.js
index 645f44545fe..bed4480f393 100644
--- a/tests/baselines/reference/exportAssignTypes.js
+++ b/tests/baselines/reference/exportAssignTypes.js
@@ -85,6 +85,7 @@ function x(a) {
 module.exports = x;
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var iString = require("./expString");
 var v1 = iString;
 var iNumber = require("./expNumber");
@@ -99,4 +100,3 @@ var iAny = require("./expAny");
 var v6 = iAny;
 var iGeneric = require("./expGeneric");
 var v7 = iGeneric;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
index e1bdf0d544f..d4b6961cfe9 100644
--- a/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
+++ b/tests/baselines/reference/exportAssignedTypeAsTypeAnnotation.js
@@ -22,6 +22,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignedTypeAsTypeAnnotation_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var t2; // should not raise a 'container type' error
     exports.__esModule = true;
+    var t2; // should not raise a 'container type' error
 });
diff --git a/tests/baselines/reference/exportAssignmentClass.js b/tests/baselines/reference/exportAssignmentClass.js
index 265afdfd041..549ad5bbd4d 100644
--- a/tests/baselines/reference/exportAssignmentClass.js
+++ b/tests/baselines/reference/exportAssignmentClass.js
@@ -25,7 +25,7 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentClass_B.js]
 define(["require", "exports", "exportAssignmentClass_A"], function (require, exports, D) {
     "use strict";
+    exports.__esModule = true;
     var d = new D();
     var x = d.p;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
index 003927c2511..eddbddf8d6d 100644
--- a/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
+++ b/tests/baselines/reference/exportAssignmentConstrainedGenericType.js
@@ -24,8 +24,8 @@ var Foo = (function () {
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var x = new foo(true); // Should error
 var y = new foo({ a: "test", b: 42 }); // Should be OK
 var z = y.test.b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentEnum.js b/tests/baselines/reference/exportAssignmentEnum.js
index a30868a18e5..a32da0a2e3f 100644
--- a/tests/baselines/reference/exportAssignmentEnum.js
+++ b/tests/baselines/reference/exportAssignmentEnum.js
@@ -27,8 +27,8 @@ var E;
 module.exports = E;
 //// [exportAssignmentEnum_B.js]
 "use strict";
+exports.__esModule = true;
 var EnumE = require("./exportAssignmentEnum_A");
 var a = EnumE.A;
 var b = EnumE.B;
 var c = EnumE.C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentFunction.js b/tests/baselines/reference/exportAssignmentFunction.js
index 5743490fec3..775bb6b1af1 100644
--- a/tests/baselines/reference/exportAssignmentFunction.js
+++ b/tests/baselines/reference/exportAssignmentFunction.js
@@ -19,6 +19,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentFunction_B.js]
 define(["require", "exports", "exportAssignmentFunction_A"], function (require, exports, fooFunc) {
     "use strict";
-    var n = fooFunc();
     exports.__esModule = true;
+    var n = fooFunc();
 });
diff --git a/tests/baselines/reference/exportAssignmentGenericType.js b/tests/baselines/reference/exportAssignmentGenericType.js
index 3ef295639fd..95563aa36a9 100644
--- a/tests/baselines/reference/exportAssignmentGenericType.js
+++ b/tests/baselines/reference/exportAssignmentGenericType.js
@@ -22,7 +22,7 @@ var Foo = (function () {
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var x = new foo();
 var y = x.test;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentInterface.js b/tests/baselines/reference/exportAssignmentInterface.js
index 8f4403cf40a..f3cc9ae9bbe 100644
--- a/tests/baselines/reference/exportAssignmentInterface.js
+++ b/tests/baselines/reference/exportAssignmentInterface.js
@@ -22,7 +22,7 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentInterface_B.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var i;
     var n = i.p1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentInternalModule.js b/tests/baselines/reference/exportAssignmentInternalModule.js
index e4ba7a9f7d8..b5c45785f8f 100644
--- a/tests/baselines/reference/exportAssignmentInternalModule.js
+++ b/tests/baselines/reference/exportAssignmentInternalModule.js
@@ -23,6 +23,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportAssignmentInternalModule_B.js]
 define(["require", "exports", "exportAssignmentInternalModule_A"], function (require, exports, modM) {
     "use strict";
-    var n = modM.x;
     exports.__esModule = true;
+    var n = modM.x;
 });
diff --git a/tests/baselines/reference/exportAssignmentMergedInterface.js b/tests/baselines/reference/exportAssignmentMergedInterface.js
index ba77f90557f..3ee760dedfa 100644
--- a/tests/baselines/reference/exportAssignmentMergedInterface.js
+++ b/tests/baselines/reference/exportAssignmentMergedInterface.js
@@ -30,6 +30,7 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     x("test");
     x(42);
@@ -37,5 +38,4 @@ define(["require", "exports"], function (require, exports) {
     if (!!x.c) { }
     var z = { x: 1, y: 2 };
     z = x.d;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentMergedModule.js b/tests/baselines/reference/exportAssignmentMergedModule.js
index 59008dfc370..ef48895b5cb 100644
--- a/tests/baselines/reference/exportAssignmentMergedModule.js
+++ b/tests/baselines/reference/exportAssignmentMergedModule.js
@@ -47,9 +47,9 @@ var Foo;
 module.exports = Foo;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var a = foo.a();
 if (!!foo.b) {
     foo.Test.answer = foo.c(42);
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
index 280e93f8c01..6c61eeedfc1 100644
--- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
+++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js
@@ -21,9 +21,9 @@ var b = z(); // call signature - no error
 exports.__esModule = true;
 //// [exportAssignmentOfDeclaredExternalModule_1.js]
 "use strict";
+exports.__esModule = true;
 var x = new Sammy(); // error to use as constructor as there is not constructor symbol
 var y = Sammy(); // error to use interface name as call target
 var z; // no error - z is of type interface Sammy from module 'M'
 var a = new z(); // constructor - no error
 var b = z(); // call signature - no error
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportAssignmentOfGenericType1.js b/tests/baselines/reference/exportAssignmentOfGenericType1.js
index f4417f871e9..9cd15ec01a4 100644
--- a/tests/baselines/reference/exportAssignmentOfGenericType1.js
+++ b/tests/baselines/reference/exportAssignmentOfGenericType1.js
@@ -36,6 +36,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (require, exports, q) {
     "use strict";
+    exports.__esModule = true;
     var M = (function (_super) {
         __extends(M, _super);
         function M() {
@@ -45,5 +46,4 @@ define(["require", "exports", "exportAssignmentOfGenericType1_0"], function (req
     }(q));
     var m;
     var r = m.foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelClodule.js b/tests/baselines/reference/exportAssignmentTopLevelClodule.js
index 44afbca1f69..f4001e5ab15 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelClodule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelClodule.js
@@ -33,8 +33,8 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.answer === 42) {
         var x = new foo();
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
index a6abc6aa37d..7ba5a655c20 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelEnumdule.js
@@ -34,9 +34,9 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     var color;
     if (color === foo.green) {
         color = foo.answer;
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelFundule.js b/tests/baselines/reference/exportAssignmentTopLevelFundule.js
index 4c0abd1d650..f122b8fbe8b 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelFundule.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelFundule.js
@@ -30,8 +30,8 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.answer === 42) {
         var x = foo();
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
index 0d31a25623c..a7acbaf3496 100644
--- a/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
+++ b/tests/baselines/reference/exportAssignmentTopLevelIdentifier.js
@@ -25,7 +25,7 @@ define(["require", "exports"], function (require, exports) {
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     if (foo.answer === 42) {
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportAssignmentVariable.js b/tests/baselines/reference/exportAssignmentVariable.js
index 8f9c02ecfbb..e6ccdb46f9a 100644
--- a/tests/baselines/reference/exportAssignmentVariable.js
+++ b/tests/baselines/reference/exportAssignmentVariable.js
@@ -16,6 +16,6 @@ var x = 0;
 module.exports = x;
 //// [exportAssignmentVariable_B.js]
 "use strict";
+exports.__esModule = true;
 var y = require("./exportAssignmentVariable_A");
 var n = y;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
index 6c3a951841d..e0165098b20 100644
--- a/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
+++ b/tests/baselines/reference/exportDeclarationWithModuleSpecifierNameOnNextLine1.js
@@ -22,23 +22,23 @@ export { x as a, } from
 
 //// [t1.js]
 "use strict";
-exports.x = "x";
 exports.__esModule = true;
+exports.x = "x";
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.x = t1_1.x;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
 exports.__esModule = true;
 //// [t4.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
-exports.__esModule = true;
 //// [t5.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.a = t1_1.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDeclareClass1.js b/tests/baselines/reference/exportDeclareClass1.js
index 23ce59f2402..950b3db26e5 100644
--- a/tests/baselines/reference/exportDeclareClass1.js
+++ b/tests/baselines/reference/exportDeclareClass1.js
@@ -12,7 +12,7 @@
 //// [exportDeclareClass1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    ;
-    ;
     exports.__esModule = true;
+    ;
+    ;
 });
diff --git a/tests/baselines/reference/exportDeclaredModule.js b/tests/baselines/reference/exportDeclaredModule.js
index 08d62eb3782..473ebaa0492 100644
--- a/tests/baselines/reference/exportDeclaredModule.js
+++ b/tests/baselines/reference/exportDeclaredModule.js
@@ -17,6 +17,6 @@ var x: number = foo1.b();
 module.exports = M1;
 //// [foo2.js]
 "use strict";
+exports.__esModule = true;
 var foo1 = require("./foo1");
 var x = foo1.b();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDefaultProperty.js b/tests/baselines/reference/exportDefaultProperty.js
index 04ad89f9dc0..dddea6a6b73 100644
--- a/tests/baselines/reference/exportDefaultProperty.js
+++ b/tests/baselines/reference/exportDefaultProperty.js
@@ -43,6 +43,7 @@ fooLength + 1;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var A;
 (function (A) {
     var B = (function () {
@@ -56,13 +57,13 @@ var A;
     })(B = A.B || (A.B = {}));
 })(A || (A = {}));
 exports["default"] = A.B;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
-exports["default"] = "foo".length;
 exports.__esModule = true;
+exports["default"] = "foo".length;
 //// [index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="declarations.d.ts" />
 var foobar_1 = require("foobar");
 var X = foobar_1["default"].X;
@@ -73,4 +74,3 @@ var a_1 = require("./a");
 var b = new a_1["default"](a_1["default"].b);
 var b_1 = require("./b");
 b_1["default"] + 1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportDefaultProperty2.js b/tests/baselines/reference/exportDefaultProperty2.js
index 861acb7347c..4922738430a 100644
--- a/tests/baselines/reference/exportDefaultProperty2.js
+++ b/tests/baselines/reference/exportDefaultProperty2.js
@@ -20,15 +20,15 @@ const x: B = { c: B };
 //// [a.js]
 // This test is just like exportEqualsProperty2, but with `export default`.
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
 exports["default"] = C.B;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var a_1 = require("./a");
 var x = { c: a_1["default"] };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualCallable.js b/tests/baselines/reference/exportEqualCallable.js
index d8347b62944..177e3943ac7 100644
--- a/tests/baselines/reference/exportEqualCallable.js
+++ b/tests/baselines/reference/exportEqualCallable.js
@@ -22,6 +22,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportEqualCallable_1.js]
 define(["require", "exports", "exportEqualCallable_0"], function (require, exports, connect) {
     "use strict";
-    connect();
     exports.__esModule = true;
+    connect();
 });
diff --git a/tests/baselines/reference/exportEqualErrorType.js b/tests/baselines/reference/exportEqualErrorType.js
index f8d0afe95da..4a65ce5fd49 100644
--- a/tests/baselines/reference/exportEqualErrorType.js
+++ b/tests/baselines/reference/exportEqualErrorType.js
@@ -30,6 +30,6 @@ define(["require", "exports"], function (require, exports) {
 //// [exportEqualErrorType_1.js]
 define(["require", "exports", "exportEqualErrorType_0"], function (require, exports, connect) {
     "use strict";
-    connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
     exports.__esModule = true;
+    connect().use(connect.static('foo')); // Error  1      The property 'static' does not exist on value of type ''.
 });
diff --git a/tests/baselines/reference/exportEqualMemberMissing.js b/tests/baselines/reference/exportEqualMemberMissing.js
index 3a4982a7434..68ac9485f5f 100644
--- a/tests/baselines/reference/exportEqualMemberMissing.js
+++ b/tests/baselines/reference/exportEqualMemberMissing.js
@@ -27,7 +27,7 @@ var server;
 module.exports = server;
 //// [exportEqualMemberMissing_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='exportEqualMemberMissing_0.ts'/>
 var connect = require("./exportEqualMemberMissing_0");
 connect().use(connect.static('foo')); // Error	1	The property 'static' does not exist on value of type ''.
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualsDefaultProperty.js b/tests/baselines/reference/exportEqualsDefaultProperty.js
index 3cf45681807..9cf7a7b2ee8 100644
--- a/tests/baselines/reference/exportEqualsDefaultProperty.js
+++ b/tests/baselines/reference/exportEqualsDefaultProperty.js
@@ -23,6 +23,6 @@ var x = {
 module.exports = x;
 //// [imp.js]
 "use strict";
+exports.__esModule = true;
 var exp_1 = require("./exp");
 exp_1["default"].toExponential(2);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualsProperty.js b/tests/baselines/reference/exportEqualsProperty.js
index feb5e563903..e6bd09d5367 100644
--- a/tests/baselines/reference/exportEqualsProperty.js
+++ b/tests/baselines/reference/exportEqualsProperty.js
@@ -60,6 +60,7 @@ module.exports = A.B;
 module.exports = "foo".length;
 //// [index.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="declarations.d.ts" />
 var foobar_1 = require("foobar");
 var X2 = require("foobarx");
@@ -69,4 +70,3 @@ var B = require("./a");
 var b = new B(B.b);
 var fooLength = require("./b");
 fooLength + 1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportEqualsProperty2.js b/tests/baselines/reference/exportEqualsProperty2.js
index f51a130e572..36fcbdf3446 100644
--- a/tests/baselines/reference/exportEqualsProperty2.js
+++ b/tests/baselines/reference/exportEqualsProperty2.js
@@ -28,6 +28,6 @@ var C = (function () {
 module.exports = C.B;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var B = require("./a");
 var x = { c: B };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportImport.js b/tests/baselines/reference/exportImport.js
index d947393c05f..615f3d266ab 100644
--- a/tests/baselines/reference/exportImport.js
+++ b/tests/baselines/reference/exportImport.js
@@ -29,17 +29,17 @@ define(["require", "exports"], function (require, exports) {
 //// [exporter.js]
 define(["require", "exports", "./w1"], function (require, exports, w) {
     "use strict";
-    exports.w = w;
     exports.__esModule = true;
+    exports.w = w;
 });
 //// [consumer.js]
 define(["require", "exports", "./exporter"], function (require, exports, e) {
     "use strict";
+    exports.__esModule = true;
     function w() {
         return new e.w();
     }
     exports.w = w;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/exportImportMultipleFiles.js b/tests/baselines/reference/exportImportMultipleFiles.js
index 7defcbac044..31f5f218d65 100644
--- a/tests/baselines/reference/exportImportMultipleFiles.js
+++ b/tests/baselines/reference/exportImportMultipleFiles.js
@@ -15,20 +15,20 @@ lib.math.add(3, 4); // Shouldnt be error
 //// [exportImportMultipleFiles_math.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function add(a, b) { return a + b; }
     exports.add = add;
-    exports.__esModule = true;
 });
 //// [exportImportMultipleFiles_library.js]
 define(["require", "exports", "exportImportMultipleFiles_math"], function (require, exports, math) {
     "use strict";
+    exports.__esModule = true;
     exports.math = math;
     exports.math.add(3, 4); // OK
-    exports.__esModule = true;
 });
 //// [exportImportMultipleFiles_userCode.js]
 define(["require", "exports", "./exportImportMultipleFiles_library"], function (require, exports, lib) {
     "use strict";
-    lib.math.add(3, 4); // Shouldnt be error
     exports.__esModule = true;
+    lib.math.add(3, 4); // Shouldnt be error
 });
diff --git a/tests/baselines/reference/exportImportNonInstantiatedModule2.js b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
index 77eb0c35ce6..1394d7492dd 100644
--- a/tests/baselines/reference/exportImportNonInstantiatedModule2.js
+++ b/tests/baselines/reference/exportImportNonInstantiatedModule2.js
@@ -28,11 +28,11 @@ define(["require", "exports"], function (require, exports) {
 //// [consumer.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function w() {
         return { name: 'value' };
     }
     exports.w = w;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/exportNonInitializedVariablesAMD.js b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
index ba7f9380865..f7ee0b8d4d8 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesAMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesAMD.js
@@ -37,6 +37,7 @@ export let h1: D = new D;
 //// [exportNonInitializedVariablesAMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var ;
     let;
     var ;
@@ -67,5 +68,4 @@ define(["require", "exports"], function (require, exports) {
     exports.f1 = new D;
     exports.g1 = new D;
     exports.h1 = new D;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
index bf30e45f1ca..7623127aee8 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesCommonJS.js
@@ -36,6 +36,7 @@ export let h1: D = new D;
 
 //// [exportNonInitializedVariablesCommonJS.js]
 "use strict";
+exports.__esModule = true;
 var ;
 let;
 var ;
@@ -66,4 +67,3 @@ exports.e1 = new D;
 exports.f1 = new D;
 exports.g1 = new D;
 exports.h1 = new D;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportNonInitializedVariablesUMD.js b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
index 1b26cfe3c1a..504c6e70084 100644
--- a/tests/baselines/reference/exportNonInitializedVariablesUMD.js
+++ b/tests/baselines/reference/exportNonInitializedVariablesUMD.js
@@ -45,6 +45,7 @@ export let h1: D = new D;
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var ;
     let;
     var ;
@@ -75,5 +76,4 @@ export let h1: D = new D;
     exports.f1 = new D;
     exports.g1 = new D;
     exports.h1 = new D;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportRedeclarationTypeAliases.js b/tests/baselines/reference/exportRedeclarationTypeAliases.js
index a9ec4591c6c..c3e97cf3e10 100644
--- a/tests/baselines/reference/exportRedeclarationTypeAliases.js
+++ b/tests/baselines/reference/exportRedeclarationTypeAliases.js
@@ -5,6 +5,6 @@ export function Foo(): any {}
 
 //// [exportRedeclarationTypeAliases.js]
 "use strict";
+exports.__esModule = true;
 function Foo() { }
 exports.Foo = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportSameNameFuncVar.js b/tests/baselines/reference/exportSameNameFuncVar.js
index e5fa8913ffd..dc0b24b98c3 100644
--- a/tests/baselines/reference/exportSameNameFuncVar.js
+++ b/tests/baselines/reference/exportSameNameFuncVar.js
@@ -6,9 +6,9 @@ export function a() {
 //// [exportSameNameFuncVar.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = 10;
     function a() {
     }
     exports.a = a;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportSpecifierForAGlobal.js b/tests/baselines/reference/exportSpecifierForAGlobal.js
index b117972450e..fe59f5071f2 100644
--- a/tests/baselines/reference/exportSpecifierForAGlobal.js
+++ b/tests/baselines/reference/exportSpecifierForAGlobal.js
@@ -14,12 +14,12 @@ export function f() {
 
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 function f() {
     var x;
     return x;
 }
 exports.f = f;
-exports.__esModule = true;
 
 
 //// [b.d.ts]
diff --git a/tests/baselines/reference/exportStar-amd.js b/tests/baselines/reference/exportStar-amd.js
index 9a4def0dd78..f25a68a5aa6 100644
--- a/tests/baselines/reference/exportStar-amd.js
+++ b/tests/baselines/reference/exportStar-amd.js
@@ -32,28 +32,28 @@ foo;
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = 1;
     exports.y = 2;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.default = "hello";
     function foo() { }
     exports.foo = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var x = "x";
     exports.x = x;
     var y = "y";
     exports.y = y;
     var z = "z";
     exports.z = z;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t4.js]
 define(["require", "exports", "./t1", "./t2", "./t3"], function (require, exports, t1_1, t2_1, t3_1) {
@@ -61,18 +61,18 @@ define(["require", "exports", "./t1", "./t2", "./t3"], function (require, export
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    Object.defineProperty(exports, "__esModule", { value: true });
     __export(t1_1);
     __export(t2_1);
     __export(t3_1);
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [main.js]
 define(["require", "exports", "./t4"], function (require, exports, t4_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     t4_1.default;
     t4_1.x;
     t4_1.y;
     t4_1.z;
     t4_1.foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportStar.js b/tests/baselines/reference/exportStar.js
index 4b9ec28f6aa..a188cefd8b6 100644
--- a/tests/baselines/reference/exportStar.js
+++ b/tests/baselines/reference/exportStar.js
@@ -31,39 +31,39 @@ foo;
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = 1;
 exports.y = 2;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = "hello";
 function foo() { }
 exports.foo = foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var x = "x";
 exports.x = x;
 var y = "y";
 exports.y = y;
 var z = "z";
 exports.z = z;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t4.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./t1"));
 __export(require("./t2"));
 __export(require("./t3"));
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [main.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t4_1 = require("./t4");
 t4_1.default;
 t4_1.x;
 t4_1.y;
 t4_1.z;
 t4_1.foo;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportStarForValues.js b/tests/baselines/reference/exportStarForValues.js
index 3b74564d4d1..8376ec1927e 100644
--- a/tests/baselines/reference/exportStarForValues.js
+++ b/tests/baselines/reference/exportStarForValues.js
@@ -16,6 +16,6 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x;
     exports.__esModule = true;
+    var x;
 });
diff --git a/tests/baselines/reference/exportStarForValues2.js b/tests/baselines/reference/exportStarForValues2.js
index 74b28ef6d00..f18f9f1c587 100644
--- a/tests/baselines/reference/exportStarForValues2.js
+++ b/tests/baselines/reference/exportStarForValues2.js
@@ -20,12 +20,12 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues3.js b/tests/baselines/reference/exportStarForValues3.js
index 52e18851fc9..5ccd12f8a37 100644
--- a/tests/baselines/reference/exportStarForValues3.js
+++ b/tests/baselines/reference/exportStarForValues3.js
@@ -32,24 +32,24 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file4.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file5.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues4.js b/tests/baselines/reference/exportStarForValues4.js
index 7697100842e..e06b5e26207 100644
--- a/tests/baselines/reference/exportStarForValues4.js
+++ b/tests/baselines/reference/exportStarForValues4.js
@@ -24,12 +24,12 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 1;
     exports.__esModule = true;
+    var x = 1;
 });
diff --git a/tests/baselines/reference/exportStarForValues7.js b/tests/baselines/reference/exportStarForValues7.js
index 1311e215fce..1f5163dd9cd 100644
--- a/tests/baselines/reference/exportStarForValues7.js
+++ b/tests/baselines/reference/exportStarForValues7.js
@@ -20,8 +20,8 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports, file2_1) {
@@ -29,7 +29,7 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file2_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues8.js b/tests/baselines/reference/exportStarForValues8.js
index b6ee3c56ae7..6f52bce89f9 100644
--- a/tests/baselines/reference/exportStarForValues8.js
+++ b/tests/baselines/reference/exportStarForValues8.js
@@ -32,14 +32,14 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [file3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x = 1;
     exports.__esModule = true;
+    exports.x = 1;
 });
 //// [file4.js]
 define(["require", "exports", "file2", "file3"], function (require, exports, file2_1, file3_1) {
@@ -47,10 +47,10 @@ define(["require", "exports", "file2", "file3"], function (require, exports, fil
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file2_1);
     __export(file3_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
 //// [file5.js]
 define(["require", "exports", "file4"], function (require, exports, file4_1) {
@@ -58,7 +58,7 @@ define(["require", "exports", "file4"], function (require, exports, file4_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file4_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarForValues9.js b/tests/baselines/reference/exportStarForValues9.js
index 5d24c558ec0..3c34bb1afdb 100644
--- a/tests/baselines/reference/exportStarForValues9.js
+++ b/tests/baselines/reference/exportStarForValues9.js
@@ -27,9 +27,9 @@ define(["require", "exports", "file2"], function (require, exports, file2_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file2_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "file3"], function (require, exports, file3_1) {
@@ -37,7 +37,7 @@ define(["require", "exports", "file3"], function (require, exports, file3_1) {
     function __export(m) {
         for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
     }
+    exports.__esModule = true;
     __export(file3_1);
     exports.x = 1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportStarFromEmptyModule.js b/tests/baselines/reference/exportStarFromEmptyModule.js
index 44ece871874..4fcac9312b9 100644
--- a/tests/baselines/reference/exportStarFromEmptyModule.js
+++ b/tests/baselines/reference/exportStarFromEmptyModule.js
@@ -25,13 +25,13 @@ X.A.r; // Error
 
 //// [exportStarFromEmptyModule_module1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [exportStarFromEmptyModule_module2.js]
 // empty
 //// [exportStarFromEmptyModule_module3.js]
@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./exportStarFromEmptyModule_module2"));
 __export(require("./exportStarFromEmptyModule_module1"));
 var A = (function () {
@@ -47,14 +48,13 @@ var A = (function () {
     return A;
 }());
 exports.A = A;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [exportStarFromEmptyModule_module4.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var X = require("./exportStarFromEmptyModule_module3");
 var s;
 X.A.q;
 X.A.r; // Error
-Object.defineProperty(exports, "__esModule", { value: true });
 
 
 //// [exportStarFromEmptyModule_module1.d.ts]
diff --git a/tests/baselines/reference/exportToString.js b/tests/baselines/reference/exportToString.js
index ee9482c655f..d527a02741c 100644
--- a/tests/baselines/reference/exportToString.js
+++ b/tests/baselines/reference/exportToString.js
@@ -5,6 +5,6 @@ export { toString };
 
 //// [exportToString.js]
 "use strict";
+exports.__esModule = true;
 var toString = 0;
 exports.toString = toString;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportVisibility.js b/tests/baselines/reference/exportVisibility.js
index d66cf543124..fbb2555d54b 100644
--- a/tests/baselines/reference/exportVisibility.js
+++ b/tests/baselines/reference/exportVisibility.js
@@ -11,6 +11,7 @@ export function test(foo: Foo) {
 
 //// [exportVisibility.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
@@ -22,4 +23,3 @@ function test(foo) {
     return true;
 }
 exports.test = test;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportedBlockScopedDeclarations.js b/tests/baselines/reference/exportedBlockScopedDeclarations.js
index 357e7dc25f4..068ac5db23b 100644
--- a/tests/baselines/reference/exportedBlockScopedDeclarations.js
+++ b/tests/baselines/reference/exportedBlockScopedDeclarations.js
@@ -20,6 +20,7 @@ namespace NS1 {
 //// [exportedBlockScopedDeclarations.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var foo = foo; // compile error
     exports.bar = exports.bar; // should be compile error
     function f() {
@@ -38,5 +39,4 @@ define(["require", "exports"], function (require, exports) {
     (function (NS1) {
         NS1.bar1 = NS1.bar1; // should be compile error
     })(NS1 || (NS1 = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportedVariable1.js b/tests/baselines/reference/exportedVariable1.js
index 11737e21e73..80a7fc6a391 100644
--- a/tests/baselines/reference/exportedVariable1.js
+++ b/tests/baselines/reference/exportedVariable1.js
@@ -6,7 +6,7 @@ var upper = foo.name.toUpperCase();
 //// [exportedVariable1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.foo = { name: "Bill" };
     var upper = exports.foo.name.toUpperCase();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportingContainingVisibleType.js b/tests/baselines/reference/exportingContainingVisibleType.js
index 5e9d0f2edf2..d50a2a35f06 100644
--- a/tests/baselines/reference/exportingContainingVisibleType.js
+++ b/tests/baselines/reference/exportingContainingVisibleType.js
@@ -13,6 +13,7 @@ export var x = 5;
 //// [exportingContainingVisibleType.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
@@ -27,5 +28,4 @@ define(["require", "exports"], function (require, exports) {
         return Foo;
     }());
     exports.x = 5;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/exportsAndImports1-amd.js b/tests/baselines/reference/exportsAndImports1-amd.js
index f6456368e33..87761c779fa 100644
--- a/tests/baselines/reference/exportsAndImports1-amd.js
+++ b/tests/baselines/reference/exportsAndImports1-amd.js
@@ -37,6 +37,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var v = 1;
     exports.v = v;
     function f() { }
@@ -60,27 +61,26 @@ define(["require", "exports"], function (require, exports) {
     exports.M = M;
     var a = M.x;
     exports.a = a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v;
     exports.f = t1_1.f;
     exports.C = t1_1.C;
     exports.E = t1_1.E;
     exports.M = t1_1.M;
     exports.a = t1_1.a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v;
     exports.f = t1_1.f;
     exports.C = t1_1.C;
     exports.E = t1_1.E;
     exports.M = t1_1.M;
     exports.a = t1_1.a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports1-es6.js b/tests/baselines/reference/exportsAndImports1-es6.js
index 968cd185378..6b9a40f0ea2 100644
--- a/tests/baselines/reference/exportsAndImports1-es6.js
+++ b/tests/baselines/reference/exportsAndImports1-es6.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var v = 1;
 exports.v = v;
 function f() { }
@@ -56,9 +57,9 @@ var M;
 exports.M = M;
 var a = M.x;
 exports.a = a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -66,9 +67,9 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -76,4 +77,3 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports1.js b/tests/baselines/reference/exportsAndImports1.js
index a6f97be0677..56f74d27473 100644
--- a/tests/baselines/reference/exportsAndImports1.js
+++ b/tests/baselines/reference/exportsAndImports1.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 var v = 1;
 exports.v = v;
 function f() { }
@@ -59,9 +60,9 @@ var M;
 exports.M = M;
 var a = M.x;
 exports.a = a;
-exports.__esModule = true;
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -69,9 +70,9 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v;
 exports.f = t1_1.f;
@@ -79,4 +80,3 @@ exports.C = t1_1.C;
 exports.E = t1_1.E;
 exports.M = t1_1.M;
 exports.a = t1_1.a;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports2-amd.js b/tests/baselines/reference/exportsAndImports2-amd.js
index d67dd92707d..5154751b21e 100644
--- a/tests/baselines/reference/exportsAndImports2-amd.js
+++ b/tests/baselines/reference/exportsAndImports2-amd.js
@@ -16,21 +16,21 @@ export { x as y, y as x };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.x = "x";
     exports.y = "y";
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.y = t1_1.x;
     exports.x = t1_1.y;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.y = t1_1.x;
     exports.x = t1_1.y;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports2-es6.js b/tests/baselines/reference/exportsAndImports2-es6.js
index 59ee55defd8..b0714b83c39 100644
--- a/tests/baselines/reference/exportsAndImports2-es6.js
+++ b/tests/baselines/reference/exportsAndImports2-es6.js
@@ -15,18 +15,18 @@ export { x as y, y as x };
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.x = "x";
 exports.y = "y";
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports2.js b/tests/baselines/reference/exportsAndImports2.js
index 672d7161e74..5b3fe689d90 100644
--- a/tests/baselines/reference/exportsAndImports2.js
+++ b/tests/baselines/reference/exportsAndImports2.js
@@ -15,18 +15,18 @@ export { x as y, y as x };
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 exports.x = "x";
 exports.y = "y";
-exports.__esModule = true;
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.y = t1_1.x;
 exports.x = t1_1.y;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports3-amd.js b/tests/baselines/reference/exportsAndImports3-amd.js
index 1f74addddec..a6af4adb5f4 100644
--- a/tests/baselines/reference/exportsAndImports3-amd.js
+++ b/tests/baselines/reference/exportsAndImports3-amd.js
@@ -37,6 +37,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = 1;
     exports.v1 = exports.v;
     function f() { }
@@ -62,27 +63,26 @@ define(["require", "exports"], function (require, exports) {
     exports.M1 = M;
     exports.a = M.x;
     exports.a1 = exports.a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t2.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v1;
     exports.f = t1_1.f1;
     exports.C = t1_1.C1;
     exports.E = t1_1.E1;
     exports.M = t1_1.M1;
     exports.a = t1_1.a1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [t3.js]
 define(["require", "exports", "./t1"], function (require, exports, t1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.v = t1_1.v1;
     exports.f = t1_1.f1;
     exports.C = t1_1.C1;
     exports.E = t1_1.E1;
     exports.M = t1_1.M1;
     exports.a = t1_1.a1;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports3-es6.js b/tests/baselines/reference/exportsAndImports3-es6.js
index b4152cab778..1ac23446807 100644
--- a/tests/baselines/reference/exportsAndImports3-es6.js
+++ b/tests/baselines/reference/exportsAndImports3-es6.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.v = 1;
 exports.v1 = exports.v;
 function f() { }
@@ -58,9 +59,9 @@ var M;
 exports.M1 = M;
 exports.a = M.x;
 exports.a1 = exports.a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -68,9 +69,9 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -78,4 +79,3 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports3.js b/tests/baselines/reference/exportsAndImports3.js
index 2bc4c828fe1..4dfa0411946 100644
--- a/tests/baselines/reference/exportsAndImports3.js
+++ b/tests/baselines/reference/exportsAndImports3.js
@@ -36,6 +36,7 @@ export { v, f, C, I, E, D, M, N, T, a };
 
 //// [t1.js]
 "use strict";
+exports.__esModule = true;
 exports.v = 1;
 exports.v1 = exports.v;
 function f() { }
@@ -61,9 +62,9 @@ var M;
 exports.M1 = M;
 exports.a = M.x;
 exports.a1 = exports.a;
-exports.__esModule = true;
 //// [t2.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -71,9 +72,9 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
-exports.__esModule = true;
 //// [t3.js]
 "use strict";
+exports.__esModule = true;
 var t1_1 = require("./t1");
 exports.v = t1_1.v1;
 exports.f = t1_1.f1;
@@ -81,4 +82,3 @@ exports.C = t1_1.C1;
 exports.E = t1_1.E1;
 exports.M = t1_1.M1;
 exports.a = t1_1.a1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImports4-amd.js b/tests/baselines/reference/exportsAndImports4-amd.js
index ddacb1eec94..ed31f42ebc7 100644
--- a/tests/baselines/reference/exportsAndImports4-amd.js
+++ b/tests/baselines/reference/exportsAndImports4-amd.js
@@ -42,12 +42,13 @@ export { a, b, c, d, e1, e2, f1, f2 };
 //// [t1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.default = "hello";
     Object.defineProperty(exports, "__esModule", { value: true });
+    exports.default = "hello";
 });
 //// [t3.js]
 define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], function (require, exports, a, t1_1, c, t1_2, t1_3, t1_4) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     exports.a = a;
     a.default;
     exports.b = t1_1.default;
@@ -65,5 +66,4 @@ define(["require", "exports", "./t1", "./t1", "./t1", "./t1", "./t1", "./t1"], f
     exports.f2 = t1_4.default;
     t1_4.default;
     t1_4.default;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/exportsAndImports4-es6.js b/tests/baselines/reference/exportsAndImports4-es6.js
index 5f0c37ab04f..d8c51d03bb1 100644
--- a/tests/baselines/reference/exportsAndImports4-es6.js
+++ b/tests/baselines/reference/exportsAndImports4-es6.js
@@ -41,10 +41,11 @@ export { a, b, c, d, e1, e2, f1, f2 };
 
 //// [t1.js]
 "use strict";
-exports.default = "hello";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = "hello";
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const a = require("./t1");
 exports.a = a;
 a.default;
@@ -67,4 +68,3 @@ exports.f1 = t1_4.default;
 exports.f2 = t1_4.default;
 t1_4.default;
 t1_4.default;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImports4.js b/tests/baselines/reference/exportsAndImports4.js
index 6a78862e55e..99f81a6b875 100644
--- a/tests/baselines/reference/exportsAndImports4.js
+++ b/tests/baselines/reference/exportsAndImports4.js
@@ -41,10 +41,11 @@ export { a, b, c, d, e1, e2, f1, f2 };
 
 //// [t1.js]
 "use strict";
-exports.default = "hello";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = "hello";
 //// [t3.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var a = require("./t1");
 exports.a = a;
 a.default;
@@ -67,4 +68,3 @@ exports.f1 = t1_4.default;
 exports.f2 = t1_4.default;
 t1_4.default;
 t1_4.default;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
index 0a2ee7d3183..068afdc346b 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames01.js
@@ -21,6 +21,7 @@ import { get } from "./t1";
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var set = {
     set foo(x) {
     }
@@ -28,7 +29,6 @@ var set = {
 exports.set = set;
 var get = 10;
 exports.get = get;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
index ea7f554d1b3..8b1deff064f 100644
--- a/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
+++ b/tests/baselines/reference/exportsAndImportsWithContextualKeywordNames02.js
@@ -19,16 +19,16 @@ import { as } from "./t1";
 
 //// [t1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var as = 100;
 exports.return = as;
 exports.as = as;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var as = require("./t1");
 var x = as.as;
 var y = as.return;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [t3.js]
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
index 2b3e9d36f33..207d2948fa4 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores1.js
@@ -16,15 +16,15 @@ const { __, _, ___ } = R;
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 var R;
 exports["default"] = R = {
     "__": 20,
     "_": 10,
     "___": 30
 };
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 var __ = m1_1["default"].__, _ = m1_1["default"]._, ___ = m1_1["default"].___;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
index 3555148f755..a53d4662e97 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores2.js
@@ -15,14 +15,14 @@ const { __esmodule, __proto__ } = R;
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 var R;
 exports["default"] = R = {
     "__esmodule": true,
     "__proto__": {}
 };
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 var __esmodule = m1_1["default"].__esmodule, __proto__ = m1_1["default"].__proto__;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
index 028ca80400f..3a5bba1deed 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores3.js
@@ -16,15 +16,15 @@ const { ___, ___hello, _hi } = R;
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 var R;
 exports["default"] = R = {
     "___": 30,
     "___hello": 21,
     "_hi": 40
 };
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 var ___ = m1_1["default"].___, ___hello = m1_1["default"].___hello, _hi = m1_1["default"]._hi;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
index fa643c5e7e2..718d048b9a2 100644
--- a/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
+++ b/tests/baselines/reference/exportsAndImportsWithUnderscores4.js
@@ -36,6 +36,7 @@ _hi();
 
 //// [m1.js]
 "use strict";
+exports.__esModule = true;
 function _() {
     console.log("_");
 }
@@ -64,9 +65,9 @@ function ___hello() {
     console.log("___hello");
 }
 exports.___hello = ___hello;
-exports.__esModule = true;
 //// [m2.js]
 "use strict";
+exports.__esModule = true;
 var m1_1 = require("./m1");
 m1_1._();
 m1_1.__();
@@ -74,4 +75,3 @@ m1_1.___hello();
 m1_1.__esmodule();
 m1_1.__proto();
 m1_1._hi();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/extendClassExpressionFromModule.js b/tests/baselines/reference/extendClassExpressionFromModule.js
index a5900c588ba..28c9488f7fa 100644
--- a/tests/baselines/reference/extendClassExpressionFromModule.js
+++ b/tests/baselines/reference/extendClassExpressionFromModule.js
@@ -31,6 +31,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var foo1 = require("./foo1");
 var x = foo1;
 var y = (function (_super) {
@@ -40,4 +41,3 @@ var y = (function (_super) {
     }
     return y;
 }(x));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
index 4f0d5ced7b5..c8f7719faf0 100644
--- a/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
+++ b/tests/baselines/reference/extendingClassFromAliasAndUsageInIndexer.js
@@ -34,13 +34,13 @@ var visModel = new moduleMap[moduleName].VisualizationModel();
 
 //// [extendingClassFromAliasAndUsageInIndexer_backbone.js]
 "use strict";
+exports.__esModule = true;
 var Model = (function () {
     function Model() {
     }
     return Model;
 }());
 exports.Model = Model;
-exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_moduleA.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -53,6 +53,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -62,7 +63,6 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_moduleB.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -75,6 +75,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Backbone = require("./extendingClassFromAliasAndUsageInIndexer_backbone");
 var VisualizationModel = (function (_super) {
     __extends(VisualizationModel, _super);
@@ -84,9 +85,9 @@ var VisualizationModel = (function (_super) {
     return VisualizationModel;
 }(Backbone.Model));
 exports.VisualizationModel = VisualizationModel;
-exports.__esModule = true;
 //// [extendingClassFromAliasAndUsageInIndexer_main.js]
 "use strict";
+exports.__esModule = true;
 var moduleA = require("./extendingClassFromAliasAndUsageInIndexer_moduleA");
 var moduleB = require("./extendingClassFromAliasAndUsageInIndexer_moduleB");
 var moduleATyped = moduleA;
@@ -96,4 +97,3 @@ var moduleMap = {
 };
 var moduleName;
 var visModel = new moduleMap[moduleName].VisualizationModel();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleAssignToVar.js b/tests/baselines/reference/externalModuleAssignToVar.js
index 41ec58a467d..70ce2281ad3 100644
--- a/tests/baselines/reference/externalModuleAssignToVar.js
+++ b/tests/baselines/reference/externalModuleAssignToVar.js
@@ -29,13 +29,13 @@ y3 = ext3; // ok
 //// [externalModuleAssignToVar_core_require.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
 //// [externalModuleAssignToVar_core_require2.js]
 define(["require", "exports"], function (require, exports) {
@@ -60,11 +60,11 @@ define(["require", "exports"], function (require, exports) {
 //// [externalModuleAssignToVar_core.js]
 define(["require", "exports", "externalModuleAssignToVar_core_require", "externalModuleAssignToVar_core_require2", "externalModuleAssignToVar_ext"], function (require, exports, ext, ext2, ext3) {
     "use strict";
+    exports.__esModule = true;
     var y1 = ext;
     y1 = ext; // ok
     var y2 = ext2;
     y2 = ext2; // ok
     var y3 = ext3;
     y3 = ext3; // ok
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/externalModuleExportingGenericClass.js b/tests/baselines/reference/externalModuleExportingGenericClass.js
index ca51181ec3b..33aa1776e94 100644
--- a/tests/baselines/reference/externalModuleExportingGenericClass.js
+++ b/tests/baselines/reference/externalModuleExportingGenericClass.js
@@ -25,8 +25,8 @@ var C = (function () {
 module.exports = C;
 //// [externalModuleExportingGenericClass_file1.js]
 "use strict";
+exports.__esModule = true;
 var a = require("./externalModuleExportingGenericClass_file0");
 var v; // this should report error
 var v2 = (new a()).foo;
 var v3 = (new a()).foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.js b/tests/baselines/reference/externalModuleImmutableBindings.js
index bd811cd8b58..7e2a78a4728 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.js
+++ b/tests/baselines/reference/externalModuleImmutableBindings.js
@@ -53,10 +53,11 @@ for ((stuff[n]) of []) {}
 
 //// [f1.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 // all mutations below are illegal and should be fixed
 var stuff = require("./f1");
 var n = 'baz';
@@ -108,4 +109,3 @@ for ((stuff[n]) in []) { }
 for (var _p = 0, _q = []; _p < _q.length; _p++) {
     (stuff[n]) = _q[_p];
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleQualification.js b/tests/baselines/reference/externalModuleQualification.js
index 353af42a408..0402847a13a 100644
--- a/tests/baselines/reference/externalModuleQualification.js
+++ b/tests/baselines/reference/externalModuleQualification.js
@@ -13,6 +13,7 @@ class NavigateAction {
 
 //// [externalModuleQualification.js]
 "use strict";
+exports.__esModule = true;
 exports.ID = "test";
 var DiffEditor = (function () {
     function DiffEditor(id) {
@@ -28,4 +29,3 @@ var NavigateAction = (function () {
     };
     return NavigateAction;
 }());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
index 75d719670d1..e5a854077c5 100644
--- a/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
+++ b/tests/baselines/reference/externalModuleReferenceOfImportDeclarationWithExportModifier.js
@@ -11,15 +11,15 @@ file1.foo();
 //// [externalModuleReferenceOfImportDeclarationWithExportModifier_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo() { }
     exports.foo = foo;
     ;
-    exports.__esModule = true;
 });
 //// [externalModuleReferenceOfImportDeclarationWithExportModifier_1.js]
 define(["require", "exports", "externalModuleReferenceOfImportDeclarationWithExportModifier_0"], function (require, exports, file1) {
     "use strict";
+    exports.__esModule = true;
     exports.file1 = file1;
     exports.file1.foo();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
index a012d0d37b6..3a930d8e03a 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.js
@@ -20,14 +20,14 @@ file1.bar();
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file2.js]
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file1.js]
 "use strict";
+exports.__esModule = true;
 function foo() { }
 exports.foo = foo;
 ;
-exports.__esModule = true;
 //// [externalModuleRefernceResolutionOrderInImportDeclaration_file3.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts'/>
 var file1 = require("./externalModuleRefernceResolutionOrderInImportDeclaration_file1");
 file1.foo();
 file1.bar();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleResolution.js b/tests/baselines/reference/externalModuleResolution.js
index 3d1fe11f88f..1ef5be53883 100644
--- a/tests/baselines/reference/externalModuleResolution.js
+++ b/tests/baselines/reference/externalModuleResolution.js
@@ -25,6 +25,6 @@ var M2;
 module.exports = M2;
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var x = require("./foo");
 x.Y; // .ts should be picked
-exports.__esModule = true;
diff --git a/tests/baselines/reference/externalModuleResolution2.js b/tests/baselines/reference/externalModuleResolution2.js
index 96fb493090f..2c3c9facff1 100644
--- a/tests/baselines/reference/externalModuleResolution2.js
+++ b/tests/baselines/reference/externalModuleResolution2.js
@@ -26,6 +26,6 @@ var M2;
 module.exports = M2;
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var x = require("./foo");
 x.X; // .ts should be picked
-exports.__esModule = true;
diff --git a/tests/baselines/reference/fieldAndGetterWithSameName.js b/tests/baselines/reference/fieldAndGetterWithSameName.js
index 959a3ffffcf..673a0372f05 100644
--- a/tests/baselines/reference/fieldAndGetterWithSameName.js
+++ b/tests/baselines/reference/fieldAndGetterWithSameName.js
@@ -7,6 +7,7 @@ export class C {
 //// [fieldAndGetterWithSameName.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
@@ -18,5 +19,4 @@ define(["require", "exports"], function (require, exports) {
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
index 793f4ab6c06..9b48439ad56 100644
--- a/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
+++ b/tests/baselines/reference/filesEmittingIntoSameOutputWithOutOption.js
@@ -12,13 +12,13 @@ function foo() {
 //// [a.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c = (function () {
         function c() {
         }
         return c;
     }());
     exports.c = c;
-    exports.__esModule = true;
 });
 function foo() {
 }
diff --git a/tests/baselines/reference/functionAndImportNameConflict.js b/tests/baselines/reference/functionAndImportNameConflict.js
index 3b1644e7ac1..2bc6d91b2c3 100644
--- a/tests/baselines/reference/functionAndImportNameConflict.js
+++ b/tests/baselines/reference/functionAndImportNameConflict.js
@@ -11,13 +11,13 @@ export function f() {
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 function f() {
 }
 exports.f = f;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 function f() {
 }
 exports.f = f;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/functionLikeInParameterInitializer.js b/tests/baselines/reference/functionLikeInParameterInitializer.js
index d794cded0f4..9bf71aff1ea 100644
--- a/tests/baselines/reference/functionLikeInParameterInitializer.js
+++ b/tests/baselines/reference/functionLikeInParameterInitializer.js
@@ -21,6 +21,7 @@ export function baz3(func = class { x = foo }) {
 
 //// [functionLikeInParameterInitializer.js]
 "use strict";
+exports.__esModule = true;
 // error
 function bar(func) {
     if (func === void 0) { func = function () { return foo; }; }
@@ -50,4 +51,3 @@ function baz3(func) {
     var foo = "in";
 }
 exports.baz3 = baz3;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/generatorES6InAMDModule.js b/tests/baselines/reference/generatorES6InAMDModule.js
index 426697dfa8d..b7e460af9b1 100644
--- a/tests/baselines/reference/generatorES6InAMDModule.js
+++ b/tests/baselines/reference/generatorES6InAMDModule.js
@@ -6,9 +6,9 @@ export function* foo() {
 //// [generatorES6InAMDModule.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     function* foo() {
         yield;
     }
     exports.foo = foo;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/genericClassesInModule2.js b/tests/baselines/reference/genericClassesInModule2.js
index 1b008c90860..738fa996cf7 100644
--- a/tests/baselines/reference/genericClassesInModule2.js
+++ b/tests/baselines/reference/genericClassesInModule2.js
@@ -23,6 +23,7 @@ export class B<T2> {
 //// [genericClassesInModule2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A(callback) {
             this.callback = callback;
@@ -41,5 +42,4 @@ define(["require", "exports"], function (require, exports) {
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
index 2cbb4485e31..83b100f4837 100644
--- a/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
+++ b/tests/baselines/reference/genericInterfaceFunctionTypeParameter.js
@@ -10,9 +10,9 @@ export function foo<A>(fn: (ifoo: IFoo<A>) => void) {
 //// [genericInterfaceFunctionTypeParameter.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function foo(fn) {
         foo(fn); // Invocation is necessary to repro (!)
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericMemberFunction.js b/tests/baselines/reference/genericMemberFunction.js
index 9704fe5d148..61a9298eb7f 100644
--- a/tests/baselines/reference/genericMemberFunction.js
+++ b/tests/baselines/reference/genericMemberFunction.js
@@ -25,6 +25,7 @@ export class BuildResult<A, B, C>{
 //// [genericMemberFunction.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var BuildError = (function () {
         function BuildError() {
         }
@@ -59,5 +60,4 @@ define(["require", "exports"], function (require, exports) {
         return BuildResult;
     }());
     exports.BuildResult = BuildResult;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericReturnTypeFromGetter1.js b/tests/baselines/reference/genericReturnTypeFromGetter1.js
index 457158faee1..728d81dd147 100644
--- a/tests/baselines/reference/genericReturnTypeFromGetter1.js
+++ b/tests/baselines/reference/genericReturnTypeFromGetter1.js
@@ -11,6 +11,7 @@ export class DbSet<T> {
 //// [genericReturnTypeFromGetter1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var DbSet = (function () {
         function DbSet() {
         }
@@ -23,5 +24,4 @@ define(["require", "exports"], function (require, exports) {
         return DbSet;
     }());
     exports.DbSet = DbSet;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases1.js b/tests/baselines/reference/genericTypeWithMultipleBases1.js
index 3201344c0de..a958516dfa0 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases1.js
+++ b/tests/baselines/reference/genericTypeWithMultipleBases1.js
@@ -21,8 +21,8 @@ x.m2();
 
 //// [genericTypeWithMultipleBases1.js]
 "use strict";
+exports.__esModule = true;
 var x;
 x.p1;
 x.m1();
 x.m2();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/genericTypeWithMultipleBases2.js b/tests/baselines/reference/genericTypeWithMultipleBases2.js
index a4457144000..43651ec8278 100644
--- a/tests/baselines/reference/genericTypeWithMultipleBases2.js
+++ b/tests/baselines/reference/genericTypeWithMultipleBases2.js
@@ -21,9 +21,9 @@ x.m2();
 //// [genericTypeWithMultipleBases2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var x;
     x.p1;
     x.m1();
     x.m2();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
index 0ed35307d2d..3f5e3dcfe8e 100644
--- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
+++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType2.js
@@ -27,6 +27,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Collection = (function () {
         function Collection() {
         }
@@ -56,5 +57,4 @@ define(["require", "exports"], function (require, exports) {
         return ListItem;
     }(CollectionItem));
     exports.ListItem = ListItem;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
index 783ec2bf947..5739596a8f0 100644
--- a/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithDeclarationFile2.baseline
@@ -3,13 +3,13 @@ EmitSkipped: false
 EmitSkipped: false
 FileName : /tests/cases/fourslash/inputFile2.js
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-Object.defineProperty(exports, "__esModule", { value: true });
 
 EmitSkipped: false
 FileName : /tests/cases/fourslash/inputFile3.js
diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
index 74cf137ef37..50e80f94831 100644
--- a/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
+++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline
@@ -4,6 +4,7 @@ Diagnostics:
 FileName : /tests/cases/fourslash/inputFile.js
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var C = (function () {
         function C() {
         }
@@ -13,6 +14,5 @@ define(["require", "exports"], function (require, exports) {
     (function (M) {
         M.foo = new C();
     })(M = exports.M || (exports.M = {}));
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
diff --git a/tests/baselines/reference/giant.js b/tests/baselines/reference/giant.js
index 434835a59d3..ce4df039932 100644
--- a/tests/baselines/reference/giant.js
+++ b/tests/baselines/reference/giant.js
@@ -684,6 +684,7 @@ export declare module eaM {
 //// [giant.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     /*
         Prefixes
         p -> public
@@ -1107,7 +1108,6 @@ define(["require", "exports"], function (require, exports) {
         ;
     })(eM = exports.eM || (exports.eM = {}));
     ;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
index 040bdccd515..60bea32e305 100644
--- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
+++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js
@@ -16,14 +16,15 @@ module m_private {
 
 //// [importAliasAnExternalModuleInsideAnInternalModule_file0.js]
 "use strict";
+exports.__esModule = true;
 var m;
 (function (m) {
     function foo() { }
     m.foo = foo;
 })(m = exports.m || (exports.m = {}));
-exports.__esModule = true;
 //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js]
 "use strict";
+exports.__esModule = true;
 var r = require("./importAliasAnExternalModuleInsideAnInternalModule_file0");
 var m_private;
 (function (m_private) {
@@ -31,4 +32,3 @@ var m_private;
     m_private.C = r; // no error
     m_private.C.m.foo();
 })(m_private || (m_private = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importAsBaseClass.js b/tests/baselines/reference/importAsBaseClass.js
index a626d034c75..725390825c6 100644
--- a/tests/baselines/reference/importAsBaseClass.js
+++ b/tests/baselines/reference/importAsBaseClass.js
@@ -12,6 +12,7 @@ class Hello extends Greeter { }
 
 //// [importAsBaseClass_0.js]
 "use strict";
+exports.__esModule = true;
 var Greeter = (function () {
     function Greeter() {
     }
@@ -19,7 +20,6 @@ var Greeter = (function () {
     return Greeter;
 }());
 exports.Greeter = Greeter;
-exports.__esModule = true;
 //// [importAsBaseClass_1.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -32,6 +32,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 var Greeter = require("./importAsBaseClass_0");
 var Hello = (function (_super) {
     __extends(Hello, _super);
@@ -40,4 +41,3 @@ var Hello = (function (_super) {
     }
     return Hello;
 }(Greeter));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importDecl.js b/tests/baselines/reference/importDecl.js
index a33b758df7d..1e5e5d0ec71 100644
--- a/tests/baselines/reference/importDecl.js
+++ b/tests/baselines/reference/importDecl.js
@@ -83,6 +83,7 @@ export var useMultiImport_m4_f4 = multiImport_m4.foo();
 
 //// [importDecl_require.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -91,9 +92,9 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [importDecl_require1.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -103,9 +104,9 @@ exports.d = d;
 var x;
 function foo() { return null; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [importDecl_require2.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -114,9 +115,9 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [importDecl_require3.js]
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -125,14 +126,14 @@ var d = (function () {
 exports.d = d;
 function foo() { return null; }
 exports.foo = foo;
-exports.__esModule = true;
 //// [importDecl_require4.js]
 "use strict";
+exports.__esModule = true;
 function foo2() { return null; }
 exports.foo2 = foo2;
-exports.__esModule = true;
 //// [importDecl_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='importDecl_require.ts'/>
 ///<reference path='importDecl_require1.ts'/>
 ///<reference path='importDecl_require2.ts'/>
@@ -174,7 +175,6 @@ var multiImport_m4 = require("./importDecl_require"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
 exports.useMultiImport_m4_d4 = multiImport_m4.d;
 exports.useMultiImport_m4_f4 = multiImport_m4.foo();
-exports.__esModule = true;
 
 
 //// [importDecl_require.d.ts]
diff --git a/tests/baselines/reference/importDeclWithClassModifiers.js b/tests/baselines/reference/importDeclWithClassModifiers.js
index 98e322fb619..00e5dae1f95 100644
--- a/tests/baselines/reference/importDeclWithClassModifiers.js
+++ b/tests/baselines/reference/importDeclWithClassModifiers.js
@@ -12,9 +12,9 @@ var b: a;
 //// [importDeclWithClassModifiers.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = x.c;
     exports.b = x.c;
     exports.c = x.c;
     var b;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.js b/tests/baselines/reference/importDeclWithDeclareModifier.js
index 05c40739a82..e7929ac27fc 100644
--- a/tests/baselines/reference/importDeclWithDeclareModifier.js
+++ b/tests/baselines/reference/importDeclWithDeclareModifier.js
@@ -9,6 +9,6 @@ var b: a;
 
 //// [importDeclWithDeclareModifier.js]
 "use strict";
+exports.__esModule = true;
 exports.a = x.c;
 var b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importDeclWithExportModifier.js b/tests/baselines/reference/importDeclWithExportModifier.js
index c23fae40749..26076c2630e 100644
--- a/tests/baselines/reference/importDeclWithExportModifier.js
+++ b/tests/baselines/reference/importDeclWithExportModifier.js
@@ -10,7 +10,7 @@ var b: a;
 //// [importDeclWithExportModifier.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.a = x.c;
     var b;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
index a4102cbfff4..ce5069c335e 100644
--- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
+++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
@@ -8,5 +8,5 @@ export = x;
 
 //// [importDeclWithExportModifierAndExportAssignment.js]
 "use strict";
-exports.a = x.c;
 exports.__esModule = true;
+exports.a = x.c;
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
index ee4e8f1dc8c..cce30fd8b85 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
@@ -13,13 +13,13 @@ export var x: typeof a;
 
 //// [importDeclarationUsedAsTypeQuery_require.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [importDeclarationUsedAsTypeQuery_1.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/importHelpers.js b/tests/baselines/reference/importHelpers.js
index 7f2c4ad4036..bf66829a435 100644
--- a/tests/baselines/reference/importHelpers.js
+++ b/tests/baselines/reference/importHelpers.js
@@ -35,6 +35,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -66,7 +67,6 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersAmd.js b/tests/baselines/reference/importHelpersAmd.js
index 03a4e6393d7..b756355921d 100644
--- a/tests/baselines/reference/importHelpersAmd.js
+++ b/tests/baselines/reference/importHelpersAmd.js
@@ -19,17 +19,18 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 //// [b.js]
 define(["require", "exports", "tslib", "./a"], function (require, exports, tslib_1, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var B = (function (_super) {
         tslib_1.__extends(B, _super);
         function B() {
@@ -38,5 +39,4 @@ define(["require", "exports", "tslib", "./a"], function (require, exports, tslib
         return B;
     }(a_1.A));
     exports.B = B;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/importHelpersInIsolatedModules.js b/tests/baselines/reference/importHelpersInIsolatedModules.js
index 828c1a5a360..72a91ac365e 100644
--- a/tests/baselines/reference/importHelpersInIsolatedModules.js
+++ b/tests/baselines/reference/importHelpersInIsolatedModules.js
@@ -35,6 +35,7 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -66,9 +67,9 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -98,4 +99,3 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js
index 2883a7aaa53..330b8623f69 100644
--- a/tests/baselines/reference/importHelpersInTsx.js
+++ b/tests/baselines/reference/importHelpersInTsx.js
@@ -21,9 +21,9 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 exports.x = React.createElement("span", tslib_1.__assign({}, o));
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __assign = (this && this.__assign) || Object.assign || function(t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js
index 4747e017ff5..5b98b61da20 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -34,6 +34,7 @@ export {}
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -68,7 +69,6 @@ C = tslib_1.__decorate([
 var o = { a: 1 };
 var y = tslib_1.__assign({}, o);
 var x = tslib_1.__rest(y, []);
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersNoModule.js b/tests/baselines/reference/importHelpersNoModule.js
index efcd4827257..36a326e124d 100644
--- a/tests/baselines/reference/importHelpersNoModule.js
+++ b/tests/baselines/reference/importHelpersNoModule.js
@@ -27,6 +27,7 @@ class C {
 
 //// [external.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var A = (function () {
     function A() {
@@ -58,7 +59,6 @@ tslib_1.__decorate([
 C = tslib_1.__decorate([
     dec
 ], C);
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [script.js]
 var __extends = (this && this.__extends) || (function () {
     var extendStatics = Object.setPrototypeOf ||
diff --git a/tests/baselines/reference/importHelpersOutFile.js b/tests/baselines/reference/importHelpersOutFile.js
index 233b12208c1..55bf2ea9d46 100644
--- a/tests/baselines/reference/importHelpersOutFile.js
+++ b/tests/baselines/reference/importHelpersOutFile.js
@@ -23,16 +23,17 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
 //// [out.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("b", ["require", "exports", "tslib", "a"], function (require, exports, tslib_1, a_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var B = (function (_super) {
         tslib_1.__extends(B, _super);
         function B() {
@@ -41,10 +42,10 @@ define("b", ["require", "exports", "tslib", "a"], function (require, exports, ts
         return B;
     }(a_1.A));
     exports.B = B;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("c", ["require", "exports", "tslib", "a"], function (require, exports, tslib_2, a_2) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var C = (function (_super) {
         tslib_2.__extends(C, _super);
         function C() {
@@ -53,5 +54,4 @@ define("c", ["require", "exports", "tslib", "a"], function (require, exports, ts
         return C;
     }(a_2.A));
     exports.C = C;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/importImportOnlyModule.js b/tests/baselines/reference/importImportOnlyModule.js
index 917c50f3fee..0c6f0540354 100644
--- a/tests/baselines/reference/importImportOnlyModule.js
+++ b/tests/baselines/reference/importImportOnlyModule.js
@@ -18,6 +18,7 @@ var x = foo; // Cause a runtime dependency
 //// [foo_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
             this.m1 = 42;
@@ -26,17 +27,16 @@ define(["require", "exports"], function (require, exports) {
     }());
     C1.s1 = true;
     exports.C1 = C1;
-    exports.__esModule = true;
 });
 //// [foo_1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var answer = 42; // No exports
     exports.__esModule = true;
+    var answer = 42; // No exports
 });
 //// [foo_2.js]
 define(["require", "exports", "./foo_1"], function (require, exports, foo) {
     "use strict";
-    var x = foo; // Cause a runtime dependency
     exports.__esModule = true;
+    var x = foo; // Cause a runtime dependency
 });
diff --git a/tests/baselines/reference/importInsideModule.js b/tests/baselines/reference/importInsideModule.js
index cfc63f83551..da492a7103d 100644
--- a/tests/baselines/reference/importInsideModule.js
+++ b/tests/baselines/reference/importInsideModule.js
@@ -11,8 +11,8 @@ export module myModule {
 
 //// [importInsideModule_file2.js]
 "use strict";
+exports.__esModule = true;
 var myModule;
 (function (myModule) {
     var a = foo.x;
 })(myModule = exports.myModule || (exports.myModule = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js
index 8af20d4be36..0340bcd35cb 100644
--- a/tests/baselines/reference/importNonExternalModule.js
+++ b/tests/baselines/reference/importNonExternalModule.js
@@ -21,8 +21,8 @@ var foo;
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     // Import should fail.  foo_0 not an external module
     if (foo.answer === 42) {
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importNonStringLiteral.js b/tests/baselines/reference/importNonStringLiteral.js
index e5785d92866..eb76621f7c0 100644
--- a/tests/baselines/reference/importNonStringLiteral.js
+++ b/tests/baselines/reference/importNonStringLiteral.js
@@ -5,5 +5,5 @@ import foo = require(x); // invalid
 
 //// [foo_0.js]
 "use strict";
-var x = "filename";
 exports.__esModule = true;
+var x = "filename";
diff --git a/tests/baselines/reference/importTsBeforeDTs.js b/tests/baselines/reference/importTsBeforeDTs.js
index 658b464983a..40213ce9968 100644
--- a/tests/baselines/reference/importTsBeforeDTs.js
+++ b/tests/baselines/reference/importTsBeforeDTs.js
@@ -15,11 +15,11 @@ var z2 = foo.y + 10; // Should resolve
 
 //// [foo_0.js]
 "use strict";
-exports.y = 42;
 exports.__esModule = true;
+exports.y = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0");
 var z1 = foo.x + 10; // Should error, as .ts preferred over .d.ts
 var z2 = foo.y + 10; // Should resolve
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importUsedInExtendsList1.js b/tests/baselines/reference/importUsedInExtendsList1.js
index d44239cec11..15bf907ddd5 100644
--- a/tests/baselines/reference/importUsedInExtendsList1.js
+++ b/tests/baselines/reference/importUsedInExtendsList1.js
@@ -13,13 +13,13 @@ var r: string = s.foo;
 
 //// [importUsedInExtendsList1_require.js]
 "use strict";
+exports.__esModule = true;
 var Super = (function () {
     function Super() {
     }
     return Super;
 }());
 exports.Super = Super;
-exports.__esModule = true;
 //// [importUsedInExtendsList1_1.js]
 "use strict";
 var __extends = (this && this.__extends) || (function () {
@@ -32,6 +32,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 ///<reference path='importUsedInExtendsList1_require.ts'/>
 var foo = require("./importUsedInExtendsList1_require");
 var Sub = (function (_super) {
@@ -43,4 +44,3 @@ var Sub = (function (_super) {
 }(foo.Super));
 var s;
 var r = s.foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/importWithTrailingSlash.js b/tests/baselines/reference/importWithTrailingSlash.js
index c5e502f3fdc..9450fc5d7b2 100644
--- a/tests/baselines/reference/importWithTrailingSlash.js
+++ b/tests/baselines/reference/importWithTrailingSlash.js
@@ -22,23 +22,23 @@ aIndex.aIndex;
 
 //// [a.js]
 "use strict";
-exports["default"] = { a: 0 };
 exports.__esModule = true;
+exports["default"] = { a: 0 };
 //// [index.js]
 "use strict";
-exports["default"] = { aIndex: 0 };
 exports.__esModule = true;
+exports["default"] = { aIndex: 0 };
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 var _1 = require(".");
 var _2 = require("./");
 _1["default"].a;
 _2["default"].aIndex;
-exports.__esModule = true;
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 var __1 = require("..");
 var _1 = require("../");
 __1["default"].a;
 _1["default"].aIndex;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/import_reference-exported-alias.js b/tests/baselines/reference/import_reference-exported-alias.js
index 16c6f2b95c7..b3d607a6943 100644
--- a/tests/baselines/reference/import_reference-exported-alias.js
+++ b/tests/baselines/reference/import_reference-exported-alias.js
@@ -45,8 +45,8 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, appJs) {
     "use strict";
+    exports.__esModule = true;
     var Services = appJs.Services;
     var UserServices = Services.UserServices;
     var x = new UserServices().getUserName();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/import_reference-to-type-alias.js b/tests/baselines/reference/import_reference-to-type-alias.js
index 5934d9b2f5e..c6771d47bae 100644
--- a/tests/baselines/reference/import_reference-to-type-alias.js
+++ b/tests/baselines/reference/import_reference-to-type-alias.js
@@ -20,6 +20,7 @@ var x = new Services.UserServices().getUserName();
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var App;
     (function (App) {
         var Services;
@@ -35,12 +36,11 @@ define(["require", "exports"], function (require, exports) {
             Services.UserServices = UserServices;
         })(Services = App.Services || (App.Services = {}));
     })(App = exports.App || (exports.App = {}));
-    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports", "file1"], function (require, exports, appJs) {
     "use strict";
+    exports.__esModule = true;
     var Services = appJs.App.Services;
     var x = new Services.UserServices().getUserName();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
index 7fb4e02d9fd..1cd0376dded 100644
--- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
+++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.js
@@ -19,7 +19,7 @@ var p = testData[0].name;
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var testData;
     var p = testData[0].name;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
index c2ac2416806..9b5e518804c 100644
--- a/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
+++ b/tests/baselines/reference/import_var-referencing-an-imported-module-alias.js
@@ -13,18 +13,18 @@ var v = new hostVar.Host();
 //// [host.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Host = (function () {
         function Host() {
         }
         return Host;
     }());
     exports.Host = Host;
-    exports.__esModule = true;
 });
 //// [consumer.js]
 define(["require", "exports", "host"], function (require, exports, host) {
     "use strict";
+    exports.__esModule = true;
     var hostVar = host;
     var v = new hostVar.Host();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importedAliasesInTypePositions.js b/tests/baselines/reference/importedAliasesInTypePositions.js
index 61b411ea571..b82ac22f4ed 100644
--- a/tests/baselines/reference/importedAliasesInTypePositions.js
+++ b/tests/baselines/reference/importedAliasesInTypePositions.js
@@ -21,6 +21,7 @@ export module ImportingModule {
 //// [file1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var elaborate;
     (function (elaborate) {
         var nested;
@@ -41,11 +42,11 @@ define(["require", "exports"], function (require, exports) {
             })(mod = nested.mod || (nested.mod = {}));
         })(nested = elaborate.nested || (elaborate.nested = {}));
     })(elaborate = exports.elaborate || (exports.elaborate = {}));
-    exports.__esModule = true;
 });
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var ImportingModule;
     (function (ImportingModule) {
         var UsesReferredType = (function () {
@@ -55,5 +56,4 @@ define(["require", "exports"], function (require, exports) {
             return UsesReferredType;
         }());
     })(ImportingModule = exports.ImportingModule || (exports.ImportingModule = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importedModuleClassNameClash.js b/tests/baselines/reference/importedModuleClassNameClash.js
index 52761e7e9db..5f4f9677dcd 100644
--- a/tests/baselines/reference/importedModuleClassNameClash.js
+++ b/tests/baselines/reference/importedModuleClassNameClash.js
@@ -9,10 +9,10 @@ class foo { }
 //// [importedModuleClassNameClash.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var foo = (function () {
         function foo() {
         }
         return foo;
     }());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/importsImplicitlyReadonly.js b/tests/baselines/reference/importsImplicitlyReadonly.js
index b85c7145a47..dd45d4db89c 100644
--- a/tests/baselines/reference/importsImplicitlyReadonly.js
+++ b/tests/baselines/reference/importsImplicitlyReadonly.js
@@ -23,12 +23,13 @@ a3.y = 1;
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 1;
 var y = 1;
 exports.y = y;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var a_1 = require("./a");
 var a1 = require("./a");
 var a2 = require("./a");
@@ -41,4 +42,3 @@ a2.x = 1;
 a2.y = 1;
 a3.x = 1;
 a3.y = 1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/inferenceLimit.js b/tests/baselines/reference/inferenceLimit.js
index bc20008c2fa..997cbcd5b79 100644
--- a/tests/baselines/reference/inferenceLimit.js
+++ b/tests/baselines/reference/inferenceLimit.js
@@ -53,6 +53,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 class BrokenClass {
     constructor() { }
     brokenMethod(field, value) {
@@ -80,4 +81,3 @@ class BrokenClass {
     }
 }
 exports.BrokenClass = BrokenClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/instanceOfInExternalModules.js b/tests/baselines/reference/instanceOfInExternalModules.js
index 9fe669911b2..293be662a4d 100644
--- a/tests/baselines/reference/instanceOfInExternalModules.js
+++ b/tests/baselines/reference/instanceOfInExternalModules.js
@@ -14,19 +14,19 @@ function IsFoo(value: any): boolean {
 //// [instanceOfInExternalModules_require.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
         return Foo;
     }());
     exports.Foo = Foo;
-    exports.__esModule = true;
 });
 //// [instanceOfInExternalModules_1.js]
 define(["require", "exports", "instanceOfInExternalModules_require"], function (require, exports, Bar) {
     "use strict";
+    exports.__esModule = true;
     function IsFoo(value) {
         return value instanceof Bar.Foo;
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/interfaceContextualType.js b/tests/baselines/reference/interfaceContextualType.js
index 7fb7b08a881..ec502725925 100644
--- a/tests/baselines/reference/interfaceContextualType.js
+++ b/tests/baselines/reference/interfaceContextualType.js
@@ -23,6 +23,7 @@ class Bug {
 
 //// [interfaceContextualType.js]
 "use strict";
+exports.__esModule = true;
 var Bug = (function () {
     function Bug() {
     }
@@ -37,4 +38,3 @@ var Bug = (function () {
     };
     return Bug;
 }());
-exports.__esModule = true;
diff --git a/tests/baselines/reference/interfaceDeclaration3.js b/tests/baselines/reference/interfaceDeclaration3.js
index 01a64805530..41f12dbac05 100644
--- a/tests/baselines/reference/interfaceDeclaration3.js
+++ b/tests/baselines/reference/interfaceDeclaration3.js
@@ -58,6 +58,7 @@ interface I2 extends I1 { item:string; }
 //// [interfaceDeclaration3.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var M1;
     (function (M1) {
         var C1 = (function () {
@@ -119,5 +120,4 @@ define(["require", "exports"], function (require, exports) {
         }
         return C3;
     }());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/interfaceDeclaration5.js b/tests/baselines/reference/interfaceDeclaration5.js
index dde6b1632f1..318e8903c36 100644
--- a/tests/baselines/reference/interfaceDeclaration5.js
+++ b/tests/baselines/reference/interfaceDeclaration5.js
@@ -6,11 +6,11 @@ export class C1 { }
 //// [interfaceDeclaration5.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
         }
         return C1;
     }());
     exports.C1 = C1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/interfaceImplementation6.js b/tests/baselines/reference/interfaceImplementation6.js
index 5fb3996134b..0bc759f6cda 100644
--- a/tests/baselines/reference/interfaceImplementation6.js
+++ b/tests/baselines/reference/interfaceImplementation6.js
@@ -27,6 +27,7 @@ export class Test {
 //// [interfaceImplementation6.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
         }
@@ -50,5 +51,4 @@ define(["require", "exports"], function (require, exports) {
         return Test;
     }());
     exports.Test = Test;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
index 20ce33035e6..0b333ac1830 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
@@ -19,6 +19,7 @@ export var d = new m2.m3.c();
 
 //// [internalAliasClassInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -41,7 +42,6 @@ var m2;
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
 exports.d = new m2.m3.c();
-exports.__esModule = true;
 
 
 //// [internalAliasClassInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
index 6868a0511a6..cf2eb41662b 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
@@ -17,6 +17,7 @@ export module m2 {
 
 //// [internalAliasClassInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -38,7 +39,6 @@ var m2;
         var cReturnVal = m3.cProp.foo(10);
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasClassInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
index d9f47a05d9e..1de7fe25407 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExportAccessError.js
@@ -19,6 +19,7 @@ export var d = new m2.m3.c();
 
 //// [internalAliasClassInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -41,4 +42,3 @@ var m2;
     })(m3 = m2.m3 || (m2.m3 = {}));
 })(m2 = exports.m2 || (exports.m2 = {}));
 exports.d = new m2.m3.c();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
index 52a2e0b3fed..e224b40c9f3 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
@@ -13,6 +13,7 @@ var cReturnVal = cProp.foo(10);
 
 //// [internalAliasClassInsideTopLevelModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -28,7 +29,6 @@ var x;
 exports.xc = x.c;
 exports.cProp = new exports.xc();
 var cReturnVal = exports.cProp.foo(10);
-exports.__esModule = true;
 
 
 //// [internalAliasClassInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
index 640b533f151..16f53fe3e8b 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
@@ -13,6 +13,7 @@ var cReturnVal = cProp.foo(10);
 
 //// [internalAliasClassInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var x;
 (function (x) {
     var c = (function () {
@@ -28,7 +29,6 @@ var x;
 var xc = x.c;
 exports.cProp = new xc();
 var cReturnVal = exports.cProp.foo(10);
-exports.__esModule = true;
 
 
 //// [internalAliasClassInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
index de2582debef..c387fa6e2c4 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
@@ -15,6 +15,7 @@ export module c {
 
 //// [internalAliasEnumInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var weekend;
@@ -29,7 +30,6 @@ var c;
     c.b = a.weekend;
     c.bVal = c.b.Sunday;
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasEnumInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
index 6e54ed79afc..717652283cf 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
@@ -15,6 +15,7 @@ export module c {
 
 //// [internalAliasEnumInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var weekend;
@@ -29,7 +30,6 @@ var c;
     var b = a.weekend;
     c.bVal = b.Sunday;
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasEnumInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
index c7b5180fd93..a84ebf0b9ad 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExportAccessError.js
@@ -16,6 +16,7 @@ var happyFriday = c.b.Friday;
 
 //// [internalAliasEnumInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var weekend;
@@ -31,4 +32,3 @@ var c;
     c.bVal = b.Sunday;
 })(c = exports.c || (exports.c = {}));
 var happyFriday = c.b.Friday;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
index d3e9fdf8349..ad07b9bd33f 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
@@ -14,6 +14,7 @@ export var bVal: b = b.Sunday;
 //// [internalAliasEnumInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var weekend;
@@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     exports.b = a.weekend;
     exports.bVal = exports.b.Sunday;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
index 99b9156c0c9..6b5f5b17a26 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
@@ -14,6 +14,7 @@ export var bVal: b = b.Sunday;
 //// [internalAliasEnumInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var weekend;
@@ -25,7 +26,6 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     var b = a.weekend;
     exports.bVal = b.Sunday;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
index 4138970da0b..95bb936bc75 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithExport.js
@@ -14,6 +14,7 @@ export module c {
 
 //// [internalAliasFunctionInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
@@ -27,7 +28,6 @@ var c;
     c.bVal = c.b(10);
     c.bVal2 = c.b;
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
index 83cab3c05bb..50de6b470ee 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExport.js
@@ -14,6 +14,7 @@ export module c {
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
@@ -27,7 +28,6 @@ var c;
     var bVal = b(10);
     c.bVal2 = b;
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
index 67239e40b1d..543e9952f23 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js
@@ -14,6 +14,7 @@ var d = c.b(11);
 
 //// [internalAliasFunctionInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
@@ -28,4 +29,3 @@ var c;
     c.bVal2 = b;
 })(c = exports.c || (exports.c = {}));
 var d = c.b(11);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
index 88765f267e6..267045b625d 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithExport.js
@@ -13,6 +13,7 @@ export var bVal2 = b;
 //// [internalAliasFunctionInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         function foo(x) {
@@ -23,7 +24,6 @@ define(["require", "exports"], function (require, exports) {
     exports.b = a.foo;
     exports.bVal = exports.b(10);
     exports.bVal2 = exports.b;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
index 160b4047849..bb3b0e244d2 100644
--- a/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasFunctionInsideTopLevelModuleWithoutExport.js
@@ -12,6 +12,7 @@ export var bVal2 = b;
 
 //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     function foo(x) {
@@ -22,7 +23,6 @@ var a;
 var b = a.foo;
 exports.bVal = b(10);
 exports.bVal2 = b;
-exports.__esModule = true;
 
 
 //// [internalAliasFunctionInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
index 904c7171818..85335a0fb7f 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
@@ -14,6 +14,7 @@ export module c {
 //// [internalAliasInitializedModuleInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var b;
@@ -31,7 +32,6 @@ define(["require", "exports"], function (require, exports) {
         c.b = a.b;
         c.x = new c.b.c();
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
index eb59627a4cb..c39e6cfd168 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
@@ -13,6 +13,7 @@ export module c {
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var b;
@@ -30,7 +31,6 @@ var c;
     var b = a.b;
     c.x = new b.c();
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
index 77dbbab235a..6e66118f5b9 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -15,6 +15,7 @@ export var d = new c.b.c();
 
 //// [internalAliasInitializedModuleInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var b;
@@ -33,4 +34,3 @@ var c;
     c.x = new b.c();
 })(c = exports.c || (exports.c = {}));
 exports.d = new c.b.c();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
index 05fe46f1eb5..86d9f88cee3 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
@@ -11,6 +11,7 @@ export var x: b.c = new b.c();
 
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     var b;
@@ -25,7 +26,6 @@ var a;
 })(a = exports.a || (exports.a = {}));
 exports.b = a.b;
 exports.x = new exports.b.c();
-exports.__esModule = true;
 
 
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
index 63f6b8c1422..79185fed228 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -12,6 +12,7 @@ export var x: b.c = new b.c();
 //// [internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         var b;
@@ -26,7 +27,6 @@ define(["require", "exports"], function (require, exports) {
     })(a = exports.a || (exports.a = {}));
     var b = a.b;
     exports.x = new b.c();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
index e2cbdc3b54d..bd50cd8bbc2 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
@@ -13,10 +13,10 @@ export module c {
 //// [internalAliasInterfaceInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
index 15e03818d84..f7b08e6c170 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
@@ -13,10 +13,10 @@ export module c {
 //// [internalAliasInterfaceInsideLocalModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
index ed4c6714196..19163ff1f66 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js
@@ -14,9 +14,9 @@ var x: c.b;
 //// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
     })(c = exports.c || (exports.c = {}));
     var x;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
index 1b74ded4656..7ca966e90b2 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
@@ -15,11 +15,11 @@ export module c {
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.js]
 "use strict";
+exports.__esModule = true;
 var c;
 (function (c) {
     c.x.foo();
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
index a46d7629ae9..22793f8aef5 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
@@ -15,11 +15,11 @@ export module c {
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var c;
 (function (c) {
     c.x.foo();
 })(c = exports.c || (exports.c = {}));
-exports.__esModule = true;
 
 
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
index efbb156bed8..a6b4f83de8e 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js
@@ -19,9 +19,9 @@ export var z: c.b.I;
 //// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var c;
     (function (c) {
         c.x.foo();
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
index ac52f94db72..eccbd9a45bd 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
@@ -15,8 +15,8 @@ x.foo();
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    exports.x.foo();
     exports.__esModule = true;
+    exports.x.foo();
 });
 
 
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
index 45af4536151..27de6bbfd98 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -14,8 +14,8 @@ x.foo();
 
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js]
 "use strict";
-exports.x.foo();
 exports.__esModule = true;
+exports.x.foo();
 
 
 //// [internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
index 5cd431470f5..34f044721c4 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithExport.js
@@ -12,6 +12,7 @@ export module c {
 //// [internalAliasVarInsideLocalModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         a.x = 10;
@@ -21,7 +22,6 @@ define(["require", "exports"], function (require, exports) {
         c.b = a.x;
         c.bVal = c.b;
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
index 956c70d7cbb..161dc0bf973 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExport.js
@@ -12,6 +12,7 @@ export module c {
 //// [internalAliasVarInsideLocalModuleWithoutExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         a.x = 10;
@@ -21,7 +22,6 @@ define(["require", "exports"], function (require, exports) {
         var b = a.x;
         c.bVal = b;
     })(c = exports.c || (exports.c = {}));
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
index 962e34c4a3e..a0192fc9daa 100644
--- a/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
+++ b/tests/baselines/reference/internalAliasVarInsideLocalModuleWithoutExportAccessError.js
@@ -12,6 +12,7 @@ export var z = c.b;
 
 //// [internalAliasVarInsideLocalModuleWithoutExportAccessError.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     a.x = 10;
@@ -22,4 +23,3 @@ var c;
     c.bVal = b;
 })(c = exports.c || (exports.c = {}));
 exports.z = c.b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
index 732257b93e5..d27b4e3188d 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithExport.js
@@ -11,13 +11,13 @@ export var bVal = b;
 //// [internalAliasVarInsideTopLevelModuleWithExport.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     (function (a) {
         a.x = 10;
     })(a = exports.a || (exports.a = {}));
     exports.b = a.x;
     exports.bVal = exports.b;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
index f0d02aa709c..65c9204ed3c 100644
--- a/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasVarInsideTopLevelModuleWithoutExport.js
@@ -10,13 +10,13 @@ export var bVal = b;
 
 //// [internalAliasVarInsideTopLevelModuleWithoutExport.js]
 "use strict";
+exports.__esModule = true;
 var a;
 (function (a) {
     a.x = 10;
 })(a = exports.a || (exports.a = {}));
 var b = a.x;
 exports.bVal = b;
-exports.__esModule = true;
 
 
 //// [internalAliasVarInsideTopLevelModuleWithoutExport.d.ts]
diff --git a/tests/baselines/reference/intersectionTypeInference1.js b/tests/baselines/reference/intersectionTypeInference1.js
index 27a75a64be6..32ddedae2b3 100644
--- a/tests/baselines/reference/intersectionTypeInference1.js
+++ b/tests/baselines/reference/intersectionTypeInference1.js
@@ -11,8 +11,8 @@ export const Form3 = brokenFunction(parameterFn)({store: "hello"})
 //// [intersectionTypeInference1.js]
 // Repro from #8801
 "use strict";
+exports.__esModule = true;
 function alert(s) { }
 var parameterFn = function (props) { return alert(props.store); };
 var brokenFunction = function (f) { return function (o) { return o; }; };
 exports.Form3 = brokenFunction(parameterFn)({ store: "hello" });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/isolatedModulesImportExportElision.js b/tests/baselines/reference/isolatedModulesImportExportElision.js
index f9590d70dd3..5aac4a64186 100644
--- a/tests/baselines/reference/isolatedModulesImportExportElision.js
+++ b/tests/baselines/reference/isolatedModulesImportExportElision.js
@@ -25,6 +25,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+Object.defineProperty(exports, "__esModule", { value: true });
 var module_1 = require("module");
 var module_2 = require("module");
 var ns = require("module");
@@ -40,4 +41,3 @@ var y = ns.value;
 var module_3 = require("module");
 exports.c1 = module_3.c1;
 exports.z = x;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
index 0d4e00b2593..4ed1fdf2c77 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-AMD.js
@@ -7,6 +7,6 @@ run(1);
 //// [isolatedModulesPlainFile-AMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    run(1);
     Object.defineProperty(exports, "__esModule", { value: true });
+    run(1);
 });
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
index 5cf8d277597..38739a700ef 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-CommonJS.js
@@ -6,5 +6,5 @@ run(1);
 
 //// [isolatedModulesPlainFile-CommonJS.js]
 "use strict";
-run(1);
 Object.defineProperty(exports, "__esModule", { value: true });
+run(1);
diff --git a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
index 5886a1908a6..f37962a84ab 100644
--- a/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
+++ b/tests/baselines/reference/isolatedModulesPlainFile-UMD.js
@@ -15,6 +15,6 @@ run(1);
     }
 })(function (require, exports) {
     "use strict";
-    run(1);
     Object.defineProperty(exports, "__esModule", { value: true });
+    run(1);
 });
diff --git a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
index cbb97e43d72..088b40e97ad 100644
--- a/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
+++ b/tests/baselines/reference/jsFileCompilationRestParamJsDocFunction.js
@@ -26,6 +26,7 @@ export default apply;
 //// [apply.js]
 define("_apply", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     /**
      * A faster alternative to `Function#apply`, this function invokes `func`
      * with the `this` binding of `thisArg` and the arguments of `args`.
@@ -47,5 +48,4 @@ define("_apply", ["require", "exports"], function (require, exports) {
         return func.apply(thisArg, args);
     }
     exports["default"] = apply;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/jsxEmitWithAttributes.js b/tests/baselines/reference/jsxEmitWithAttributes.js
index a3259d55cd3..dd4d326268b 100644
--- a/tests/baselines/reference/jsxEmitWithAttributes.js
+++ b/tests/baselines/reference/jsxEmitWithAttributes.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let c;
 class A {
@@ -80,4 +81,3 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryAndReactNamespace.js b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
index 32ebf4d5d54..a864da65dbb 100644
--- a/tests/baselines/reference/jsxFactoryAndReactNamespace.js
+++ b/tests/baselines/reference/jsxFactoryAndReactNamespace.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let c;
 class A {
@@ -80,4 +81,3 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js
index 36b16c62f49..9beff01d707 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let createElement = Element_1.Element.createElement;
 let c;
@@ -81,5 +82,4 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js.map b/tests/baselines/reference/jsxFactoryIdentifier.js.map
index cad196b8ba5..57ff760b8a8 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.js.map
+++ b/tests/baselines/reference/jsxFactoryIdentifier.js.map
@@ -1,3 +1,3 @@
 //// [Element.js.map]
-{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
+{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AACnC,IAAI,aAAa,GAAG,iBAAO,CAAC,aAAa,CAAC;AAC1C,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,wBAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,wBAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
index 71dbb45a155..6101ee1d5e7 100644
--- a/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifier.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/Element.js
 sourceFile:Element.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>var Element;
 1 >
 2 >^^^^
@@ -42,10 +43,10 @@ sourceFile:Element.ts
   >                   }
   >               }
   >           }
-1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0)
-3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0)
-4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(14, 18) + SourceIndex(0)
+3 >Emitted(3, 12) Source(14, 25) + SourceIndex(0)
+4 >Emitted(3, 13) Source(24, 2) + SourceIndex(0)
 ---
 >>>(function (Element) {
 1->
@@ -55,9 +56,9 @@ sourceFile:Element.ts
 1->
 2 >export namespace 
 3 >           Element
-1->Emitted(3, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0)
-3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0)
+1->Emitted(4, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(4, 12) Source(14, 18) + SourceIndex(0)
+3 >Emitted(4, 19) Source(14, 25) + SourceIndex(0)
 ---
 >>>    function isElement(el) {
 1->^^^^
@@ -68,9 +69,9 @@ sourceFile:Element.ts
   >    
 2 >    export function isElement(
 3 >                       el: any
-1->Emitted(4, 5) Source(15, 5) + SourceIndex(0)
-2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0)
-3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0)
+1->Emitted(5, 5) Source(15, 5) + SourceIndex(0)
+2 >Emitted(5, 24) Source(15, 31) + SourceIndex(0)
+3 >Emitted(5, 26) Source(15, 38) + SourceIndex(0)
 ---
 >>>        return el.markAsChildOfRootElement !== undefined;
 1->^^^^^^^^
@@ -92,15 +93,15 @@ sourceFile:Element.ts
 7 >                                           !== 
 8 >                                               undefined
 9 >                                                        ;
-1->Emitted(5, 9) Source(16, 9) + SourceIndex(0)
-2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0)
-3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0)
-4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0)
-5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0)
-6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0)
-7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0)
-8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0)
-9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0)
+1->Emitted(6, 9) Source(16, 9) + SourceIndex(0)
+2 >Emitted(6, 15) Source(16, 15) + SourceIndex(0)
+3 >Emitted(6, 16) Source(16, 16) + SourceIndex(0)
+4 >Emitted(6, 18) Source(16, 18) + SourceIndex(0)
+5 >Emitted(6, 19) Source(16, 19) + SourceIndex(0)
+6 >Emitted(6, 43) Source(16, 43) + SourceIndex(0)
+7 >Emitted(6, 48) Source(16, 48) + SourceIndex(0)
+8 >Emitted(6, 57) Source(16, 57) + SourceIndex(0)
+9 >Emitted(6, 58) Source(16, 58) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -109,8 +110,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0)
-2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0)
+1 >Emitted(7, 5) Source(17, 5) + SourceIndex(0)
+2 >Emitted(7, 6) Source(17, 6) + SourceIndex(0)
 ---
 >>>    Element.isElement = isElement;
 1->^^^^
@@ -124,10 +125,10 @@ sourceFile:Element.ts
   >                             return el.markAsChildOfRootElement !== undefined;
   >                         }
 4 >                                 
-1->Emitted(7, 5) Source(15, 21) + SourceIndex(0)
-2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0)
-3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0)
-4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0)
+1->Emitted(8, 5) Source(15, 21) + SourceIndex(0)
+2 >Emitted(8, 22) Source(15, 30) + SourceIndex(0)
+3 >Emitted(8, 34) Source(17, 6) + SourceIndex(0)
+4 >Emitted(8, 35) Source(17, 6) + SourceIndex(0)
 ---
 >>>    function createElement(args) {
 1->^^^^
@@ -138,9 +139,9 @@ sourceFile:Element.ts
   >    
 2 >    export function createElement(
 3 >                           args: any[]
-1->Emitted(8, 5) Source(19, 5) + SourceIndex(0)
-2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0)
-3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0)
+1->Emitted(9, 5) Source(19, 5) + SourceIndex(0)
+2 >Emitted(9, 28) Source(19, 35) + SourceIndex(0)
+3 >Emitted(9, 32) Source(19, 46) + SourceIndex(0)
 ---
 >>>        return {};
 1 >^^^^^^^^
@@ -156,11 +157,11 @@ sourceFile:Element.ts
 4 >               {
   >                       }
 5 >                 
-1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0)
-2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0)
-3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0)
-4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0)
-5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0)
+1 >Emitted(10, 9) Source(21, 9) + SourceIndex(0)
+2 >Emitted(10, 15) Source(21, 15) + SourceIndex(0)
+3 >Emitted(10, 16) Source(21, 16) + SourceIndex(0)
+4 >Emitted(10, 18) Source(22, 10) + SourceIndex(0)
+5 >Emitted(10, 19) Source(22, 10) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -169,8 +170,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0)
-2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0)
+1 >Emitted(11, 5) Source(23, 5) + SourceIndex(0)
+2 >Emitted(11, 6) Source(23, 6) + SourceIndex(0)
 ---
 >>>    Element.createElement = createElement;
 1->^^^^
@@ -186,10 +187,10 @@ sourceFile:Element.ts
   >                                 }
   >                             }
 4 >                                         
-1->Emitted(11, 5) Source(19, 21) + SourceIndex(0)
-2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0)
-3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0)
-4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0)
+1->Emitted(12, 5) Source(19, 21) + SourceIndex(0)
+2 >Emitted(12, 26) Source(19, 34) + SourceIndex(0)
+3 >Emitted(12, 42) Source(23, 6) + SourceIndex(0)
+4 >Emitted(12, 43) Source(23, 6) + SourceIndex(0)
 ---
 >>>})(Element = exports.Element || (exports.Element = {}));
 1->
@@ -221,15 +222,15 @@ sourceFile:Element.ts
   >                                                        }
   >                                                    }
   >                                                }
-1->Emitted(12, 1) Source(24, 1) + SourceIndex(0)
-2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0)
-3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0)
-4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0)
-5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0)
-6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0)
-7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0)
-8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0)
-9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0)
+1->Emitted(13, 1) Source(24, 1) + SourceIndex(0)
+2 >Emitted(13, 2) Source(24, 2) + SourceIndex(0)
+3 >Emitted(13, 4) Source(14, 18) + SourceIndex(0)
+4 >Emitted(13, 11) Source(14, 25) + SourceIndex(0)
+5 >Emitted(13, 14) Source(14, 18) + SourceIndex(0)
+6 >Emitted(13, 29) Source(14, 25) + SourceIndex(0)
+7 >Emitted(13, 34) Source(14, 18) + SourceIndex(0)
+8 >Emitted(13, 49) Source(14, 25) + SourceIndex(0)
+9 >Emitted(13, 57) Source(24, 2) + SourceIndex(0)
 ---
 >>>exports.createElement = Element.createElement;
 1 >
@@ -250,14 +251,14 @@ sourceFile:Element.ts
 6 >                               .
 7 >                                createElement
 8 >                                             ;
-1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0)
-2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0)
-3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0)
-4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0)
-5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0)
-6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0)
-7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0)
-8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0)
+1 >Emitted(14, 1) Source(26, 12) + SourceIndex(0)
+2 >Emitted(14, 9) Source(26, 12) + SourceIndex(0)
+3 >Emitted(14, 22) Source(26, 25) + SourceIndex(0)
+4 >Emitted(14, 25) Source(26, 28) + SourceIndex(0)
+5 >Emitted(14, 32) Source(26, 35) + SourceIndex(0)
+6 >Emitted(14, 33) Source(26, 36) + SourceIndex(0)
+7 >Emitted(14, 46) Source(26, 49) + SourceIndex(0)
+8 >Emitted(14, 47) Source(26, 50) + SourceIndex(0)
 ---
 >>>function toCamelCase(text) {
 1 >
@@ -269,9 +270,9 @@ sourceFile:Element.ts
   >
 2 >function toCamelCase(
 3 >                     text: string
-1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0)
-2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0)
+1 >Emitted(15, 1) Source(28, 1) + SourceIndex(0)
+2 >Emitted(15, 22) Source(28, 22) + SourceIndex(0)
+3 >Emitted(15, 26) Source(28, 34) + SourceIndex(0)
 ---
 >>>    return text[0].toLowerCase() + text.substring(1);
 1->^^^^
@@ -311,36 +312,35 @@ sourceFile:Element.ts
 16>                                                  1
 17>                                                   )
 18>                                                    ;
-1->Emitted(15, 5) Source(29, 5) + SourceIndex(0)
-2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0)
-3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0)
-4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0)
-5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0)
-6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0)
-7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0)
-8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0)
-9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0)
-10>Emitted(15, 33) Source(29, 33) + SourceIndex(0)
-11>Emitted(15, 36) Source(29, 36) + SourceIndex(0)
-12>Emitted(15, 40) Source(29, 40) + SourceIndex(0)
-13>Emitted(15, 41) Source(29, 41) + SourceIndex(0)
-14>Emitted(15, 50) Source(29, 50) + SourceIndex(0)
-15>Emitted(15, 51) Source(29, 51) + SourceIndex(0)
-16>Emitted(15, 52) Source(29, 52) + SourceIndex(0)
-17>Emitted(15, 53) Source(29, 53) + SourceIndex(0)
-18>Emitted(15, 54) Source(29, 54) + SourceIndex(0)
+1->Emitted(16, 5) Source(29, 5) + SourceIndex(0)
+2 >Emitted(16, 11) Source(29, 11) + SourceIndex(0)
+3 >Emitted(16, 12) Source(29, 12) + SourceIndex(0)
+4 >Emitted(16, 16) Source(29, 16) + SourceIndex(0)
+5 >Emitted(16, 17) Source(29, 17) + SourceIndex(0)
+6 >Emitted(16, 18) Source(29, 18) + SourceIndex(0)
+7 >Emitted(16, 19) Source(29, 19) + SourceIndex(0)
+8 >Emitted(16, 20) Source(29, 20) + SourceIndex(0)
+9 >Emitted(16, 31) Source(29, 31) + SourceIndex(0)
+10>Emitted(16, 33) Source(29, 33) + SourceIndex(0)
+11>Emitted(16, 36) Source(29, 36) + SourceIndex(0)
+12>Emitted(16, 40) Source(29, 40) + SourceIndex(0)
+13>Emitted(16, 41) Source(29, 41) + SourceIndex(0)
+14>Emitted(16, 50) Source(29, 50) + SourceIndex(0)
+15>Emitted(16, 51) Source(29, 51) + SourceIndex(0)
+16>Emitted(16, 52) Source(29, 52) + SourceIndex(0)
+17>Emitted(16, 53) Source(29, 53) + SourceIndex(0)
+18>Emitted(16, 54) Source(29, 54) + SourceIndex(0)
 ---
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
-1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
-2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
+1 >Emitted(17, 1) Source(30, 1) + SourceIndex(0)
+2 >Emitted(17, 2) Source(30, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=Element.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
@@ -352,14 +352,15 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>const Element_1 = require("./Element");
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 3 >                                       ^^^^^^^^^^^^^^->
 1 >
 2 >import { Element} from './Element';
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 40) Source(1, 36) + SourceIndex(0)
 ---
 >>>let createElement = Element_1.Element.createElement;
 1->
@@ -379,14 +380,14 @@ sourceFile:test.tsx
 6 >                                     .
 7 >                                      createElement
 8 >                                                   ;
-1->Emitted(3, 1) Source(2, 1) + SourceIndex(0)
-2 >Emitted(3, 5) Source(2, 5) + SourceIndex(0)
-3 >Emitted(3, 18) Source(2, 18) + SourceIndex(0)
-4 >Emitted(3, 21) Source(2, 21) + SourceIndex(0)
-5 >Emitted(3, 38) Source(2, 28) + SourceIndex(0)
-6 >Emitted(3, 39) Source(2, 29) + SourceIndex(0)
-7 >Emitted(3, 52) Source(2, 42) + SourceIndex(0)
-8 >Emitted(3, 53) Source(2, 43) + SourceIndex(0)
+1->Emitted(4, 1) Source(2, 1) + SourceIndex(0)
+2 >Emitted(4, 5) Source(2, 5) + SourceIndex(0)
+3 >Emitted(4, 18) Source(2, 18) + SourceIndex(0)
+4 >Emitted(4, 21) Source(2, 21) + SourceIndex(0)
+5 >Emitted(4, 38) Source(2, 28) + SourceIndex(0)
+6 >Emitted(4, 39) Source(2, 29) + SourceIndex(0)
+7 >Emitted(4, 52) Source(2, 42) + SourceIndex(0)
+8 >Emitted(4, 53) Source(2, 43) + SourceIndex(0)
 ---
 >>>let c;
 1 >
@@ -403,10 +404,10 @@ sourceFile:test.tsx
   >    	}
   >    }
 4 >     ;
-1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0)
-3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0)
-4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0)
+1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(5, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(5, 6) Source(7, 2) + SourceIndex(0)
+4 >Emitted(5, 7) Source(7, 3) + SourceIndex(0)
 ---
 >>>class A {
 1->
@@ -414,7 +415,7 @@ sourceFile:test.tsx
 1->
   >
   >
-1->Emitted(5, 1) Source(9, 1) + SourceIndex(0)
+1->Emitted(6, 1) Source(9, 1) + SourceIndex(0)
 ---
 >>>    view() {
 1->^^^^
@@ -423,8 +424,8 @@ sourceFile:test.tsx
 1->class A {
   >	
 2 >    view
-1->Emitted(6, 5) Source(10, 2) + SourceIndex(0)
-2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0)
+1->Emitted(7, 5) Source(10, 2) + SourceIndex(0)
+2 >Emitted(7, 9) Source(10, 6) + SourceIndex(0)
 ---
 >>>        return [
 1->^^^^^^^^
@@ -435,9 +436,9 @@ sourceFile:test.tsx
   >		
 2 >        return
 3 >               
-1->Emitted(7, 9) Source(11, 3) + SourceIndex(0)
-2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0)
-3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0)
+1->Emitted(8, 9) Source(11, 3) + SourceIndex(0)
+2 >Emitted(8, 15) Source(11, 9) + SourceIndex(0)
+3 >Emitted(8, 16) Source(11, 10) + SourceIndex(0)
 ---
 >>>            createElement("meta", { content: "helloworld" }),
 1->^^^^^^^^^^^^
@@ -453,12 +454,12 @@ sourceFile:test.tsx
 4 >                                           =
 5 >                                             "helloworld"
 6 >                                                         ></meta>
-1->Emitted(8, 13) Source(12, 4) + SourceIndex(0)
-2 >Emitted(8, 37) Source(12, 10) + SourceIndex(0)
-3 >Emitted(8, 44) Source(12, 17) + SourceIndex(0)
-4 >Emitted(8, 46) Source(12, 18) + SourceIndex(0)
-5 >Emitted(8, 58) Source(12, 30) + SourceIndex(0)
-6 >Emitted(8, 61) Source(12, 38) + SourceIndex(0)
+1->Emitted(9, 13) Source(12, 4) + SourceIndex(0)
+2 >Emitted(9, 37) Source(12, 10) + SourceIndex(0)
+3 >Emitted(9, 44) Source(12, 17) + SourceIndex(0)
+4 >Emitted(9, 46) Source(12, 18) + SourceIndex(0)
+5 >Emitted(9, 58) Source(12, 30) + SourceIndex(0)
+6 >Emitted(9, 61) Source(12, 38) + SourceIndex(0)
 ---
 >>>            createElement("meta", { content: c.a.b })
 1 >^^^^^^^^^^^^
@@ -482,16 +483,16 @@ sourceFile:test.tsx
 8 >                                                .
 9 >                                                 b
 10>                                                  }></meta>
-1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0)
-2 >Emitted(9, 37) Source(13, 10) + SourceIndex(0)
-3 >Emitted(9, 44) Source(13, 17) + SourceIndex(0)
-4 >Emitted(9, 46) Source(13, 19) + SourceIndex(0)
-5 >Emitted(9, 47) Source(13, 20) + SourceIndex(0)
-6 >Emitted(9, 48) Source(13, 21) + SourceIndex(0)
-7 >Emitted(9, 49) Source(13, 23) + SourceIndex(0)
-8 >Emitted(9, 50) Source(13, 24) + SourceIndex(0)
-9 >Emitted(9, 51) Source(13, 25) + SourceIndex(0)
-10>Emitted(9, 54) Source(13, 34) + SourceIndex(0)
+1 >Emitted(10, 13) Source(13, 4) + SourceIndex(0)
+2 >Emitted(10, 37) Source(13, 10) + SourceIndex(0)
+3 >Emitted(10, 44) Source(13, 17) + SourceIndex(0)
+4 >Emitted(10, 46) Source(13, 19) + SourceIndex(0)
+5 >Emitted(10, 47) Source(13, 20) + SourceIndex(0)
+6 >Emitted(10, 48) Source(13, 21) + SourceIndex(0)
+7 >Emitted(10, 49) Source(13, 23) + SourceIndex(0)
+8 >Emitted(10, 50) Source(13, 24) + SourceIndex(0)
+9 >Emitted(10, 51) Source(13, 25) + SourceIndex(0)
+10>Emitted(10, 54) Source(13, 34) + SourceIndex(0)
 ---
 >>>        ];
 1 >^^^^^^^^^
@@ -499,8 +500,8 @@ sourceFile:test.tsx
 1 >
   >		]
 2 >         ;
-1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0)
-2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0)
+1 >Emitted(11, 10) Source(14, 4) + SourceIndex(0)
+2 >Emitted(11, 11) Source(14, 5) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -508,15 +509,14 @@ sourceFile:test.tsx
 1 >
   >	
 2 >    }
-1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0)
-2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0)
+1 >Emitted(12, 5) Source(15, 2) + SourceIndex(0)
+2 >Emitted(12, 6) Source(15, 3) + SourceIndex(0)
 ---
 >>>}
 1 >^
-2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0)
+1 >Emitted(13, 2) Source(16, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
index 3ab40dee5eb..05da89d0d85 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js
@@ -15,11 +15,11 @@ export class AppComponent {
 
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class AppComponent {
     render(createElement) {
         return createElement("div", null);
     }
 }
 exports.AppComponent = AppComponent;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
index c108b93a913..c72e1bf8057 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.js.map
@@ -1,2 +1,2 @@
 //// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
index 68f39e67ddd..b2d30177b1d 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierAsParameter.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>class AppComponent {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
@@ -20,7 +21,7 @@ sourceFile:test.tsx
   >}
   >
   >
-1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 ---
 >>>    render(createElement) {
 1->^^^^
@@ -33,10 +34,10 @@ sourceFile:test.tsx
 2 >    render
 3 >          (
 4 >           createElement
-1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
-3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0)
-4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0)
+1->Emitted(4, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0)
+3 >Emitted(4, 12) Source(9, 12) + SourceIndex(0)
+4 >Emitted(4, 25) Source(9, 25) + SourceIndex(0)
 ---
 >>>        return createElement("div", null);
 1->^^^^^^^^
@@ -50,11 +51,11 @@ sourceFile:test.tsx
 3 >               
 4 >               <div />
 5 >                                         ;
-1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
-2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
-3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
-4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0)
-5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0)
+1->Emitted(5, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(5, 42) Source(10, 23) + SourceIndex(0)
+5 >Emitted(5, 43) Source(10, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -62,28 +63,26 @@ sourceFile:test.tsx
 1 >
   >    
 2 >    }
-1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0)
 ---
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render(createElement) {
   >        return <div />;
   >    }
   >}
-1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+1->Emitted(8, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
index 12ea8b96602..c9f5f3465e3 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js
@@ -15,11 +15,11 @@ export class AppComponent {
 
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class AppComponent {
     render() {
         return createElement("div", null);
     }
 }
 exports.AppComponent = AppComponent;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
index 715014ff53f..66666a526d6 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.js.map
@@ -1,2 +1,2 @@
 //// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM;QACF,MAAM,CAAC,0BAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
index b1b8db46eaa..1a77ab3eae1 100644
--- a/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryIdentifierWithAbsentParameter.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>class AppComponent {
 1 >
 2 >^^^^^^^^^^^^^^^->
@@ -20,7 +21,7 @@ sourceFile:test.tsx
   >}
   >
   >
-1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 ---
 >>>    render() {
 1->^^^^
@@ -29,8 +30,8 @@ sourceFile:test.tsx
 1->export class AppComponent {
   >    
 2 >    render
-1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
+1->Emitted(4, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0)
 ---
 >>>        return createElement("div", null);
 1->^^^^^^^^
@@ -44,11 +45,11 @@ sourceFile:test.tsx
 3 >               
 4 >               <div />
 5 >                                         ;
-1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
-2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
-3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
-4 >Emitted(4, 42) Source(10, 23) + SourceIndex(0)
-5 >Emitted(4, 43) Source(10, 24) + SourceIndex(0)
+1->Emitted(5, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(5, 42) Source(10, 23) + SourceIndex(0)
+5 >Emitted(5, 43) Source(10, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -56,28 +57,26 @@ sourceFile:test.tsx
 1 >
   >    
 2 >    }
-1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0)
 ---
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render() {
   >        return <div />;
   >    }
   >}
-1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+1->Emitted(8, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
index 9f408e4db7a..9fc5799b11d 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 let c;
 class A {
     view() {
@@ -79,4 +80,3 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
index 331c7a65d73..aa90c74cce5 100644
--- a/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
+++ b/tests/baselines/reference/jsxFactoryNotIdentifierOrQualifiedName2.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 let c;
 class A {
     view() {
@@ -79,4 +80,3 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js
index 0a7b7f8d387..ee747733799 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js
@@ -52,6 +52,7 @@ class A {
 
 //// [Element.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var Element;
 (function (Element) {
     function isElement(el) {
@@ -67,9 +68,9 @@ exports.createElement = Element.createElement;
 function toCamelCase(text) {
     return text[0].toLowerCase() + text.substring(1);
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=Element.js.map//// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const Element_1 = require("./Element");
 let c;
 class A {
@@ -80,5 +81,4 @@ class A {
         ];
     }
 }
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js.map b/tests/baselines/reference/jsxFactoryQualifiedName.js.map
index f8cef24a0f0..6c5dd8abf56 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.js.map
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.js.map
@@ -1,3 +1,3 @@
 //// [Element.js.map]
-{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
+{"version":3,"file":"Element.js","sourceRoot":"","sources":["Element.ts"],"names":[],"mappings":";;AAaA,IAAiB,OAAO,CAUvB;AAVD,WAAiB,OAAO;IACpB,mBAA0B,EAAO;QAC7B,MAAM,CAAC,EAAE,CAAC,wBAAwB,KAAK,SAAS,CAAC;IACrD,CAAC;IAFe,iBAAS,YAExB,CAAA;IAED,uBAA8B,IAAW;QAErC,MAAM,CAAC,EACN,CAAA;IACL,CAAC;IAJe,qBAAa,gBAI5B,CAAA;AACL,CAAC,EAVgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAUvB;AAEU,QAAA,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAEjD,qBAAqB,IAAY;IAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC"}//// [test.js.map]
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAAA,uCAAmC;AAEnC,IAAI,CAIH,CAAC;AAEF;IACC,IAAI;QACH,MAAM,CAAC;YACN,0CAAM,OAAO,EAAC,YAAY,GAAQ;YAClC,0CAAM,OAAO,EAAE,CAAC,CAAC,CAAE,CAAC,CAAC,GAAS;SAC9B,CAAC;IACH,CAAC;CACD"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
index 86ed94197d6..9831a9ab5fd 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedName.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/Element.js
 sourceFile:Element.ts
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>var Element;
 1 >
 2 >^^^^
@@ -42,10 +43,10 @@ sourceFile:Element.ts
   >                   }
   >               }
   >           }
-1 >Emitted(2, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(2, 5) Source(14, 18) + SourceIndex(0)
-3 >Emitted(2, 12) Source(14, 25) + SourceIndex(0)
-4 >Emitted(2, 13) Source(24, 2) + SourceIndex(0)
+1 >Emitted(3, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(3, 5) Source(14, 18) + SourceIndex(0)
+3 >Emitted(3, 12) Source(14, 25) + SourceIndex(0)
+4 >Emitted(3, 13) Source(24, 2) + SourceIndex(0)
 ---
 >>>(function (Element) {
 1->
@@ -55,9 +56,9 @@ sourceFile:Element.ts
 1->
 2 >export namespace 
 3 >           Element
-1->Emitted(3, 1) Source(14, 1) + SourceIndex(0)
-2 >Emitted(3, 12) Source(14, 18) + SourceIndex(0)
-3 >Emitted(3, 19) Source(14, 25) + SourceIndex(0)
+1->Emitted(4, 1) Source(14, 1) + SourceIndex(0)
+2 >Emitted(4, 12) Source(14, 18) + SourceIndex(0)
+3 >Emitted(4, 19) Source(14, 25) + SourceIndex(0)
 ---
 >>>    function isElement(el) {
 1->^^^^
@@ -68,9 +69,9 @@ sourceFile:Element.ts
   >    
 2 >    export function isElement(
 3 >                       el: any
-1->Emitted(4, 5) Source(15, 5) + SourceIndex(0)
-2 >Emitted(4, 24) Source(15, 31) + SourceIndex(0)
-3 >Emitted(4, 26) Source(15, 38) + SourceIndex(0)
+1->Emitted(5, 5) Source(15, 5) + SourceIndex(0)
+2 >Emitted(5, 24) Source(15, 31) + SourceIndex(0)
+3 >Emitted(5, 26) Source(15, 38) + SourceIndex(0)
 ---
 >>>        return el.markAsChildOfRootElement !== undefined;
 1->^^^^^^^^
@@ -92,15 +93,15 @@ sourceFile:Element.ts
 7 >                                           !== 
 8 >                                               undefined
 9 >                                                        ;
-1->Emitted(5, 9) Source(16, 9) + SourceIndex(0)
-2 >Emitted(5, 15) Source(16, 15) + SourceIndex(0)
-3 >Emitted(5, 16) Source(16, 16) + SourceIndex(0)
-4 >Emitted(5, 18) Source(16, 18) + SourceIndex(0)
-5 >Emitted(5, 19) Source(16, 19) + SourceIndex(0)
-6 >Emitted(5, 43) Source(16, 43) + SourceIndex(0)
-7 >Emitted(5, 48) Source(16, 48) + SourceIndex(0)
-8 >Emitted(5, 57) Source(16, 57) + SourceIndex(0)
-9 >Emitted(5, 58) Source(16, 58) + SourceIndex(0)
+1->Emitted(6, 9) Source(16, 9) + SourceIndex(0)
+2 >Emitted(6, 15) Source(16, 15) + SourceIndex(0)
+3 >Emitted(6, 16) Source(16, 16) + SourceIndex(0)
+4 >Emitted(6, 18) Source(16, 18) + SourceIndex(0)
+5 >Emitted(6, 19) Source(16, 19) + SourceIndex(0)
+6 >Emitted(6, 43) Source(16, 43) + SourceIndex(0)
+7 >Emitted(6, 48) Source(16, 48) + SourceIndex(0)
+8 >Emitted(6, 57) Source(16, 57) + SourceIndex(0)
+9 >Emitted(6, 58) Source(16, 58) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -109,8 +110,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(6, 5) Source(17, 5) + SourceIndex(0)
-2 >Emitted(6, 6) Source(17, 6) + SourceIndex(0)
+1 >Emitted(7, 5) Source(17, 5) + SourceIndex(0)
+2 >Emitted(7, 6) Source(17, 6) + SourceIndex(0)
 ---
 >>>    Element.isElement = isElement;
 1->^^^^
@@ -124,10 +125,10 @@ sourceFile:Element.ts
   >                             return el.markAsChildOfRootElement !== undefined;
   >                         }
 4 >                                 
-1->Emitted(7, 5) Source(15, 21) + SourceIndex(0)
-2 >Emitted(7, 22) Source(15, 30) + SourceIndex(0)
-3 >Emitted(7, 34) Source(17, 6) + SourceIndex(0)
-4 >Emitted(7, 35) Source(17, 6) + SourceIndex(0)
+1->Emitted(8, 5) Source(15, 21) + SourceIndex(0)
+2 >Emitted(8, 22) Source(15, 30) + SourceIndex(0)
+3 >Emitted(8, 34) Source(17, 6) + SourceIndex(0)
+4 >Emitted(8, 35) Source(17, 6) + SourceIndex(0)
 ---
 >>>    function createElement(args) {
 1->^^^^
@@ -138,9 +139,9 @@ sourceFile:Element.ts
   >    
 2 >    export function createElement(
 3 >                           args: any[]
-1->Emitted(8, 5) Source(19, 5) + SourceIndex(0)
-2 >Emitted(8, 28) Source(19, 35) + SourceIndex(0)
-3 >Emitted(8, 32) Source(19, 46) + SourceIndex(0)
+1->Emitted(9, 5) Source(19, 5) + SourceIndex(0)
+2 >Emitted(9, 28) Source(19, 35) + SourceIndex(0)
+3 >Emitted(9, 32) Source(19, 46) + SourceIndex(0)
 ---
 >>>        return {};
 1 >^^^^^^^^
@@ -156,11 +157,11 @@ sourceFile:Element.ts
 4 >               {
   >                       }
 5 >                 
-1 >Emitted(9, 9) Source(21, 9) + SourceIndex(0)
-2 >Emitted(9, 15) Source(21, 15) + SourceIndex(0)
-3 >Emitted(9, 16) Source(21, 16) + SourceIndex(0)
-4 >Emitted(9, 18) Source(22, 10) + SourceIndex(0)
-5 >Emitted(9, 19) Source(22, 10) + SourceIndex(0)
+1 >Emitted(10, 9) Source(21, 9) + SourceIndex(0)
+2 >Emitted(10, 15) Source(21, 15) + SourceIndex(0)
+3 >Emitted(10, 16) Source(21, 16) + SourceIndex(0)
+4 >Emitted(10, 18) Source(22, 10) + SourceIndex(0)
+5 >Emitted(10, 19) Source(22, 10) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -169,8 +170,8 @@ sourceFile:Element.ts
 1 >
   >    
 2 >    }
-1 >Emitted(10, 5) Source(23, 5) + SourceIndex(0)
-2 >Emitted(10, 6) Source(23, 6) + SourceIndex(0)
+1 >Emitted(11, 5) Source(23, 5) + SourceIndex(0)
+2 >Emitted(11, 6) Source(23, 6) + SourceIndex(0)
 ---
 >>>    Element.createElement = createElement;
 1->^^^^
@@ -186,10 +187,10 @@ sourceFile:Element.ts
   >                                 }
   >                             }
 4 >                                         
-1->Emitted(11, 5) Source(19, 21) + SourceIndex(0)
-2 >Emitted(11, 26) Source(19, 34) + SourceIndex(0)
-3 >Emitted(11, 42) Source(23, 6) + SourceIndex(0)
-4 >Emitted(11, 43) Source(23, 6) + SourceIndex(0)
+1->Emitted(12, 5) Source(19, 21) + SourceIndex(0)
+2 >Emitted(12, 26) Source(19, 34) + SourceIndex(0)
+3 >Emitted(12, 42) Source(23, 6) + SourceIndex(0)
+4 >Emitted(12, 43) Source(23, 6) + SourceIndex(0)
 ---
 >>>})(Element = exports.Element || (exports.Element = {}));
 1->
@@ -221,15 +222,15 @@ sourceFile:Element.ts
   >                                                        }
   >                                                    }
   >                                                }
-1->Emitted(12, 1) Source(24, 1) + SourceIndex(0)
-2 >Emitted(12, 2) Source(24, 2) + SourceIndex(0)
-3 >Emitted(12, 4) Source(14, 18) + SourceIndex(0)
-4 >Emitted(12, 11) Source(14, 25) + SourceIndex(0)
-5 >Emitted(12, 14) Source(14, 18) + SourceIndex(0)
-6 >Emitted(12, 29) Source(14, 25) + SourceIndex(0)
-7 >Emitted(12, 34) Source(14, 18) + SourceIndex(0)
-8 >Emitted(12, 49) Source(14, 25) + SourceIndex(0)
-9 >Emitted(12, 57) Source(24, 2) + SourceIndex(0)
+1->Emitted(13, 1) Source(24, 1) + SourceIndex(0)
+2 >Emitted(13, 2) Source(24, 2) + SourceIndex(0)
+3 >Emitted(13, 4) Source(14, 18) + SourceIndex(0)
+4 >Emitted(13, 11) Source(14, 25) + SourceIndex(0)
+5 >Emitted(13, 14) Source(14, 18) + SourceIndex(0)
+6 >Emitted(13, 29) Source(14, 25) + SourceIndex(0)
+7 >Emitted(13, 34) Source(14, 18) + SourceIndex(0)
+8 >Emitted(13, 49) Source(14, 25) + SourceIndex(0)
+9 >Emitted(13, 57) Source(24, 2) + SourceIndex(0)
 ---
 >>>exports.createElement = Element.createElement;
 1 >
@@ -250,14 +251,14 @@ sourceFile:Element.ts
 6 >                               .
 7 >                                createElement
 8 >                                             ;
-1 >Emitted(13, 1) Source(26, 12) + SourceIndex(0)
-2 >Emitted(13, 9) Source(26, 12) + SourceIndex(0)
-3 >Emitted(13, 22) Source(26, 25) + SourceIndex(0)
-4 >Emitted(13, 25) Source(26, 28) + SourceIndex(0)
-5 >Emitted(13, 32) Source(26, 35) + SourceIndex(0)
-6 >Emitted(13, 33) Source(26, 36) + SourceIndex(0)
-7 >Emitted(13, 46) Source(26, 49) + SourceIndex(0)
-8 >Emitted(13, 47) Source(26, 50) + SourceIndex(0)
+1 >Emitted(14, 1) Source(26, 12) + SourceIndex(0)
+2 >Emitted(14, 9) Source(26, 12) + SourceIndex(0)
+3 >Emitted(14, 22) Source(26, 25) + SourceIndex(0)
+4 >Emitted(14, 25) Source(26, 28) + SourceIndex(0)
+5 >Emitted(14, 32) Source(26, 35) + SourceIndex(0)
+6 >Emitted(14, 33) Source(26, 36) + SourceIndex(0)
+7 >Emitted(14, 46) Source(26, 49) + SourceIndex(0)
+8 >Emitted(14, 47) Source(26, 50) + SourceIndex(0)
 ---
 >>>function toCamelCase(text) {
 1 >
@@ -269,9 +270,9 @@ sourceFile:Element.ts
   >
 2 >function toCamelCase(
 3 >                     text: string
-1 >Emitted(14, 1) Source(28, 1) + SourceIndex(0)
-2 >Emitted(14, 22) Source(28, 22) + SourceIndex(0)
-3 >Emitted(14, 26) Source(28, 34) + SourceIndex(0)
+1 >Emitted(15, 1) Source(28, 1) + SourceIndex(0)
+2 >Emitted(15, 22) Source(28, 22) + SourceIndex(0)
+3 >Emitted(15, 26) Source(28, 34) + SourceIndex(0)
 ---
 >>>    return text[0].toLowerCase() + text.substring(1);
 1->^^^^
@@ -311,36 +312,35 @@ sourceFile:Element.ts
 16>                                                  1
 17>                                                   )
 18>                                                    ;
-1->Emitted(15, 5) Source(29, 5) + SourceIndex(0)
-2 >Emitted(15, 11) Source(29, 11) + SourceIndex(0)
-3 >Emitted(15, 12) Source(29, 12) + SourceIndex(0)
-4 >Emitted(15, 16) Source(29, 16) + SourceIndex(0)
-5 >Emitted(15, 17) Source(29, 17) + SourceIndex(0)
-6 >Emitted(15, 18) Source(29, 18) + SourceIndex(0)
-7 >Emitted(15, 19) Source(29, 19) + SourceIndex(0)
-8 >Emitted(15, 20) Source(29, 20) + SourceIndex(0)
-9 >Emitted(15, 31) Source(29, 31) + SourceIndex(0)
-10>Emitted(15, 33) Source(29, 33) + SourceIndex(0)
-11>Emitted(15, 36) Source(29, 36) + SourceIndex(0)
-12>Emitted(15, 40) Source(29, 40) + SourceIndex(0)
-13>Emitted(15, 41) Source(29, 41) + SourceIndex(0)
-14>Emitted(15, 50) Source(29, 50) + SourceIndex(0)
-15>Emitted(15, 51) Source(29, 51) + SourceIndex(0)
-16>Emitted(15, 52) Source(29, 52) + SourceIndex(0)
-17>Emitted(15, 53) Source(29, 53) + SourceIndex(0)
-18>Emitted(15, 54) Source(29, 54) + SourceIndex(0)
+1->Emitted(16, 5) Source(29, 5) + SourceIndex(0)
+2 >Emitted(16, 11) Source(29, 11) + SourceIndex(0)
+3 >Emitted(16, 12) Source(29, 12) + SourceIndex(0)
+4 >Emitted(16, 16) Source(29, 16) + SourceIndex(0)
+5 >Emitted(16, 17) Source(29, 17) + SourceIndex(0)
+6 >Emitted(16, 18) Source(29, 18) + SourceIndex(0)
+7 >Emitted(16, 19) Source(29, 19) + SourceIndex(0)
+8 >Emitted(16, 20) Source(29, 20) + SourceIndex(0)
+9 >Emitted(16, 31) Source(29, 31) + SourceIndex(0)
+10>Emitted(16, 33) Source(29, 33) + SourceIndex(0)
+11>Emitted(16, 36) Source(29, 36) + SourceIndex(0)
+12>Emitted(16, 40) Source(29, 40) + SourceIndex(0)
+13>Emitted(16, 41) Source(29, 41) + SourceIndex(0)
+14>Emitted(16, 50) Source(29, 50) + SourceIndex(0)
+15>Emitted(16, 51) Source(29, 51) + SourceIndex(0)
+16>Emitted(16, 52) Source(29, 52) + SourceIndex(0)
+17>Emitted(16, 53) Source(29, 53) + SourceIndex(0)
+18>Emitted(16, 54) Source(29, 54) + SourceIndex(0)
 ---
 >>>}
 1 >
 2 >^
-3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >
 2 >}
-1 >Emitted(16, 1) Source(30, 1) + SourceIndex(0)
-2 >Emitted(16, 2) Source(30, 2) + SourceIndex(0)
+1 >Emitted(17, 1) Source(30, 1) + SourceIndex(0)
+2 >Emitted(17, 2) Source(30, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=Element.js.map===================================================================
 JsFile: test.js
 mapUrl: test.js.map
@@ -352,13 +352,14 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>const Element_1 = require("./Element");
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1 >
 2 >import { Element} from './Element';
-1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0)
-2 >Emitted(2, 40) Source(1, 36) + SourceIndex(0)
+1 >Emitted(3, 1) Source(1, 1) + SourceIndex(0)
+2 >Emitted(3, 40) Source(1, 36) + SourceIndex(0)
 ---
 >>>let c;
 1 >
@@ -376,10 +377,10 @@ sourceFile:test.tsx
   >    	}
   >    }
 4 >     ;
-1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
-2 >Emitted(3, 5) Source(3, 5) + SourceIndex(0)
-3 >Emitted(3, 6) Source(7, 2) + SourceIndex(0)
-4 >Emitted(3, 7) Source(7, 3) + SourceIndex(0)
+1 >Emitted(4, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(4, 5) Source(3, 5) + SourceIndex(0)
+3 >Emitted(4, 6) Source(7, 2) + SourceIndex(0)
+4 >Emitted(4, 7) Source(7, 3) + SourceIndex(0)
 ---
 >>>class A {
 1->
@@ -387,7 +388,7 @@ sourceFile:test.tsx
 1->
   >
   >
-1->Emitted(4, 1) Source(9, 1) + SourceIndex(0)
+1->Emitted(5, 1) Source(9, 1) + SourceIndex(0)
 ---
 >>>    view() {
 1->^^^^
@@ -396,8 +397,8 @@ sourceFile:test.tsx
 1->class A {
   >	
 2 >    view
-1->Emitted(5, 5) Source(10, 2) + SourceIndex(0)
-2 >Emitted(5, 9) Source(10, 6) + SourceIndex(0)
+1->Emitted(6, 5) Source(10, 2) + SourceIndex(0)
+2 >Emitted(6, 9) Source(10, 6) + SourceIndex(0)
 ---
 >>>        return [
 1->^^^^^^^^
@@ -408,9 +409,9 @@ sourceFile:test.tsx
   >		
 2 >        return
 3 >               
-1->Emitted(6, 9) Source(11, 3) + SourceIndex(0)
-2 >Emitted(6, 15) Source(11, 9) + SourceIndex(0)
-3 >Emitted(6, 16) Source(11, 10) + SourceIndex(0)
+1->Emitted(7, 9) Source(11, 3) + SourceIndex(0)
+2 >Emitted(7, 15) Source(11, 9) + SourceIndex(0)
+3 >Emitted(7, 16) Source(11, 10) + SourceIndex(0)
 ---
 >>>            Element_1.Element.createElement("meta", { content: "helloworld" }),
 1->^^^^^^^^^^^^
@@ -426,12 +427,12 @@ sourceFile:test.tsx
 4 >                                                             =
 5 >                                                               "helloworld"
 6 >                                                                           ></meta>
-1->Emitted(7, 13) Source(12, 4) + SourceIndex(0)
-2 >Emitted(7, 55) Source(12, 10) + SourceIndex(0)
-3 >Emitted(7, 62) Source(12, 17) + SourceIndex(0)
-4 >Emitted(7, 64) Source(12, 18) + SourceIndex(0)
-5 >Emitted(7, 76) Source(12, 30) + SourceIndex(0)
-6 >Emitted(7, 79) Source(12, 38) + SourceIndex(0)
+1->Emitted(8, 13) Source(12, 4) + SourceIndex(0)
+2 >Emitted(8, 55) Source(12, 10) + SourceIndex(0)
+3 >Emitted(8, 62) Source(12, 17) + SourceIndex(0)
+4 >Emitted(8, 64) Source(12, 18) + SourceIndex(0)
+5 >Emitted(8, 76) Source(12, 30) + SourceIndex(0)
+6 >Emitted(8, 79) Source(12, 38) + SourceIndex(0)
 ---
 >>>            Element_1.Element.createElement("meta", { content: c.a.b })
 1 >^^^^^^^^^^^^
@@ -455,16 +456,16 @@ sourceFile:test.tsx
 8 >                                                                  .
 9 >                                                                   b
 10>                                                                    }></meta>
-1 >Emitted(8, 13) Source(13, 4) + SourceIndex(0)
-2 >Emitted(8, 55) Source(13, 10) + SourceIndex(0)
-3 >Emitted(8, 62) Source(13, 17) + SourceIndex(0)
-4 >Emitted(8, 64) Source(13, 19) + SourceIndex(0)
-5 >Emitted(8, 65) Source(13, 20) + SourceIndex(0)
-6 >Emitted(8, 66) Source(13, 21) + SourceIndex(0)
-7 >Emitted(8, 67) Source(13, 23) + SourceIndex(0)
-8 >Emitted(8, 68) Source(13, 24) + SourceIndex(0)
-9 >Emitted(8, 69) Source(13, 25) + SourceIndex(0)
-10>Emitted(8, 72) Source(13, 34) + SourceIndex(0)
+1 >Emitted(9, 13) Source(13, 4) + SourceIndex(0)
+2 >Emitted(9, 55) Source(13, 10) + SourceIndex(0)
+3 >Emitted(9, 62) Source(13, 17) + SourceIndex(0)
+4 >Emitted(9, 64) Source(13, 19) + SourceIndex(0)
+5 >Emitted(9, 65) Source(13, 20) + SourceIndex(0)
+6 >Emitted(9, 66) Source(13, 21) + SourceIndex(0)
+7 >Emitted(9, 67) Source(13, 23) + SourceIndex(0)
+8 >Emitted(9, 68) Source(13, 24) + SourceIndex(0)
+9 >Emitted(9, 69) Source(13, 25) + SourceIndex(0)
+10>Emitted(9, 72) Source(13, 34) + SourceIndex(0)
 ---
 >>>        ];
 1 >^^^^^^^^^
@@ -472,8 +473,8 @@ sourceFile:test.tsx
 1 >
   >		]
 2 >         ;
-1 >Emitted(9, 10) Source(14, 4) + SourceIndex(0)
-2 >Emitted(9, 11) Source(14, 5) + SourceIndex(0)
+1 >Emitted(10, 10) Source(14, 4) + SourceIndex(0)
+2 >Emitted(10, 11) Source(14, 5) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -481,15 +482,14 @@ sourceFile:test.tsx
 1 >
   >	
 2 >    }
-1 >Emitted(10, 5) Source(15, 2) + SourceIndex(0)
-2 >Emitted(10, 6) Source(15, 3) + SourceIndex(0)
+1 >Emitted(11, 5) Source(15, 2) + SourceIndex(0)
+2 >Emitted(11, 6) Source(15, 3) + SourceIndex(0)
 ---
 >>>}
 1 >^
-2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(11, 2) Source(16, 2) + SourceIndex(0)
+1 >Emitted(12, 2) Source(16, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
index 60c8ca80212..510efc97f4a 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js
@@ -14,11 +14,11 @@ export class AppComponent {
 
 //// [test.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 class AppComponent {
     render(createElement) {
         return MyElement.createElement("div", null);
     }
 }
 exports.AppComponent = AppComponent;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
index ac54c9638cd..1af641eb351 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.js.map
@@ -1,2 +1,2 @@
 //// [test.js.map]
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.tsx"],"names":[],"mappings":";;AAOA;IACI,MAAM,CAAC,aAAa;QAChB,MAAM,CAAC,oCAAO,CAAC;IACnB,CAAC;CACJ;AAJD,oCAIC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
index 0e8d7ec51f3..2f5270f3705 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameResolutionError.sourcemap.txt
@@ -9,6 +9,7 @@ emittedFile:tests/cases/compiler/test.js
 sourceFile:test.tsx
 -------------------------------------------------------------------
 >>>"use strict";
+>>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>class AppComponent {
 1 >
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
@@ -20,7 +21,7 @@ sourceFile:test.tsx
   >}
   >
   >
-1 >Emitted(2, 1) Source(8, 1) + SourceIndex(0)
+1 >Emitted(3, 1) Source(8, 1) + SourceIndex(0)
 ---
 >>>    render(createElement) {
 1->^^^^
@@ -33,10 +34,10 @@ sourceFile:test.tsx
 2 >    render
 3 >          (
 4 >           createElement
-1->Emitted(3, 5) Source(9, 5) + SourceIndex(0)
-2 >Emitted(3, 11) Source(9, 11) + SourceIndex(0)
-3 >Emitted(3, 12) Source(9, 12) + SourceIndex(0)
-4 >Emitted(3, 25) Source(9, 25) + SourceIndex(0)
+1->Emitted(4, 5) Source(9, 5) + SourceIndex(0)
+2 >Emitted(4, 11) Source(9, 11) + SourceIndex(0)
+3 >Emitted(4, 12) Source(9, 12) + SourceIndex(0)
+4 >Emitted(4, 25) Source(9, 25) + SourceIndex(0)
 ---
 >>>        return MyElement.createElement("div", null);
 1->^^^^^^^^
@@ -50,11 +51,11 @@ sourceFile:test.tsx
 3 >               
 4 >               <div />
 5 >                                                   ;
-1->Emitted(4, 9) Source(10, 9) + SourceIndex(0)
-2 >Emitted(4, 15) Source(10, 15) + SourceIndex(0)
-3 >Emitted(4, 16) Source(10, 16) + SourceIndex(0)
-4 >Emitted(4, 52) Source(10, 23) + SourceIndex(0)
-5 >Emitted(4, 53) Source(10, 24) + SourceIndex(0)
+1->Emitted(5, 9) Source(10, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(10, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(10, 16) + SourceIndex(0)
+4 >Emitted(5, 52) Source(10, 23) + SourceIndex(0)
+5 >Emitted(5, 53) Source(10, 24) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -62,28 +63,26 @@ sourceFile:test.tsx
 1 >
   >    
 2 >    }
-1 >Emitted(5, 5) Source(11, 5) + SourceIndex(0)
-2 >Emitted(5, 6) Source(11, 6) + SourceIndex(0)
+1 >Emitted(6, 5) Source(11, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(11, 6) + SourceIndex(0)
 ---
 >>>}
 1 >^
 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
   >}
-1 >Emitted(6, 2) Source(12, 2) + SourceIndex(0)
+1 >Emitted(7, 2) Source(12, 2) + SourceIndex(0)
 ---
 >>>exports.AppComponent = AppComponent;
 1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-3 >                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
 2 >export class AppComponent {
   >    render(createElement) {
   >        return <div />;
   >    }
   >}
-1->Emitted(7, 1) Source(8, 1) + SourceIndex(0)
-2 >Emitted(7, 37) Source(12, 2) + SourceIndex(0)
+1->Emitted(8, 1) Source(8, 1) + SourceIndex(0)
+2 >Emitted(8, 37) Source(12, 2) + SourceIndex(0)
 ---
->>>Object.defineProperty(exports, "__esModule", { value: true });
 >>>//# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
index 72200aee75c..267f3eaee50 100644
--- a/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
+++ b/tests/baselines/reference/jsxFactoryQualifiedNameWithEs5.js
@@ -13,6 +13,7 @@ class Component {
 
 //// [index.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("./jsx");
 var skate;
 var React = { createElement: skate.h };
@@ -25,4 +26,3 @@ var Component = (function () {
     return Component;
 }());
 ;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/jsxImportInAttribute.js b/tests/baselines/reference/jsxImportInAttribute.js
index 59bde766a35..4b42ebe812d 100644
--- a/tests/baselines/reference/jsxImportInAttribute.js
+++ b/tests/baselines/reference/jsxImportInAttribute.js
@@ -16,8 +16,8 @@ let x = Test; // emit test_1.default
 
 //// [consumer.jsx]
 "use strict";
+exports.__esModule = true;
 /// <reference path="component.d.ts" />
 var Test_1 = require("Test");
 var x = Test_1["default"]; // emit test_1.default
 <anything attr={Test_1["default"]}/>; // ?
-exports.__esModule = true;
diff --git a/tests/baselines/reference/jsxViaImport.2.js b/tests/baselines/reference/jsxViaImport.2.js
index 626a48d191e..187ba545fb3 100644
--- a/tests/baselines/reference/jsxViaImport.2.js
+++ b/tests/baselines/reference/jsxViaImport.2.js
@@ -35,6 +35,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 /// <reference path="component.d.ts" />
 var BaseComponent_1 = require("BaseComponent");
 var TestComponent = (function (_super) {
@@ -47,4 +48,3 @@ var TestComponent = (function (_super) {
     };
     return TestComponent;
 }(React.Component));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/jsxViaImport.js b/tests/baselines/reference/jsxViaImport.js
index 9040455be56..3b291a34774 100644
--- a/tests/baselines/reference/jsxViaImport.js
+++ b/tests/baselines/reference/jsxViaImport.js
@@ -35,6 +35,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+exports.__esModule = true;
 /// <reference path="component.d.ts" />
 var BaseComponent = require("BaseComponent");
 var TestComponent = (function (_super) {
@@ -47,4 +48,3 @@ var TestComponent = (function (_super) {
     };
     return TestComponent;
 }(React.Component));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/localAliasExportAssignment.js b/tests/baselines/reference/localAliasExportAssignment.js
index 3e6b396184f..f198c0f9ea7 100644
--- a/tests/baselines/reference/localAliasExportAssignment.js
+++ b/tests/baselines/reference/localAliasExportAssignment.js
@@ -22,7 +22,7 @@ var server;
 module.exports = server;
 //// [localAliasExportAssignment_1.js]
 "use strict";
+exports.__esModule = true;
 ///<reference path='localAliasExportAssignment_0.ts'/>
 var connect = require("./localAliasExportAssignment_0");
 connect();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/mapOnTupleTypes01.js b/tests/baselines/reference/mapOnTupleTypes01.js
index 731e0e2e70b..9f22aa63753 100644
--- a/tests/baselines/reference/mapOnTupleTypes01.js
+++ b/tests/baselines/reference/mapOnTupleTypes01.js
@@ -44,6 +44,7 @@ export let h = numNumNumNumNum.map(n => n * n);
 
 //// [mapOnTupleTypes01.js]
 "use strict";
+exports.__esModule = true;
 exports.mapOnLooseArrayLiteral = [1, 2, 3, 4].map(function (n) { return n * n; });
 // Length 1
 var numTuple = [1];
@@ -67,7 +68,6 @@ exports.g = numNumNumNumNum.map(function (n) { return n * n; });
 // Length 6
 var numNumNumNumNumNum = [1, 2, 3, 4, 5, 6];
 exports.h = numNumNumNumNum.map(function (n) { return n * n; });
-exports.__esModule = true;
 
 
 //// [mapOnTupleTypes01.d.ts]
diff --git a/tests/baselines/reference/mapOnTupleTypes02.js b/tests/baselines/reference/mapOnTupleTypes02.js
index 0906c6df189..ca835751a7a 100644
--- a/tests/baselines/reference/mapOnTupleTypes02.js
+++ b/tests/baselines/reference/mapOnTupleTypes02.js
@@ -8,11 +8,11 @@ export function increment(point: Point) {
 
 //// [mapOnTupleTypes02.js]
 "use strict";
+exports.__esModule = true;
 function increment(point) {
     return point.map(function (d) { return d + 1; });
 }
 exports.increment = increment;
-exports.__esModule = true;
 
 
 //// [mapOnTupleTypes02.d.ts]
diff --git a/tests/baselines/reference/memberAccessMustUseModuleInstances.js b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
index b3c51e66c4b..2ba05b016be 100644
--- a/tests/baselines/reference/memberAccessMustUseModuleInstances.js
+++ b/tests/baselines/reference/memberAccessMustUseModuleInstances.js
@@ -17,6 +17,7 @@ WinJS.Promise.timeout(10);
 //// [memberAccessMustUseModuleInstances_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Promise = (function () {
         function Promise() {
         }
@@ -26,11 +27,10 @@ define(["require", "exports"], function (require, exports) {
         return Promise;
     }());
     exports.Promise = Promise;
-    exports.__esModule = true;
 });
 //// [memberAccessMustUseModuleInstances_1.js]
 define(["require", "exports", "memberAccessMustUseModuleInstances_0"], function (require, exports, WinJS) {
     "use strict";
-    WinJS.Promise.timeout(10);
     exports.__esModule = true;
+    WinJS.Promise.timeout(10);
 });
diff --git a/tests/baselines/reference/mergeWithImportedNamespace.js b/tests/baselines/reference/mergeWithImportedNamespace.js
index c27c5ef8615..ec2eb4a1087 100644
--- a/tests/baselines/reference/mergeWithImportedNamespace.js
+++ b/tests/baselines/reference/mergeWithImportedNamespace.js
@@ -12,11 +12,11 @@ export namespace N {
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var N;
 (function (N) {
     N.x = 1;
 })(N = exports.N || (exports.N = {}));
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/mergeWithImportedType.js b/tests/baselines/reference/mergeWithImportedType.js
index 21e457b1361..efa95d77630 100644
--- a/tests/baselines/reference/mergeWithImportedType.js
+++ b/tests/baselines/reference/mergeWithImportedType.js
@@ -10,11 +10,11 @@ export type E = E;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var E;
 (function (E) {
     E[E["X"] = 0] = "X";
 })(E = exports.E || (exports.E = {}));
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/mergedDeclarations6.js b/tests/baselines/reference/mergedDeclarations6.js
index 17aeccbc769..83173f35752 100644
--- a/tests/baselines/reference/mergedDeclarations6.js
+++ b/tests/baselines/reference/mergedDeclarations6.js
@@ -26,6 +26,7 @@ export class B extends A {
 //// [a.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
@@ -35,7 +36,6 @@ define(["require", "exports"], function (require, exports) {
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 //// [b.js]
 var __extends = (this && this.__extends) || (function () {
@@ -50,6 +50,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports", "./a"], function (require, exports, a_1) {
     "use strict";
+    exports.__esModule = true;
     var B = (function (_super) {
         __extends(B, _super);
         function B() {
@@ -60,5 +61,4 @@ define(["require", "exports", "./a"], function (require, exports, a_1) {
         return B;
     }(a_1.A));
     exports.B = B;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/mergedDeclarations7.js b/tests/baselines/reference/mergedDeclarations7.js
index d1becde5240..8fa3f2d0731 100644
--- a/tests/baselines/reference/mergedDeclarations7.js
+++ b/tests/baselines/reference/mergedDeclarations7.js
@@ -24,6 +24,6 @@ let p: Passport = passport.use();
 
 //// [test.js]
 "use strict";
+exports.__esModule = true;
 var passport = require("passport");
 var p = passport.use();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
index c4e5c8dfa10..8d5f55b6801 100644
--- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
+++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.js
@@ -17,6 +17,7 @@ export module X {
 
 //// [mergedModuleDeclarationCodeGen.js]
 "use strict";
+exports.__esModule = true;
 var X;
 (function (X) {
     var Y;
@@ -40,4 +41,3 @@ var X;
         Y.B = B;
     })(Y = X.Y || (X.Y = {}));
 })(X = exports.X || (exports.X = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/metadataOfEventAlias.js b/tests/baselines/reference/metadataOfEventAlias.js
index ace3445911c..40cbc87cdcb 100644
--- a/tests/baselines/reference/metadataOfEventAlias.js
+++ b/tests/baselines/reference/metadataOfEventAlias.js
@@ -13,8 +13,8 @@ export class SomeClass {
 
 //// [event.js]
 "use strict";
-;
 Object.defineProperty(exports, "__esModule", { value: true });
+;
 //// [test.js]
 "use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -26,6 +26,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 function Input(target, key) { }
 var SomeClass = (function () {
     function SomeClass() {
@@ -37,4 +38,3 @@ __decorate([
     __metadata("design:type", Object)
 ], SomeClass.prototype, "event", void 0);
 exports.SomeClass = SomeClass;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/missingFunctionImplementation.js b/tests/baselines/reference/missingFunctionImplementation.js
index 87e1fdd8f58..23bb2356640 100644
--- a/tests/baselines/reference/missingFunctionImplementation.js
+++ b/tests/baselines/reference/missingFunctionImplementation.js
@@ -82,6 +82,7 @@ namespace N12 {
 
 //// [missingFunctionImplementation.js]
 "use strict";
+exports.__esModule = true;
 var C1 = (function () {
     function C1() {
     }
@@ -162,4 +163,3 @@ var N12;
     function m(a) { }
     N12.m = m;
 })(N12 || (N12 = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
index 2d33c5b9768..d4a8b12d2a6 100644
--- a/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
+++ b/tests/baselines/reference/missingSemicolonInModuleSpecifier.js
@@ -10,9 +10,9 @@ import {x} from "./a"
 
 //// [a.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [b.js]
 "use strict";
-(function () { return 1; }());
 exports.__esModule = true;
+(function () { return 1; }());
diff --git a/tests/baselines/reference/moduleAliasAsFunctionArgument.js b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
index 95ef30bb8d6..16eb962a863 100644
--- a/tests/baselines/reference/moduleAliasAsFunctionArgument.js
+++ b/tests/baselines/reference/moduleAliasAsFunctionArgument.js
@@ -22,9 +22,9 @@ define(["require", "exports"], function (require, exports) {
 //// [moduleAliasAsFunctionArgument_1.js]
 define(["require", "exports", "moduleAliasAsFunctionArgument_0"], function (require, exports, a) {
     "use strict";
+    exports.__esModule = true;
     function fn(arg) {
     }
     a.x; // OK
     fn(a); // Error: property 'x' is missing from 'a'
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
index 76eb8237cc6..a92cf5093e3 100644
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.js
@@ -41,20 +41,20 @@ define(["require", "exports"], function (require, exports) {
 //// [map1.js]
 define(["require", "exports", "./observable"], function (require, exports, observable_1) {
     "use strict";
-    observable_1.Observable.prototype.map = function () { };
     exports.__esModule = true;
+    observable_1.Observable.prototype.map = function () { };
 });
 //// [map2.js]
 define(["require", "exports", "./observable"], function (require, exports, observable_1) {
     "use strict";
-    observable_1.Observable.prototype.map = function () { };
     exports.__esModule = true;
+    observable_1.Observable.prototype.map = function () { };
 });
 //// [main.js]
 define(["require", "exports", "./map1", "./map2"], function (require, exports) {
     "use strict";
-    var x;
     exports.__esModule = true;
+    var x;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
index 92bb6cd1d99..77759306845 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.js
@@ -34,22 +34,22 @@ let y = x.map(x => x + 1);
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
     var someValue;
 })(Observable = exports.Observable || (exports.Observable = {}));
-exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
-exports.__esModule = true;
 
 
 //// [observable.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
index 02d461e642d..15ca6aaf806 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.js
@@ -36,24 +36,24 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
 })(Observable = exports.Observable || (exports.Observable = {}));
-exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
 var z1 = observable_1.Observable.someValue.toFixed();
 var z2 = observable_1.Observable.someAnotherValue.toLowerCase();
-exports.__esModule = true;
 
 
 //// [observable.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
index cae38270898..c29bed68e51 100644
--- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
+++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.js
@@ -49,24 +49,24 @@ import "./x";
 
 //// [x0.js]
 "use strict";
-exports.a = 1;
 exports.__esModule = true;
+exports.a = 1;
 //// [x.js]
 "use strict";
+exports.__esModule = true;
 var N1;
 (function (N1) {
     N1.x = 1;
 })(N1 || (N1 = {}));
-exports.__esModule = true;
 //// [observable.js]
 "use strict";
-exports.x = 1;
 exports.__esModule = true;
+exports.x = 1;
 //// [test.js]
 "use strict";
-exports.b = 1;
 exports.__esModule = true;
+exports.b = 1;
 //// [main.js]
 "use strict";
-require("./x");
 exports.__esModule = true;
+require("./x");
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
index 5dc02dc3082..d6857a28ef1 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.js
@@ -36,12 +36,12 @@ let y = x.map(x => x + 1);
 
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
index 28461511dff..eee03576336 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.js
@@ -38,11 +38,12 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="observable.d.ts"/>
 var observable_1 = require("observable");
 require("./map");
@@ -50,7 +51,6 @@ var x;
 var y = x.map(function (x) { return x + 1; });
 var z1 = observable_1.Observable.someValue.toFixed();
 var z2 = observable_1.Observable.someAnotherValue.toLowerCase();
-exports.__esModule = true;
 
 
 //// [map.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
index 0becae3f0ff..9d15f3fe387 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.js
@@ -34,19 +34,19 @@ let y = x.map(x => x + 1);
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
     var someValue;
 })(Observable = exports.Observable || (exports.Observable = {}));
-exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
index cdad871ac21..072c62862e3 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.js
@@ -36,21 +36,21 @@ let z2 = Observable.someAnotherValue.toLowerCase();
 
 //// [observable.js]
 "use strict";
+exports.__esModule = true;
 var Observable;
 (function (Observable) {
 })(Observable = exports.Observable || (exports.Observable = {}));
-exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
 var z1 = observable_1.Observable.someValue.toFixed();
 var z2 = observable_1.Observable.someAnotherValue.toLowerCase();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationGlobal1.js b/tests/baselines/reference/moduleAugmentationGlobal1.js
index 6569631a8d7..2ef6441692f 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal1.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal1.js
@@ -20,18 +20,18 @@ let y = x.getA().x;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var x = [1];
 var y = x.getA().x;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal2.js b/tests/baselines/reference/moduleAugmentationGlobal2.js
index 222e337dd64..1806ceae9a1 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal2.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal2.js
@@ -20,6 +20,7 @@ let y = x.getCountAsString().toLowerCase();
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -27,12 +28,11 @@ var A = (function () {
 }());
 exports.A = A;
 ;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var x = [1];
 var y = x.getCountAsString().toLowerCase();
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal3.js b/tests/baselines/reference/moduleAugmentationGlobal3.js
index 88e6b2c204d..9cb08f2b866 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal3.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal3.js
@@ -23,6 +23,7 @@ let y = x.getCountAsString().toLowerCase();
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
@@ -30,16 +31,15 @@ var A = (function () {
 }());
 exports.A = A;
 ;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
 exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 require("./f2");
 var x = [1];
 var y = x.getCountAsString().toLowerCase();
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal4.js b/tests/baselines/reference/moduleAugmentationGlobal4.js
index 6d9d76f8aaf..194d06aeb80 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal4.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal4.js
@@ -26,9 +26,9 @@ exports.__esModule = true;
 exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 require("./f1");
 require("./f2");
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.js b/tests/baselines/reference/moduleAugmentationGlobal5.js
index f25dffba5e8..43d8c6b958b 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal5.js
+++ b/tests/baselines/reference/moduleAugmentationGlobal5.js
@@ -23,11 +23,11 @@ import "B";
 
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="f1.d.ts"/>
 /// <reference path="f2.d.ts"/>
 require("A");
 require("B");
-exports.__esModule = true;
 
 
 //// [f3.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
index 6a825dcf34c..66ce39e8d84 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.js
@@ -29,33 +29,33 @@ let b = a.foo().n;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
index 4f30d1210ff..e79f2e58484 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.js
@@ -41,33 +41,33 @@ let b = a.foo().n;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
index 66de9f1c596..c7c13ea7861 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.js
@@ -39,33 +39,33 @@ let b = a.foo().n;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
index 0729457fc51..9cdf76b90a5 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.js
@@ -41,32 +41,32 @@ let d = a.baz().b;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
 var c = a.bar().a;
 var d = a.baz().b;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
index 7970f65f412..c7f7990608e 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.js
@@ -41,35 +41,35 @@ let d = a.baz().b;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
 var c = a.bar().a;
 var d = a.baz().b;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
index 3b290b82975..0f19e737ec5 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.js
@@ -41,35 +41,35 @@ let d = a.baz().b;
 
 //// [f1.js]
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
 //// [f2.js]
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
 //// [f3.js]
 "use strict";
+exports.__esModule = true;
 var f1_1 = require("./f1");
 f1_1.A.prototype.foo = function () { return undefined; };
-exports.__esModule = true;
 //// [f4.js]
 "use strict";
+exports.__esModule = true;
 require("./f3");
 var a;
 var b = a.foo().n;
 var c = a.bar().a;
 var d = a.baz().b;
-exports.__esModule = true;
 
 
 //// [f1.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
index 852d50f8d01..4cdef37a4f7 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.js
@@ -31,9 +31,9 @@ x.foo().x;
 //// [main.js]
 /// <reference path="O.d.ts" />
 "use strict";
+exports.__esModule = true;
 var x;
 x.foo().x;
-exports.__esModule = true;
 
 
 //// [main.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
index 1fdb32a55b5..536931ee61f 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.js
@@ -31,7 +31,7 @@ x.foo().x;
 //// [main.js]
 /// <reference path="O.d.ts" />
 "use strict";
+exports.__esModule = true;
 require("Map");
 var x;
 x.foo().x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
index aa6b33baef3..37253ab7e5b 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.js
@@ -41,8 +41,8 @@ x.foo2().x2;
 //// [main.js]
 /// <reference path="O.d.ts" />
 "use strict";
+exports.__esModule = true;
 require("Map");
 var x;
 x.foo().x;
 x.foo2().x2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
index 5f209f753cf..0c861447b46 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.js
@@ -44,8 +44,8 @@ x.foo2().x2;
 /// <reference path="O.d.ts" />
 /// <reference path="O2.d.ts" />
 "use strict";
+exports.__esModule = true;
 require("Map");
 var x;
 x.foo().x;
 x.foo2().x2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
index 55226da5ee9..ac202784f43 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.js
@@ -25,11 +25,11 @@ let y = x.getA().x;
 
 //// [f.js]
 "use strict";
+exports.__esModule = true;
 /// <reference path="array.d.ts"/>
 require("array");
 var x = [1];
 var y = x.getA().x;
-exports.__esModule = true;
 
 
 //// [f.d.ts]
diff --git a/tests/baselines/reference/moduleAugmentationInDependency.js b/tests/baselines/reference/moduleAugmentationInDependency.js
index 757b71754d6..31c82ad18e8 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency.js
+++ b/tests/baselines/reference/moduleAugmentationInDependency.js
@@ -10,5 +10,5 @@ import "A"
 
 //// [app.js]
 "use strict";
-require("A");
 exports.__esModule = true;
+require("A");
diff --git a/tests/baselines/reference/moduleAugmentationInDependency2.js b/tests/baselines/reference/moduleAugmentationInDependency2.js
index 53d2e6ede71..e7a964650bd 100644
--- a/tests/baselines/reference/moduleAugmentationInDependency2.js
+++ b/tests/baselines/reference/moduleAugmentationInDependency2.js
@@ -13,5 +13,5 @@ import "A"
 exports.__esModule = true;
 //// [app.js]
 "use strict";
-require("A");
 exports.__esModule = true;
+require("A");
diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.js b/tests/baselines/reference/moduleAugmentationNoNewNames.js
index 6edaf5b9fca..4376c23a7f8 100644
--- a/tests/baselines/reference/moduleAugmentationNoNewNames.js
+++ b/tests/baselines/reference/moduleAugmentationNoNewNames.js
@@ -33,12 +33,12 @@ let y = x.map(x => x + 1);
 exports.__esModule = true;
 //// [map.js]
 "use strict";
+exports.__esModule = true;
 var observable_1 = require("./observable");
 observable_1.Observable.prototype.map = function () { };
-exports.__esModule = true;
 //// [main.js]
 "use strict";
+exports.__esModule = true;
 require("./map");
 var x;
 var y = x.map(function (x) { return x + 1; });
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
index d41be369917..9ad2aa842d0 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.js
@@ -58,22 +58,23 @@ c.baz2().x.toLowerCase();
 //// [out.js]
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var Cls = (function () {
         function Cls() {
         }
         return Cls;
     }());
     exports.Cls = Cls;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m2", ["require", "exports", "m1"], function (require, exports, m1_1) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     m1_1.Cls.prototype.foo = function () { return 1; };
     m1_1.Cls.prototype.bar = function () { return "1"; };
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m3", ["require", "exports"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var C1 = (function () {
         function C1() {
         }
@@ -86,22 +87,21 @@ define("m3", ["require", "exports"], function (require, exports) {
         return C2;
     }());
     exports.C2 = C2;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("m4", ["require", "exports", "m1"], function (require, exports, m1_2) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     m1_2.Cls.prototype.baz1 = function () { return undefined; };
     m1_2.Cls.prototype.baz2 = function () { return undefined; };
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 define("test", ["require", "exports", "m2", "m4"], function (require, exports) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var c;
     c.foo().toExponential();
     c.bar().toLowerCase();
     c.baz1().x.toExponential();
     c.baz2().x.toLowerCase();
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.js b/tests/baselines/reference/moduleAugmentationsImports1.js
index 4f93e976dfc..116c5c5e830 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.js
+++ b/tests/baselines/reference/moduleAugmentationsImports1.js
@@ -45,37 +45,37 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 /// <reference path="c.d.ts"/>
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
+    exports.__esModule = true;
     a_1.A.prototype.getB = function () { return undefined; };
     a_1.A.prototype.getCls = function () { return undefined; };
-    exports.__esModule = true;
 });
 define("main", ["require", "exports", "d"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.js b/tests/baselines/reference/moduleAugmentationsImports2.js
index 94d418c7fc7..e13cbd8f3dd 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.js
+++ b/tests/baselines/reference/moduleAugmentationsImports2.js
@@ -50,41 +50,41 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 /// <reference path="c.d.ts"/>
 define("d", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
-    a_1.A.prototype.getB = function () { return undefined; };
     exports.__esModule = true;
+    a_1.A.prototype.getB = function () { return undefined; };
 });
 define("e", ["require", "exports", "a"], function (require, exports, a_2) {
     "use strict";
-    a_2.A.prototype.getCls = function () { return undefined; };
     exports.__esModule = true;
+    a_2.A.prototype.getCls = function () { return undefined; };
 });
 define("main", ["require", "exports", "d", "e"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.js b/tests/baselines/reference/moduleAugmentationsImports3.js
index 71f96df940c..a4a6ccea849 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.js
+++ b/tests/baselines/reference/moduleAugmentationsImports3.js
@@ -49,35 +49,35 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 define("e", ["require", "exports", "a"], function (require, exports, a_1) {
     "use strict";
-    a_1.A.prototype.getCls = function () { return undefined; };
     exports.__esModule = true;
+    a_1.A.prototype.getCls = function () { return undefined; };
 });
 define("main", ["require", "exports", "D", "e"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.js b/tests/baselines/reference/moduleAugmentationsImports4.js
index 2883d91d03c..4be17a61edb 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.js
+++ b/tests/baselines/reference/moduleAugmentationsImports4.js
@@ -50,30 +50,30 @@ let c = a.getCls().y.toLowerCase();
 //// [f.js]
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 define("main", ["require", "exports", "D", "E"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var a;
     var b = a.getB().x.toFixed();
     var c = a.getCls().y.toLowerCase();
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/moduleCodeGenTest5.js b/tests/baselines/reference/moduleCodeGenTest5.js
index 8c396d4fcdd..ee6fd2ab317 100644
--- a/tests/baselines/reference/moduleCodeGenTest5.js
+++ b/tests/baselines/reference/moduleCodeGenTest5.js
@@ -23,6 +23,7 @@ var v = E2.B;
 
 //// [moduleCodeGenTest5.js]
 "use strict";
+exports.__esModule = true;
 exports.x = 0;
 var y = 0;
 function f1() { }
@@ -53,4 +54,3 @@ var E2;
     E2[E2["B"] = 0] = "B";
 })(E2 || (E2 = {}));
 var v = E2.B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleCodegenTest4.js b/tests/baselines/reference/moduleCodegenTest4.js
index e66235ca2bc..f877ad74bc3 100644
--- a/tests/baselines/reference/moduleCodegenTest4.js
+++ b/tests/baselines/reference/moduleCodegenTest4.js
@@ -6,10 +6,10 @@ void 0;
 
 //// [moduleCodegenTest4.js]
 "use strict";
+exports.__esModule = true;
 var Baz;
 (function (Baz) {
     Baz.x = "hello";
 })(Baz = exports.Baz || (exports.Baz = {}));
 Baz.x = "goodbye";
 void 0;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleDuplicateIdentifiers.js b/tests/baselines/reference/moduleDuplicateIdentifiers.js
index 1af231a9a62..a2a099fca1d 100644
--- a/tests/baselines/reference/moduleDuplicateIdentifiers.js
+++ b/tests/baselines/reference/moduleDuplicateIdentifiers.js
@@ -42,6 +42,7 @@ export enum Utensils { // Shouldn't error
 
 //// [moduleDuplicateIdentifiers.js]
 "use strict";
+exports.__esModule = true;
 exports.Foo = 2;
 exports.Foo = 42; // Should error
 var FooBar;
@@ -76,4 +77,3 @@ var Utensils;
 (function (Utensils) {
     Utensils[Utensils["Spork"] = 3] = "Spork";
 })(Utensils = exports.Utensils || (exports.Utensils = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleExports1.js b/tests/baselines/reference/moduleExports1.js
index 7db2ce416dd..66c746c5f51 100644
--- a/tests/baselines/reference/moduleExports1.js
+++ b/tests/baselines/reference/moduleExports1.js
@@ -16,6 +16,7 @@ if (!module.exports) module.exports = "";
 //// [moduleExports1.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var TypeScript;
     (function (TypeScript) {
         var Strasse;
@@ -36,5 +37,4 @@ define(["require", "exports"], function (require, exports) {
     void 0;
     if (!module.exports)
         module.exports = "";
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
index 9e79d8d81b2..2ed22cfa4f0 100644
--- a/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
+++ b/tests/baselines/reference/moduleImportedForTypeArgumentPosition.js
@@ -29,6 +29,7 @@ var __extends = (this && this.__extends) || (function () {
 })();
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C1 = (function () {
         function C1() {
         }
@@ -41,5 +42,4 @@ define(["require", "exports"], function (require, exports) {
         }
         return Test1;
     }(C1));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleInTypePosition1.js b/tests/baselines/reference/moduleInTypePosition1.js
index 314460661b2..7408db5c291 100644
--- a/tests/baselines/reference/moduleInTypePosition1.js
+++ b/tests/baselines/reference/moduleInTypePosition1.js
@@ -13,14 +13,14 @@ var x = (w1: WinJS) => { };
 
 //// [moduleInTypePosition1_0.js]
 "use strict";
+exports.__esModule = true;
 var Promise = (function () {
     function Promise() {
     }
     return Promise;
 }());
 exports.Promise = Promise;
-exports.__esModule = true;
 //// [moduleInTypePosition1_1.js]
 "use strict";
-var x = function (w1) { };
 exports.__esModule = true;
+var x = function (w1) { };
diff --git a/tests/baselines/reference/moduleMergeConstructor.js b/tests/baselines/reference/moduleMergeConstructor.js
index edf18bb7d58..88531532acc 100644
--- a/tests/baselines/reference/moduleMergeConstructor.js
+++ b/tests/baselines/reference/moduleMergeConstructor.js
@@ -30,11 +30,11 @@ class Test {
 //// [index.js]
 define(["require", "exports", "foo"], function (require, exports, foo) {
     "use strict";
+    exports.__esModule = true;
     var Test = (function () {
         function Test() {
             this.bar = new foo.Foo();
         }
         return Test;
     }());
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleNoneErrors.js b/tests/baselines/reference/moduleNoneErrors.js
index 3ed09d2cd7a..7be89f236be 100644
--- a/tests/baselines/reference/moduleNoneErrors.js
+++ b/tests/baselines/reference/moduleNoneErrors.js
@@ -6,10 +6,10 @@ export class Foo {
 
 //// [a.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/modulePrologueAMD.js b/tests/baselines/reference/modulePrologueAMD.js
index cb53b78f038..b38e5d95f2c 100644
--- a/tests/baselines/reference/modulePrologueAMD.js
+++ b/tests/baselines/reference/modulePrologueAMD.js
@@ -6,11 +6,11 @@ export class Foo {}
 //// [modulePrologueAMD.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
         return Foo;
     }());
     exports.Foo = Foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/modulePrologueCommonjs.js b/tests/baselines/reference/modulePrologueCommonjs.js
index 2f2cf9d9148..4f465a2ae2f 100644
--- a/tests/baselines/reference/modulePrologueCommonjs.js
+++ b/tests/baselines/reference/modulePrologueCommonjs.js
@@ -5,10 +5,10 @@ export class Foo {}
 
 //// [modulePrologueCommonjs.js]
 "use strict";
+exports.__esModule = true;
 var Foo = (function () {
     function Foo() {
     }
     return Foo;
 }());
 exports.Foo = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/modulePrologueUmd.js b/tests/baselines/reference/modulePrologueUmd.js
index 7b39a9d12e3..c9b8c331bcf 100644
--- a/tests/baselines/reference/modulePrologueUmd.js
+++ b/tests/baselines/reference/modulePrologueUmd.js
@@ -14,11 +14,11 @@ export class Foo {}
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var Foo = (function () {
         function Foo() {
         }
         return Foo;
     }());
     exports.Foo = Foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js
index 685a2ac0233..86f681fa27a 100644
--- a/tests/baselines/reference/moduleResolutionNoResolve.js
+++ b/tests/baselines/reference/moduleResolutionNoResolve.js
@@ -13,5 +13,5 @@ export var c = '';
 exports.__esModule = true;
 //// [b.js]
 "use strict";
-exports.c = '';
 exports.__esModule = true;
+exports.c = '';
diff --git a/tests/baselines/reference/moduleResolutionNoTs.js b/tests/baselines/reference/moduleResolutionNoTs.js
index 39217292117..33f692396fa 100644
--- a/tests/baselines/reference/moduleResolutionNoTs.js
+++ b/tests/baselines/reference/moduleResolutionNoTs.js
@@ -23,12 +23,12 @@ import z2 from "./z";
 
 //// [x.js]
 "use strict";
-exports["default"] = 0;
 exports.__esModule = true;
+exports["default"] = 0;
 //// [y.jsx]
 "use strict";
-exports["default"] = 0;
 exports.__esModule = true;
+exports["default"] = 0;
 //// [user.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.js b/tests/baselines/reference/moduleResolutionWithExtensions.js
index d2ee65a508a..b9a644a7209 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions.js
@@ -27,8 +27,8 @@ import j from "./jquery.js"
 
 //// [a.js]
 "use strict";
-exports["default"] = 0;
 exports.__esModule = true;
+exports["default"] = 0;
 // No extension: '.ts' added 
 //// [b.js]
 "use strict";
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
index fb8904c5748..a9dc91d9a55 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_preferTs.js
@@ -12,8 +12,8 @@ import b from "./b";
 
 //// [index.js]
 "use strict";
-exports["default"] = 0;
 exports.__esModule = true;
+exports["default"] = 0;
 //// [a.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
index 014207d2400..7d67bde6509 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected.js
@@ -14,5 +14,5 @@ import "normalize.css";
 
 //// [a.js]
 "use strict";
-require("normalize.css");
 exports.__esModule = true;
+require("normalize.css");
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
index c53efeb0961..0a04d8a9077 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_unexpected2.js
@@ -14,5 +14,5 @@ import "foo";
 
 //// [a.js]
 "use strict";
-require("foo");
 exports.__esModule = true;
+require("foo");
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks.js b/tests/baselines/reference/moduleResolutionWithSymlinks.js
index e0aebb04d76..520324cb222 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks.js
@@ -43,25 +43,25 @@ tsc app.ts # Should write to library-a/index.js, library-b/index.js, and app.js
 // When symlinked files are in node_modules, they are resolved with realpath;
 // so a linked file does not create a duplicate SourceFile of the real one.
 "use strict";
+exports.__esModule = true;
 var MyClass = (function () {
     function MyClass() {
     }
     return MyClass;
 }());
 exports.MyClass = MyClass;
-exports.__esModule = true;
 //// [/src/library-b/index.js]
 "use strict";
+exports.__esModule = true;
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
-exports.__esModule = true;
 //// [/src/app.js]
 "use strict";
+exports.__esModule = true;
 var x;
 var y;
 x = y;
 y = x;
-exports.__esModule = true;
 /*
 # To reproduce in a real project:
 
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
index 55317e413bf..cde63e0604d 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_notInNodeModules.js
@@ -18,18 +18,18 @@ x + x2;
 // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
 // See GH#10364. 
 "use strict";
-exports.x = 0;
 exports.__esModule = true;
+exports.x = 0;
 //// [/src/bin/shared2/abc.js]
 // When symlinked files are not in node_modules, realpath is not used.
 // A symlink file acts like the real thing. So, 2 symlinks act like 2 different files.
 // See GH#10364. 
 "use strict";
-exports.x = 0;
 exports.__esModule = true;
+exports.x = 0;
 //// [/src/bin/app.js]
 "use strict";
+exports.__esModule = true;
 var abc_1 = require("./shared/abc");
 var abc_2 = require("./shared2/abc");
 abc_1.x + abc_2.x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
index d4fb798e8c7..0bd77a1dcc7 100644
--- a/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
+++ b/tests/baselines/reference/moduleResolutionWithSymlinks_withOutDir.js
@@ -22,22 +22,22 @@ y = x;
 //// [/src/bin/library-a/index.js]
 // Same as moduleResolutionWithSymlinks.ts, but with outDir
 "use strict";
+exports.__esModule = true;
 var MyClass = (function () {
     function MyClass() {
     }
     return MyClass;
 }());
 exports.MyClass = MyClass;
-exports.__esModule = true;
 //// [/src/bin/library-b/index.js]
 "use strict";
+exports.__esModule = true;
 var library_a_1 = require("library-a");
 exports.MyClass2 = library_a_1.MyClass;
-exports.__esModule = true;
 //// [/src/bin/app.js]
 "use strict";
+exports.__esModule = true;
 var x;
 var y;
 x = y;
 y = x;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
index 0b50be0e5e4..c4d451ba9f9 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings1.js
@@ -12,20 +12,20 @@ export var foo = 42;
 
 //// [c.js]
 "use strict";
-exports.foo = 42;
 exports.__esModule = true;
+exports.foo = 42;
 //// [b.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
-__export(require("./c"));
 exports.__esModule = true;
+__export(require("./c"));
 //// [a.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 __export(require("./b"));
 __export(require("./c"));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
index 7caaf1e55f6..d1f6dc7abc7 100644
--- a/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
+++ b/tests/baselines/reference/moduleSameValueDuplicateExportedBindings2.js
@@ -15,23 +15,23 @@ export enum Animals {
 
 //// [c.js]
 "use strict";
+exports.__esModule = true;
 var Animals;
 (function (Animals) {
     Animals[Animals["Cat"] = 0] = "Cat";
     Animals[Animals["Dog"] = 1] = "Dog";
 })(Animals = exports.Animals || (exports.Animals = {}));
 ;
-exports.__esModule = true;
 //// [b.js]
 "use strict";
+exports.__esModule = true;
 var c_1 = require("./c");
 exports.Animals = c_1.Animals;
-exports.__esModule = true;
 //// [a.js]
 "use strict";
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+exports.__esModule = true;
 __export(require("./b"));
 __export(require("./c"));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/moduleScoping.js b/tests/baselines/reference/moduleScoping.js
index bee7a06ce6f..601d7e41fcd 100644
--- a/tests/baselines/reference/moduleScoping.js
+++ b/tests/baselines/reference/moduleScoping.js
@@ -29,16 +29,16 @@ var v2 = 42; // Global scope
 var v4 = function () { return 5; };
 //// [file3.js]
 "use strict";
+exports.__esModule = true;
 exports.v3 = true;
 var v2 = [1, 2, 3]; // Module scope. Should not appear in global scope
-exports.__esModule = true;
 //// [file4.js]
 "use strict";
+exports.__esModule = true;
 var file3 = require("./file3");
 var t1 = v1;
 var t2 = v2;
 var t3 = file3.v3;
 var v4 = { a: true, b: NaN }; // Should shadow global v2 in this module
-exports.__esModule = true;
 //// [file5.js]
 var x = v2; // Should be global v2 of type number again
diff --git a/tests/baselines/reference/multiImportExport.js b/tests/baselines/reference/multiImportExport.js
index afc2fa1f5bd..07e353cb301 100644
--- a/tests/baselines/reference/multiImportExport.js
+++ b/tests/baselines/reference/multiImportExport.js
@@ -44,13 +44,13 @@ var Math = {
 module.exports = Math;
 //// [Drawing.js]
 "use strict";
-exports.Math = require("./Math/Math");
 exports.__esModule = true;
+exports.Math = require("./Math/Math");
 //// [consumer.js]
 "use strict";
+exports.__esModule = true;
 var Drawing = require("./Drawing");
 var addr = new Drawing.Math.Adder();
-exports.__esModule = true;
 
 
 //// [Adder.d.ts]
diff --git a/tests/baselines/reference/multipleDefaultExports01.js b/tests/baselines/reference/multipleDefaultExports01.js
index 4ea2e7cb8f0..98c17051809 100644
--- a/tests/baselines/reference/multipleDefaultExports01.js
+++ b/tests/baselines/reference/multipleDefaultExports01.js
@@ -20,6 +20,7 @@ Entity();
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var foo = (function () {
     function foo() {
     }
@@ -31,9 +32,8 @@ function bar() {
 exports.default = bar;
 var x = 10;
 exports.default = x;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 m1_1.default();
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/multipleDefaultExports02.js b/tests/baselines/reference/multipleDefaultExports02.js
index 5fe294d1939..b129dba0392 100644
--- a/tests/baselines/reference/multipleDefaultExports02.js
+++ b/tests/baselines/reference/multipleDefaultExports02.js
@@ -17,15 +17,15 @@ Entity();
 
 //// [m1.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 function foo() {
 }
 exports.default = foo;
 function bar() {
 }
 exports.default = bar;
-Object.defineProperty(exports, "__esModule", { value: true });
 //// [m2.js]
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var m1_1 = require("./m1");
 m1_1.default();
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/multipleDefaultExports03.js b/tests/baselines/reference/multipleDefaultExports03.js
index 436232c145e..897a3f00eb4 100644
--- a/tests/baselines/reference/multipleDefaultExports03.js
+++ b/tests/baselines/reference/multipleDefaultExports03.js
@@ -8,16 +8,16 @@ export default class C {
 
 //// [multipleDefaultExports03.js]
 "use strict";
-var C = (function () {
-    function C() {
-    }
-    return C;
-}());
-exports.default = C;
-var C = (function () {
-    function C() {
-    }
-    return C;
-}());
-exports.default = C;
 Object.defineProperty(exports, "__esModule", { value: true });
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+exports.default = C;
+var C = (function () {
+    function C() {
+    }
+    return C;
+}());
+exports.default = C;
diff --git a/tests/baselines/reference/multipleDefaultExports04.js b/tests/baselines/reference/multipleDefaultExports04.js
index b2c37ec5f0e..341f6f41c62 100644
--- a/tests/baselines/reference/multipleDefaultExports04.js
+++ b/tests/baselines/reference/multipleDefaultExports04.js
@@ -8,10 +8,10 @@ export default function f() {
 
 //// [multipleDefaultExports04.js]
 "use strict";
-function f() {
-}
-exports.default = f;
-function f() {
-}
-exports.default = f;
 Object.defineProperty(exports, "__esModule", { value: true });
+function f() {
+}
+exports.default = f;
+function f() {
+}
+exports.default = f;
diff --git a/tests/baselines/reference/multipleExportDefault1.js b/tests/baselines/reference/multipleExportDefault1.js
index 4817012ab75..8375c2f9e6f 100644
--- a/tests/baselines/reference/multipleExportDefault1.js
+++ b/tests/baselines/reference/multipleExportDefault1.js
@@ -10,10 +10,10 @@ export default {
 
 //// [multipleExportDefault1.js]
 "use strict";
+exports.__esModule = true;
 function Foo() {
 }
 exports["default"] = Foo;
 exports["default"] = {
     uhoh: "another default"
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault2.js b/tests/baselines/reference/multipleExportDefault2.js
index e979b96fe71..0c06385f9af 100644
--- a/tests/baselines/reference/multipleExportDefault2.js
+++ b/tests/baselines/reference/multipleExportDefault2.js
@@ -9,9 +9,9 @@ export default function Foo() { }
 
 //// [multipleExportDefault2.js]
 "use strict";
+exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
 function Foo() { }
 exports["default"] = Foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault3.js b/tests/baselines/reference/multipleExportDefault3.js
index e889edc907a..1091af16301 100644
--- a/tests/baselines/reference/multipleExportDefault3.js
+++ b/tests/baselines/reference/multipleExportDefault3.js
@@ -9,6 +9,7 @@ export default class C { }
 
 //// [multipleExportDefault3.js]
 "use strict";
+exports.__esModule = true;
 exports["default"] = {
     uhoh: "another default"
 };
@@ -18,4 +19,3 @@ var C = (function () {
     return C;
 }());
 exports["default"] = C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault4.js b/tests/baselines/reference/multipleExportDefault4.js
index d46cda4d8b3..b3e0ef3e870 100644
--- a/tests/baselines/reference/multipleExportDefault4.js
+++ b/tests/baselines/reference/multipleExportDefault4.js
@@ -7,6 +7,7 @@ export default {
 
 //// [multipleExportDefault4.js]
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
@@ -16,4 +17,3 @@ exports["default"] = C;
 exports["default"] = {
     uhoh: "another default"
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault5.js b/tests/baselines/reference/multipleExportDefault5.js
index 5c10a1be95a..a5032e45244 100644
--- a/tests/baselines/reference/multipleExportDefault5.js
+++ b/tests/baselines/reference/multipleExportDefault5.js
@@ -4,6 +4,7 @@ export default class C {}
 
 //// [multipleExportDefault5.js]
 "use strict";
+exports.__esModule = true;
 function bar() { }
 exports["default"] = bar;
 var C = (function () {
@@ -12,4 +13,3 @@ var C = (function () {
     return C;
 }());
 exports["default"] = C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExportDefault6.js b/tests/baselines/reference/multipleExportDefault6.js
index 3d990277993..aa372e4d410 100644
--- a/tests/baselines/reference/multipleExportDefault6.js
+++ b/tests/baselines/reference/multipleExportDefault6.js
@@ -9,10 +9,10 @@ export default {
 
 //// [multipleExportDefault6.js]
 "use strict";
+exports.__esModule = true;
 exports["default"] = {
     lol: 1
 };
 exports["default"] = {
     lol: 2
 };
-exports.__esModule = true;
diff --git a/tests/baselines/reference/multipleExports.js b/tests/baselines/reference/multipleExports.js
index 75a4e125f21..05276591447 100644
--- a/tests/baselines/reference/multipleExports.js
+++ b/tests/baselines/reference/multipleExports.js
@@ -14,6 +14,7 @@ export module M {
 
 //// [multipleExports.js]
 "use strict";
+exports.__esModule = true;
 var M;
 (function (M) {
     M.v = 0;
@@ -22,4 +23,3 @@ var x = 0;
 (function (M) {
     M.v;
 })(M = exports.M || (exports.M = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/nameDelimitedBySlashes.js b/tests/baselines/reference/nameDelimitedBySlashes.js
index 4677da0df7b..149b6a0d59f 100644
--- a/tests/baselines/reference/nameDelimitedBySlashes.js
+++ b/tests/baselines/reference/nameDelimitedBySlashes.js
@@ -10,10 +10,10 @@ var x = foo.foo + 42;
 
 //// [foo_0.js]
 "use strict";
-exports.foo = 42;
 exports.__esModule = true;
+exports.foo = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./test/foo_0");
 var x = foo.foo + 42;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/nameWithFileExtension.js b/tests/baselines/reference/nameWithFileExtension.js
index de42c5ed60c..3c1cf8dce66 100644
--- a/tests/baselines/reference/nameWithFileExtension.js
+++ b/tests/baselines/reference/nameWithFileExtension.js
@@ -10,10 +10,10 @@ var x = foo.foo + 42;
 
 //// [foo_0.js]
 "use strict";
-exports.foo = 42;
 exports.__esModule = true;
+exports.foo = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 var foo = require("./foo_0.js");
 var x = foo.foo + 42;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/nameWithRelativePaths.js b/tests/baselines/reference/nameWithRelativePaths.js
index e7c85322317..d070638417b 100644
--- a/tests/baselines/reference/nameWithRelativePaths.js
+++ b/tests/baselines/reference/nameWithRelativePaths.js
@@ -25,28 +25,28 @@ if(foo2.M2.x){
 
 //// [foo_0.js]
 "use strict";
-exports.foo = 42;
 exports.__esModule = true;
+exports.foo = 42;
 //// [foo_1.js]
 "use strict";
+exports.__esModule = true;
 function f() {
     return 42;
 }
 exports.f = f;
-exports.__esModule = true;
 //// [foo_2.js]
 "use strict";
+exports.__esModule = true;
 var M2;
 (function (M2) {
     M2.x = true;
 })(M2 = exports.M2 || (exports.M2 = {}));
-exports.__esModule = true;
 //// [foo_3.js]
 "use strict";
+exports.__esModule = true;
 var foo0 = require("../foo_0");
 var foo1 = require("./test/foo_1");
 var foo2 = require("./.././test/foo_2");
 if (foo2.M2.x) {
     var x = foo0.foo + foo1.f();
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline/amd/decl.js b/tests/baselines/reference/project/baseline/amd/decl.js
index a8a506f23c3..1e03f7745d2 100644
--- a/tests/baselines/reference/project/baseline/amd/decl.js
+++ b/tests/baselines/reference/project/baseline/amd/decl.js
@@ -1,9 +1,9 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     ;
     function point(x, y) {
         return { x: x, y: y };
     }
     exports.point = point;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline/amd/emit.js b/tests/baselines/reference/project/baseline/amd/emit.js
index 5daa1879628..b4d6d12445b 100644
--- a/tests/baselines/reference/project/baseline/amd/emit.js
+++ b/tests/baselines/reference/project/baseline/amd/emit.js
@@ -1,5 +1,5 @@
 define(["require", "exports", "./decl"], function (require, exports, g) {
     "use strict";
-    var p = g.point(10, 20);
     exports.__esModule = true;
+    var p = g.point(10, 20);
 });
diff --git a/tests/baselines/reference/project/baseline/node/decl.js b/tests/baselines/reference/project/baseline/node/decl.js
index 998ffaa5592..b7047c3f047 100644
--- a/tests/baselines/reference/project/baseline/node/decl.js
+++ b/tests/baselines/reference/project/baseline/node/decl.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 ;
 function point(x, y) {
     return { x: x, y: y };
 }
 exports.point = point;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline/node/emit.js b/tests/baselines/reference/project/baseline/node/emit.js
index 17c96719d0b..9410f82bc32 100644
--- a/tests/baselines/reference/project/baseline/node/emit.js
+++ b/tests/baselines/reference/project/baseline/node/emit.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var g = require("./decl");
 var p = g.point(10, 20);
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline2/amd/decl.js b/tests/baselines/reference/project/baseline2/amd/decl.js
index a8a506f23c3..1e03f7745d2 100644
--- a/tests/baselines/reference/project/baseline2/amd/decl.js
+++ b/tests/baselines/reference/project/baseline2/amd/decl.js
@@ -1,9 +1,9 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     ;
     function point(x, y) {
         return { x: x, y: y };
     }
     exports.point = point;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline2/amd/dont_emit.js b/tests/baselines/reference/project/baseline2/amd/dont_emit.js
index 859d262e9c6..18dae0f6420 100644
--- a/tests/baselines/reference/project/baseline2/amd/dont_emit.js
+++ b/tests/baselines/reference/project/baseline2/amd/dont_emit.js
@@ -1,5 +1,5 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var p = { x: 10, y: 20 };
     exports.__esModule = true;
+    var p = { x: 10, y: 20 };
 });
diff --git a/tests/baselines/reference/project/baseline2/node/decl.js b/tests/baselines/reference/project/baseline2/node/decl.js
index 998ffaa5592..b7047c3f047 100644
--- a/tests/baselines/reference/project/baseline2/node/decl.js
+++ b/tests/baselines/reference/project/baseline2/node/decl.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 ;
 function point(x, y) {
     return { x: x, y: y };
 }
 exports.point = point;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/baseline2/node/dont_emit.js b/tests/baselines/reference/project/baseline2/node/dont_emit.js
index c172dcd312f..ce766eee086 100644
--- a/tests/baselines/reference/project/baseline2/node/dont_emit.js
+++ b/tests/baselines/reference/project/baseline2/node/dont_emit.js
@@ -1,3 +1,3 @@
 "use strict";
-var p = { x: 10, y: 20 };
 exports.__esModule = true;
+var p = { x: 10, y: 20 };
diff --git a/tests/baselines/reference/project/baseline3/amd/nestedModule.js b/tests/baselines/reference/project/baseline3/amd/nestedModule.js
index 3fa69311ffa..c4f4e37489d 100644
--- a/tests/baselines/reference/project/baseline3/amd/nestedModule.js
+++ b/tests/baselines/reference/project/baseline3/amd/nestedModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var outer;
     (function (outer) {
         var inner;
@@ -8,5 +9,4 @@ define(["require", "exports"], function (require, exports) {
             inner.a = local;
         })(inner = outer.inner || (outer.inner = {}));
     })(outer = exports.outer || (exports.outer = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/baseline3/node/nestedModule.js b/tests/baselines/reference/project/baseline3/node/nestedModule.js
index 9596b38253a..345fd8914cc 100644
--- a/tests/baselines/reference/project/baseline3/node/nestedModule.js
+++ b/tests/baselines/reference/project/baseline3/node/nestedModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var outer;
 (function (outer) {
     var inner;
@@ -7,4 +8,3 @@ var outer;
         inner.a = local;
     })(inner = outer.inner || (outer.inner = {}));
 })(outer = exports.outer || (exports.outer = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir/amd/a.js b/tests/baselines/reference/project/declarationDir/amd/a.js
index 30c63965136..4db463a7966 100644
--- a/tests/baselines/reference/project/declarationDir/amd/a.js
+++ b/tests/baselines/reference/project/declarationDir/amd/a.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
index 14c0c78edb8..bdae3c44b0a 100644
--- a/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/b.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
index b62647beae0..ff657652a4a 100644
--- a/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir/amd/subfolder/c.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir/node/a.js b/tests/baselines/reference/project/declarationDir/node/a.js
index 7480c269a05..2139e86c811 100644
--- a/tests/baselines/reference/project/declarationDir/node/a.js
+++ b/tests/baselines/reference/project/declarationDir/node/a.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
index 3c9a75de66e..df27fec56d1 100644
--- a/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir/node/subfolder/b.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
index 6f1ce11cdc6..385b6df7591 100644
--- a/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir/node/subfolder/c.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
 exports.C = C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/a.js b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
index 30c63965136..4db463a7966 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/a.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/a.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
index 14c0c78edb8..bdae3c44b0a 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/b.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
index b62647beae0..ff657652a4a 100644
--- a/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir2/amd/out/subfolder/c.js
@@ -1,10 +1,10 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/a.js b/tests/baselines/reference/project/declarationDir2/node/out/a.js
index 7480c269a05..2139e86c811 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/a.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/a.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var A = (function () {
     function A() {
     }
     return A;
 }());
 exports.A = A;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
index 3c9a75de66e..df27fec56d1 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/b.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var B = (function () {
     function B() {
     }
     return B;
 }());
 exports.B = B;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
index 6f1ce11cdc6..385b6df7591 100644
--- a/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
+++ b/tests/baselines/reference/project/declarationDir2/node/out/subfolder/c.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var C = (function () {
     function C() {
     }
     return C;
 }());
 exports.C = C;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationDir3/amd/out.js b/tests/baselines/reference/project/declarationDir3/amd/out.js
index d190c7a5767..b90d4415806 100644
--- a/tests/baselines/reference/project/declarationDir3/amd/out.js
+++ b/tests/baselines/reference/project/declarationDir3/amd/out.js
@@ -1,30 +1,30 @@
 define("subfolder/b", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var B = (function () {
         function B() {
         }
         return B;
     }());
     exports.B = B;
-    exports.__esModule = true;
 });
 define("a", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 define("subfolder/c", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var C = (function () {
         function C() {
         }
         return C;
     }());
     exports.C = C;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
+++ b/tests/baselines/reference/project/declarationsCascadingImports/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/glo_m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
index 44111609dca..1610052986d 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.js
@@ -1,7 +1,7 @@
 define(["require", "exports", "glo_m4"], function (require, exports, glo_m4) {
     "use strict";
+    exports.__esModule = true;
     exports.useGlo_m4_x4 = glo_m4.x;
     exports.useGlo_m4_d4 = glo_m4.d;
     exports.useGlo_m4_f4 = glo_m4.foo();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/glo_m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
index b3ee7499e44..b7ddd253b1a 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.js
@@ -1,6 +1,6 @@
 "use strict";
+exports.__esModule = true;
 var glo_m4 = require("glo_m4");
 exports.useGlo_m4_x4 = glo_m4.x;
 exports.useGlo_m4_d4 = glo_m4.d;
 exports.useGlo_m4_f4 = glo_m4.foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/private_m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
index a6563ac4f73..6ecb0c59793 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/amd/useModule.js
@@ -1,10 +1,10 @@
 define(["require", "exports", "private_m4"], function (require, exports, private_m4) {
     "use strict";
+    exports.__esModule = true;
     var usePrivate_m4_m1;
     (function (usePrivate_m4_m1) {
         var x3 = private_m4.x;
         var d3 = private_m4.d;
         var f3 = private_m4.foo();
     })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/private_m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
index 24526ded58b..79310d89c02 100644
--- a/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedInPrivate/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 // only used privately no need to emit
 var private_m4 = require("private_m4");
 var usePrivate_m4_m1;
@@ -7,4 +8,3 @@ var usePrivate_m4_m1;
     var d3 = private_m4.d;
     var f3 = private_m4.foo();
 })(usePrivate_m4_m1 = exports.usePrivate_m4_m1 || (exports.usePrivate_m4_m1 = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/fncOnly_m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
index b3dc7cc82f2..c6c57dabc81 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.js
@@ -1,5 +1,5 @@
 define(["require", "exports", "fncOnly_m4"], function (require, exports, fncOnly_m4) {
     "use strict";
-    exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
     exports.__esModule = true;
+    exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
 });
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/fncOnly_m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
index 8d74ebb2b6e..991afa567cf 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 var fncOnly_m4 = require("fncOnly_m4");
 exports.useFncOnly_m4_f4 = fncOnly_m4.foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
index 6f282e26147..1a0305591cc 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/m5.js
@@ -1,8 +1,8 @@
 define(["require", "exports", "m4"], function (require, exports, m4) {
     "use strict";
+    exports.__esModule = true;
     function foo2() {
         return new m4.d();
     }
     exports.foo2 = foo2;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
index e9c49cd4ddc..6f962bd42e5 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/amd/useModule.js
@@ -1,10 +1,10 @@
 define(["require", "exports", "m5"], function (require, exports, m5) {
     "use strict";
+    exports.__esModule = true;
     exports.d = m5.foo2();
     exports.x = m5.foo2;
     function n() {
         return m5.foo2();
     }
     exports.n = n;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
index fd0ae21091e..db280e7fd8e 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/m5.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 function foo2() {
     return new m4.d();
 }
 exports.foo2 = foo2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
index f06725c1068..7cc88b54ff3 100644
--- a/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsIndirectImportShouldResultInError/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 // Do not emit unused import
 var m5 = require("m5");
 exports.d = m5.foo2();
@@ -7,4 +8,3 @@ function n() {
     return m5.foo2();
 }
 exports.n = n;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
index 8af4110011c..5375f44c013 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4", "m4"], function (require, exports, m4, multiImport_m4) {
     "use strict";
+    exports.__esModule = true;
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
@@ -15,5 +16,4 @@ define(["require", "exports", "m4", "m4"], function (require, exports, m4, multi
     exports.useMultiImport_m4_x4 = multiImport_m4.x;
     exports.useMultiImport_m4_d4 = multiImport_m4.d;
     exports.useMultiImport_m4_f4 = multiImport_m4.foo();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
index fc6900da8d5..395cbeee966 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
@@ -17,4 +18,3 @@ var multiImport_m4 = require("m4"); // Emit used
 exports.useMultiImport_m4_x4 = multiImport_m4.x;
 exports.useMultiImport_m4_d4 = multiImport_m4.d;
 exports.useMultiImport_m4_f4 = multiImport_m4.foo();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
index 6f282e26147..1a0305591cc 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.js
@@ -1,8 +1,8 @@
 define(["require", "exports", "m4"], function (require, exports, m4) {
     "use strict";
+    exports.__esModule = true;
     function foo2() {
         return new m4.d();
     }
     exports.foo2 = foo2;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
index 7221b9e2e8f..b8a22cfdc1f 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) {
     "use strict";
+    exports.__esModule = true;
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
@@ -13,5 +14,4 @@ define(["require", "exports", "m4", "m5"], function (require, exports, m4, m5) {
         var f3 = m4.foo();
     })(m1 = exports.m1 || (exports.m1 = {}));
     exports.d = m5.foo2();
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
index fd0ae21091e..db280e7fd8e 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 function foo2() {
     return new m4.d();
 }
 exports.foo2 = foo2;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
index 7e7a43ce145..49958bb9814 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
@@ -15,4 +16,3 @@ var m1;
 // Do not emit unused import
 var m5 = require("m5");
 exports.d = m5.foo2();
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
index 6b4aa7eeda6..d1c2d5f4aca 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/m4.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var d = (function () {
         function d() {
         }
@@ -11,5 +12,4 @@ define(["require", "exports"], function (require, exports) {
         return new d();
     }
     exports.foo = foo;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
index 1c8e3a5a308..af5fcb7d874 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m4"], function (require, exports, m4) {
     "use strict";
+    exports.__esModule = true;
     exports.x4 = m4.x;
     exports.d4 = m4.d;
     exports.f4 = m4.foo();
@@ -12,5 +13,4 @@ define(["require", "exports", "m4"], function (require, exports, m4) {
         var d3 = m4.d;
         var f3 = m4.foo();
     })(m1 = exports.m1 || (exports.m1 = {}));
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
index e89a132497c..1c9931a6d1d 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/m4.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var d = (function () {
     function d() {
     }
@@ -10,4 +11,3 @@ function foo() {
     return new d();
 }
 exports.foo = foo;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
index ea2836708d2..3a5602a2166 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m4 = require("m4"); // Emit used
 exports.x4 = m4.x;
 exports.d4 = m4.d;
@@ -12,4 +13,3 @@ var m1;
     var d3 = m4.d;
     var f3 = m4.foo();
 })(m1 = exports.m1 || (exports.m1 = {}));
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
index eddb9c577a6..6ec26abec8e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 define(["require", "exports", "angular2/core"], function (require, exports, ng) {
     "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
     var MyClass1 = (function () {
         function MyClass1(_elementRef) {
             this._elementRef = _elementRef;
@@ -21,5 +22,4 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
     ], MyClass1);
     exports.MyClass1 = MyClass1;
     var _a;
-    Object.defineProperty(exports, "__esModule", { value: true });
 });
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
index cbcf36973fd..274520bc752 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -21,4 +22,3 @@ MyClass1 = __decorate([
 ], MyClass1);
 exports.MyClass1 = MyClass1;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 2ef457654e2..7eeee43049b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 891c03b13f2..c44e24a081e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
index b12b9bfe9bb..d393dda0c57 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 30f6e242bc8..436eab5db94 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 2ef457654e2..7eeee43049b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 891c03b13f2..c44e24a081e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index b12b9bfe9bb..d393dda0c57 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 30f6e242bc8..436eab5db94 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 225b233f3e1..1c199b7384a 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index e9248099943..df6d2c811c0 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index ee9fb6673be..749fbd732a5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 9d5330f5c81..0c75dbb2b00 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 5db5f8f1bfb..b49f0a04b53 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 62dc8a8d83f..c67e35d1b89 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
index 2d386326fcd..1935dadfdb3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 28136d8ffc3..8f88c077a44 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
index 944360ae9cc..fa9c5691047 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# 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/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
index dd409b9f2c3..b3b4c42289f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 78b4b9fcfe1..80d6ba438ba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
index e7e1070403f..dabe72d2787 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
index bd73b1912c2..d28465d805e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index f5f5dfcd793..6c7d26906a4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
index aff7400b20f..46d82346a37 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# 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/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
index 6ba04afda9e..3813e4b2cca 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 2d386326fcd..1935dadfdb3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 28136d8ffc3..8f88c077a44 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 944360ae9cc..fa9c5691047 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# 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/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index dd409b9f2c3..b3b4c42289f 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 62dc8a8d83f..c67e35d1b89 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 5db5f8f1bfb..b49f0a04b53 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index bd73b1912c2..d28465d805e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index f5f5dfcd793..6c7d26906a4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index aff7400b20f..46d82346a37 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# 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/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 6ba04afda9e..3813e4b2cca 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index e7e1070403f..dabe72d2787 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_multifolder/mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 78b4b9fcfe1..80d6ba438ba 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 4b75cfaa754..371d873f345 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# 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
index d65b73465ef..783691c52ed 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
index dd98ae30d59..1f3b6d7a6dc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
index 43b1caa625e..16e1f512923 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
index c8ece24eda3..a112cba6d0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
index 27d3a9788c4..a6a299a8a7e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
index 02f7bbcbb67..d16575e8a97 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
index 058f9c4c3a5..94e4facb645 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
index 766ff607b54..47915c9660b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index dd98ae30d59..1f3b6d7a6dc 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 43b1caa625e..16e1f512923 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index c8ece24eda3..a112cba6d0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 27d3a9788c4..a6a299a8a7e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 02f7bbcbb67..d16575e8a97 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 058f9c4c3a5..94e4facb645 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_simple/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 766ff607b54..47915c9660b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 00530261d76..c5e2f0c04bf 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index a30b607676c..293a1478989 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
index 1d0559224b8..8359b4472ee 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index a6d24f0f020..9cef03b0711 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
index cb628091e33..32cd3e8915e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
index 99859780314..39f0b136568 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index a23c1871126..de654530492 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
index 541d8dc4c26..61925246a0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
index a758d2a1cd0..4a1329681e8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 1d0559224b8..8359b4472ee 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index a6d24f0f020..9cef03b0711 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index cb628091e33..32cd3e8915e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index ba491a3c6fa..f1777998477 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 99859780314..39f0b136568 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index a23c1871126..de654530492 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 541d8dc4c26..61925246a0e 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=/tests/cases/projects/outputdir_module_subfolder/mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index a758d2a1cd0..4a1329681e8 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 0f5938617e2..11d40e4d23b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index 173790ea042..61dfeeeb8d3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 30cf48ae0ef..c467f0b8be0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 0dab1514706..7c959ab9408 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
index f7a19e1fa14..d43267b1c9a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 14104ec68b9..15c5c91190e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 744aff01a08..9a46a37deb8 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 0dab1514706..7c959ab9408 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index edf0e169c56..727afdc29fd 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../mapFiles/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 14104ec68b9..15c5c91190e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 3f4ebdb1911..2a89c0fc929 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index b2efc9bf3d4..0b7f01fdec5 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index f1ed00eb139..62af54d3700 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 95830bd2c25..d4bfc447280 100644
--- a/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../outputdir_mixed_subfolder/ref/m1.ts","../outputdir_mixed_subfolder/ref/m2.ts","../outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 4f51d470c82..59de6353786 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 9cdad10a966..6cf63b567ba 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
index 2df791f04e8..2a191801c43 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index ee8a26cafcf..301f83dab55 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
index 1d1c53b36cf..2dcea15d050 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
index e60e0fbfa7a..6c74ce312be 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 3c653ded700..97b03befa22 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
index a889d6f19b3..28edf754650 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
index 83cb52c7f14..9a8f5b77498 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index 5f97087307d..bd9b5d0051a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
index 9ef0d252f05..603b29da7fa 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
index 8c64bacf533..3821a46478a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f50e1837a86..4090486a730 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index ee8a26cafcf..301f83dab55 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 1222f92a7d2..f637a581e13 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index e60e0fbfa7a..6c74ce312be 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index edafd9055b2..fa97d15a89a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 4f51d470c82..59de6353786 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3cfb1b4c030..8de8d6f84b6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../../../mapFiles/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 5f97087307d..bd9b5d0051a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 4e054f32699..ca070c2062f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 8c64bacf533..3821a46478a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 931971b3f84..6ce6e73202e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../../mapFiles/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 3c653ded700..97b03befa22 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 44a6d536eed..e4a7bb40897 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# 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
index b4f33f056d6..83050ce43fe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../projects/outputdir_module_multifolder/ref/m1.ts","../projects/outputdir_module_multifolder_ref/m2.ts","../projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
index 8151fed382b..b890ae8232a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
index 611b73c5c7d..df737e96f26 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
index fe1308aca7e..2cbff5fc156 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
index a6d5cebe7f1..84f19710abc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
index b1a971bd89f..a0cc81f5af9 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
index 733fa0fc069..ea360554f92 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
index e4c81cdfc8e..2cce36f74c2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
index 86cfbeb5b63..e395bf8648f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index df8c82915fb..f5001a6551e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 611b73c5c7d..df737e96f26 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index f361c1c0917..2fb4fbfd5c3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index a6d5cebe7f1..84f19710abc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 7479c4aebee..0110f9dce16 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 733fa0fc069..ea360554f92 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 7e4f77c1c69..4849c53d0c4 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 86cfbeb5b63..e395bf8648f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 37af60df3ea..587721fb87a 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index 5721a33f4a5..5e9e5c8593d 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/m1.ts","../outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
index 29a43275b49..b99a41c8c3c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index dbfe0b5d927..dcfdb34145e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
index 62ec7868d70..c4c2a04f642 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
index a8d6293492c..2df46e6835c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
index debe15abde9..9574bd33b83 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index 172c4d4804a..44556b78663 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
index 461809c985f..4ac58aea856 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
index ef62267d957..47558364d4b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 09f9886020e..2885a499091 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index dbfe0b5d927..dcfdb34145e 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 5eab5555cbe..0ee63c42070 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index a8d6293492c..2df46e6835c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 81956eb2903..fa9502d4d64 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../../mapFiles/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 172c4d4804a..44556b78663 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index fd86ae84059..cabfd9f98d6 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=../../../mapFiles/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index ef62267d957..47558364d4b 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 708517a1d95..d6d12689721 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index a7416c83297..aa198a56dbe 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/ref/m1.ts","../outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index d1d1f0269e8..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index c657ed8edce..4d37c4456a3 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index c55d9770436..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 56f12c22903..6ba684e3841 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index d1d1f0269e8..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index c657ed8edce..4d37c4456a3 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index c55d9770436..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 56f12c22903..6ba684e3841 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 62e49557aab..d9f0f5b1531 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 7618a616fa3..e84545ade77 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5df712534f6..cc3f604524f 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 6a226fbc86c..e115b1ebd64 100644
--- a/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/ref/m2.ts","file:///tests/cases/projects/outputdir_mixed_subfolder/test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 3c1c9b64dc2..0b4d12cead1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 587eac86010..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 746d401dc82..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 9bdc7ad5504..fa0bcf94a5d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
index e1237d92b8e..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 3a4d618044a..6a2bfc777e9 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 4103e499cbd..29b98b193fb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index cfa86d8b53f..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index e3725479646..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 49f97b88a38..f4de6b06e49 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
index 4737d2e579b..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
index 830a0ddd3e5..842d34fe73d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 746d401dc82..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 9bdc7ad5504..fa0bcf94a5d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index e1237d92b8e..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 3a4d618044a..6a2bfc777e9 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 587eac86010..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 3c1c9b64dc2..0b4d12cead1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index e3725479646..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 49f97b88a38..f4de6b06e49 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 4737d2e579b..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 830a0ddd3e5..842d34fe73d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index cfa86d8b53f..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 4103e499cbd..29b98b193fb 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 058227b1276..1ea95ed9ba0 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# 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
index f80ee7e3208..cd6a7fab377 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_multifolder_ref/m2.ts","file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
index 44d9d5ddc28..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
index eceec7b450a..f0cb61b0632 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
index b4651a0d0dd..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
index d68dbf6eb9e..ed2f67c585b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
index 5c9cea260f4..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
index b9de639cb1d..da3b77ba146 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
index 693783c4c10..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
index 826729aba87..f4d0ecfe24b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 44d9d5ddc28..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index eceec7b450a..f0cb61b0632 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b4651a0d0dd..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index d68dbf6eb9e..ed2f67c585b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 5c9cea260f4..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index b9de639cb1d..da3b77ba146 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 693783c4c10..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 826729aba87..f4d0ecfe24b 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 16cec87f1e7..d19b9195685 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index c7b114195f2..ba2950b1a5e 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/m1.ts","file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index 1556b5c5d2f..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 755cc1d0aaf..2f6470b65ff 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
index ad7acefc91b..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 957a73c648a..a88a706d9b1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 73def0e2583..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index f7e43883048..5b58a2ee571 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
index bb09d33c72b..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
index 8baefdad92b..d4034d62c4a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 1556b5c5d2f..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 755cc1d0aaf..2f6470b65ff 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index ad7acefc91b..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 957a73c648a..a88a706d9b1 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 73def0e2583..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index f7e43883048..5b58a2ee571 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bb09d33c72b..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 8baefdad92b..d4034d62c4a 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index cf6d4730e19..63e58be27dc 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index d1ea7163910..12f2439e6f5 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/ref/m1.ts","file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index d1d1f0269e8..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index c55d9770436..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index d1d1f0269e8..f373c246d48 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index c55d9770436..9557c3a613c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index 62e49557aab..d9f0f5b1531 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 33f8f550fbd..92315bfcacc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5df712534f6..cc3f604524f 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index a60954292ba..c98b66faded 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 587eac86010..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index 746d401dc82..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
index e1237d92b8e..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index cfa86d8b53f..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index e3725479646..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
index 4737d2e579b..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 746d401dc82..196a531920b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index e1237d92b8e..b4a0aa2d25d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 587eac86010..f6057bf162a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index e3725479646..f5901795832 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 4737d2e579b..e8734ca6d27 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index cfa86d8b53f..9324632b44a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/outputdir_module_multifolder_ref/m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 058227b1276..1ea95ed9ba0 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# 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
index 9ca8e953224..5d14898713d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
index 44d9d5ddc28..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
index b4651a0d0dd..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
index 5c9cea260f4..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
index 693783c4c10..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index 44d9d5ddc28..fc2d3408b2b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b4651a0d0dd..1e0dea14dc8 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 5c9cea260f4..8a7e9f1069e 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 693783c4c10..d7e6d673340 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 16cec87f1e7..d19b9195685 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index 714b2137400..f5849debd83 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index 1556b5c5d2f..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
index ad7acefc91b..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 73def0e2583..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
index bb09d33c72b..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index 1556b5c5d2f..5aa59f6dc92 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index ad7acefc91b..d56cdf72bf2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 73def0e2583..b4abab78e9a 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/ref/m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index bb09d33c72b..6bc25238dac 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=http://www.typescriptlang.org/test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index cf6d4730e19..63e58be27dc 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index a2fff6d9c90..6f4defc3e4c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
index b5c401da717..65e3b33be1a 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/amd/importHigher/root.js
@@ -1,7 +1,7 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     m1.f1("test");
     m1.f2.a = 10;
     m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
index fb163c512b8..4fc36cd0222 100644
--- a/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
+++ b/tests/baselines/reference/project/nodeModulesImportHigher/node/importHigher/root.js
@@ -1,6 +1,6 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 m1.f1("test");
 m1.f2.a = 10;
 m1.f2.person.age = "10"; // Error: Should be number (if direct import of m2 made the m3 module visible). 
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
index 432701235d5..493e1b9636e 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/amd/maxDepthExceeded/built/root.js
@@ -1,8 +1,8 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     m1.f1("test");
     m1.f2.a = "10"; // Error: Should be number
     m1.rel = 42; // Error: Should be boolean
     m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
index 12d17b60709..51370836837 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthExceeded/node/maxDepthExceeded/built/root.js
@@ -1,7 +1,7 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 m1.f1("test");
 m1.f2.a = "10"; // Error: Should be number
 m1.rel = 42; // Error: Should be boolean
 m1.f2.person.age = "10"; // OK if stopped at 2 modules: person will be "any".
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
index 81c077dfd9c..948a6d68b83 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/amd/maxDepthIncreased/root.js
@@ -1,8 +1,8 @@
 define(["require", "exports", "m1", "m4"], function (require, exports, m1, m4) {
     "use strict";
+    exports.__esModule = true;
     m1.f1("test");
     m1.f2.a = 10;
     m1.f2.person.age = "10"; // Should error if loaded the .js files correctly
     var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
index 0d06a91c2a6..50feab5d27f 100644
--- a/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
+++ b/tests/baselines/reference/project/nodeModulesMaxDepthIncreased/node/maxDepthIncreased/root.js
@@ -1,8 +1,8 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 var m4 = require("m4");
 m1.f1("test");
 m1.f2.a = 10;
 m1.f2.person.age = "10"; // Should error if loaded the .js files correctly
 var r2 = 3 + m4.foo; // Should be OK if correctly using the @types .d.ts file
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/amd/consume.js b/tests/baselines/reference/project/nonRelative/amd/consume.js
index 11da1c899c1..a6bce0ab2c6 100644
--- a/tests/baselines/reference/project/nonRelative/amd/consume.js
+++ b/tests/baselines/reference/project/nonRelative/amd/consume.js
@@ -1,10 +1,10 @@
 define(["require", "exports", "decl", "lib/foo/a", "lib/bar/a"], function (require, exports, mod, x, y) {
     "use strict";
+    exports.__esModule = true;
     x.hello();
     y.hello();
     var str = mod.call();
     if (str !== "success") {
         fail();
     }
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/decl.js b/tests/baselines/reference/project/nonRelative/amd/decl.js
index 90d387773d3..d22c3ced24e 100644
--- a/tests/baselines/reference/project/nonRelative/amd/decl.js
+++ b/tests/baselines/reference/project/nonRelative/amd/decl.js
@@ -1,8 +1,8 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function call() {
         return "success";
     }
     exports.call = call;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
index 4731ff335a3..b92af88609d 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/bar/a.js
@@ -1,6 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function hello() { }
     exports.hello = hello;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
index 4731ff335a3..b92af88609d 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/a.js
@@ -1,6 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function hello() { }
     exports.hello = hello;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
index 4731ff335a3..b92af88609d 100644
--- a/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
+++ b/tests/baselines/reference/project/nonRelative/amd/lib/foo/b.js
@@ -1,6 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     function hello() { }
     exports.hello = hello;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/nonRelative/node/consume.js b/tests/baselines/reference/project/nonRelative/node/consume.js
index d4f9f6e288d..51d811bb72a 100644
--- a/tests/baselines/reference/project/nonRelative/node/consume.js
+++ b/tests/baselines/reference/project/nonRelative/node/consume.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var mod = require("decl");
 var x = require("lib/foo/a");
 var y = require("lib/bar/a");
@@ -8,4 +9,3 @@ var str = mod.call();
 if (str !== "success") {
     fail();
 }
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/decl.js b/tests/baselines/reference/project/nonRelative/node/decl.js
index 9bb5f2ac6ed..7cde1400c60 100644
--- a/tests/baselines/reference/project/nonRelative/node/decl.js
+++ b/tests/baselines/reference/project/nonRelative/node/decl.js
@@ -1,6 +1,6 @@
 "use strict";
+exports.__esModule = true;
 function call() {
     return "success";
 }
 exports.call = call;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
index 819723f9833..c83848543b2 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/bar/a.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 function hello() { }
 exports.hello = hello;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
index 819723f9833..c83848543b2 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/a.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 function hello() { }
 exports.hello = hello;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
index 819723f9833..c83848543b2 100644
--- a/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
+++ b/tests/baselines/reference/project/nonRelative/node/lib/foo/b.js
@@ -1,4 +1,4 @@
 "use strict";
+exports.__esModule = true;
 function hello() { }
 exports.hello = hello;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
index e7791f9f3f5..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
index 90648dbecec..7a90183baf3 100644
--- a/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,4 +12,3 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index e7791f9f3f5..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 90648dbecec..7a90183baf3 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,4 +12,3 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index bc27e650743..ef652b9e929 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index bc27e650743..ef652b9e929 100644
--- a/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/outMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
index e7791f9f3f5..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/diskFile0.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
index 87b3e0b6856..fb9329a59b4 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,5 +15,4 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
index 90648dbecec..7a90183baf3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/diskFile0.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,4 +12,3 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
index 313682ec06c..18fccdca8bb 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,4 +16,3 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index 87b3e0b6856..fb9329a59b4 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,5 +15,4 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index e7791f9f3f5..257b2bbaa8f 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 313682ec06c..18fccdca8bb 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,4 +16,3 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 90648dbecec..7a90183baf3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,4 +12,3 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 5c65bc4968b..adb1b5061b5 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,5 +47,4 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
index 39ac64cda82..c062c0ac6d4 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,5 +14,4 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
index e12a028abc0..2e50e0b7989 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,4 +14,3 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index 39ac64cda82..c062c0ac6d4 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,5 +14,4 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index e12a028abc0..2e50e0b7989 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,4 +14,3 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 4c036fa59a1..0a1f6b523c9 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,5 +30,4 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
index 865896d2602..0fdf8d91b32 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,5 +14,4 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
index 8d4d683ff7c..33f201ce9d5 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,4 +14,3 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index a56e5f0ea0b..b5ccdc63b22 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,5 +13,4 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 865896d2602..0fdf8d91b32 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,5 +14,4 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index a355a990939..52ebad55703 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,4 +12,3 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 8d4d683ff7c..33f201ce9d5 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,4 +14,3 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 7c40db25bb7..2ddfb9277a3 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,5 +30,4 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index e9a80c428b2..67693560dfc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 9f1206b5b14..d188f8a16bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index e9a80c428b2..67693560dfc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 9f1206b5b14..d188f8a16bd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b89b17f8f86..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 57114f145bd..3520f3c0a5f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5273d0854a9..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 132d98cd87f..ed2de159383 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"/tests/cases/projects/outputdir_mixed_subfolder/src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index ab7082a2e8e..bed0bf9b3e2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 6bebdd113b6..616307fc2aa 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
index 21c996978fd..ac1540d3d7c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index 06c30f32eaf..4281eb94fe5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index b757263c866..20f34963221 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
index b123ccf13c8..e794023608c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 6bebdd113b6..616307fc2aa 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 21c996978fd..ac1540d3d7c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index ab7082a2e8e..bed0bf9b3e2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index b757263c866..20f34963221 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index b123ccf13c8..e794023608c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 06c30f32eaf..4281eb94fe5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9a2242a8aaa..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# 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
index bd89a9514f2..5970dfad43e 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
index ffc39be8044..101e0b07546 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
index 6366b8c2d85..5194b89b4a5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
index 04bd4e10a3b..6316b37945c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
index 9dc457a0167..ec26fbe336a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index ffc39be8044..101e0b07546 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 6366b8c2d85..5194b89b4a5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 04bd4e10a3b..6316b37945c 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 9dc457a0167..ec26fbe336a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 7545a7d7481..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index 8718a3a9350..64a56e71714 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index cd798e72d89..a8d5da3a201 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
index 6738a871942..1628374eef4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index 81d64320d78..f43884731e0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
index b2ea9133dfc..649377c06fc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index cd798e72d89..a8d5da3a201 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 6738a871942..1628374eef4 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 81d64320d78..f43884731e0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index b2ea9133dfc..649377c06fc 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 5f9a96e405e..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index af3b647fcab..bbf9b58c64f 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
index 560075530f1..d65693aee66 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
index 27abb47a45b..5d1100e38fa 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index 560075530f1..d65693aee66 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 27abb47a45b..5d1100e38fa 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b89b17f8f86..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 5378b914fc7..544b444f69a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5273d0854a9..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index cd6b23ddc0f..39cc19f0b09 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"../src/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 6b4ece94c15..7571615de41 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 8271bf25be1..ad01eacc00c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
index 8be239f3553..343b30f743a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
index c7ae549832a..a7121ab0fb4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
index 37adc61e54f..ddd49759374 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
index 79b428ca3a1..34026638960 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 8271bf25be1..ad01eacc00c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 8be239f3553..343b30f743a 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 6b4ece94c15..7571615de41 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 37adc61e54f..ddd49759374 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index 79b428ca3a1..34026638960 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index c7ae549832a..a7121ab0fb4 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9a2242a8aaa..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# 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
index 66fd3cfe867..12697408ddd 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
index 29c8533aded..f9a2fd1d740 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
index 8086d9c04da..70db4f7545c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
index 0d24a0e332a..0e6c49a9aec 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 29c8533aded..f9a2fd1d740 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 8086d9c04da..70db4f7545c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 0d24a0e332a..0e6c49a9aec 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 7545a7d7481..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index a5dcbdc600a..1132db08bd0 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 91793ab1002..07643a2c9dc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
index 00e388b171e..a9e9284e21d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
index 07178ab519f..9b21b166c37 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 91793ab1002..07643a2c9dc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index d713f6b7f5e..17545cd729c 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index 00e388b171e..a9e9284e21d 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"../src/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 07178ab519f..9b21b166c37 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 5f9a96e405e..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index d9e63184a83..5121f5c6a1e 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
index c4bc3c32708..a7a1fecb87f 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
index 208dd329040..ba1b40abf87 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index c0b56df8d90..35edbb3cd9c 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 5e34d4494dd..3c66628ccf7 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b89b17f8f86..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index e9248099943..df6d2c811c0 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5273d0854a9..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index 9d5330f5c81..0c75dbb2b00 100644
--- a/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcemapMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
index c4bc3c32708..a7a1fecb87f 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
index dcdf5faf897..fb3dc7e5f1a 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
index 096386e968d..99618a3d6a7 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
index 208dd329040..ba1b40abf87 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
index 87fa414a454..5660dd85010 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
index a9dba1be1dd..308a0083438 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 2293c1a7c96..8ba69854427 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index d21a585cc41..1179d812037 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 5d8cf325d52..14fbdd65f4f 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 49bb95f32d5..a42c40521a1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index a48d929a860..86d72e20c93 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index b9e5ddb335f..18103b0a8b1 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9a2242a8aaa..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# 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
index d65b73465ef..783691c52ed 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
index dcdf5faf897..fb3dc7e5f1a 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
index 9a899efce64..80722609800 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
index 87fa414a454..5660dd85010 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
index 57b2f0a9935..90f1d966b1c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 128c9957bf4..2eb15ca540b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 50263c64897..742f4f4a9af 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index 40d0111893e..c819ff2c52c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index cc2b2e9b918..b94230beb69 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 7545a7d7481..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index a30b607676c..293a1478989 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
index dcdf5faf897..fb3dc7e5f1a 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
index 9a899efce64..80722609800 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
index 87fa414a454..5660dd85010 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
index 6f71fb82f4c..6f61cbbee19 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 28136d8ffc3..8f88c077a44 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 50263c64897..742f4f4a9af 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index f5f5dfcd793..6c7d26906a4 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 9c9d3ffec92..ab37fc26b40 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 5f9a96e405e..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index 173790ea042..61dfeeeb8d3 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/amd/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderNoOutdir/node/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
index a1c9985be48..85be78ed9b4 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
index 9ccd44f3a01..e7ecba5fc92 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
index b89b17f8f86..f070fff6f1c 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
index 33f8f550fbd..92315bfcacc 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
index 5273d0854a9..3e02cc09fcb 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js
@@ -10,6 +10,7 @@ function m1_f1() {
 }
 define("ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -22,7 +23,6 @@ define("ref/m2", ["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 /// <reference path='ref/m1.ts'/>
 /// <reference path='ref/m2.ts'/>
diff --git a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
index a60954292ba..c98b66faded 100644
--- a/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map
@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","ref/m2.ts","test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/diskFile1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile0.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/diskFile1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 9afdf343f77..8087b94c0c3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
index a2caf4c4d27..90f7f12fcb1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -14,6 +15,5 @@ define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 5000f3a49b9..a8f0695ded3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAEW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1f9e7b86170..08855ec797b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 59ebd34cfe3..e8fba0d4b55 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
index 0f5e28ddbf7..56a4f46ae00 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
index 15438b46b38..43d151f3fd9 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 var m2 = require("../outputdir_module_multifolder_ref/m2");
 exports.a1 = 10;
@@ -15,5 +16,4 @@ function f1() {
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
 exports.a3 = m2.m2_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
index a39cd29ba77..6ad9ecad595 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AAC9B,2DAA8D;AACnD,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
index 1ce56f5da03..8ad833cd4eb 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m2_a1 = 10;
 var m2_c1 = (function () {
     function m2_c1() {
@@ -11,5 +12,4 @@ function m2_f1() {
     return exports.m2_instance1;
 }
 exports.m2_f1 = m2_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m2.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
index 866e1007e24..50a28887d0b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map
@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m2.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
index 9a2242a8aaa..b77e0a462a7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("outputdir_module_multifolder/ref/m1", ["require", "exports"], function (
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m2_a1 = 10;
     var m2_c1 = (function () {
         function m2_c1() {
@@ -28,10 +29,10 @@ define("outputdir_module_multifolder_ref/m2", ["require", "exports"], function (
         return exports.m2_instance1;
     }
     exports.m2_f1 = m2_f1;
-    exports.__esModule = true;
 });
 define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_module_multifolder/ref/m1", "outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -46,6 +47,5 @@ define("outputdir_module_multifolder/test", ["require", "exports", "outputdir_mo
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
     exports.a3 = m2.m2_c1;
-    exports.__esModule = true;
 });
 //# 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
index 9ca8e953224..5d14898713d 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/ref/m1.ts","outputdir_module_multifolder_ref/m2.ts","outputdir_module_multifolder/test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICRU,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICNU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
index 1706ba76817..caee4b20553 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
index b1cc860a987..e5ed53fd0e1 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
index d134ab774af..fa989919301 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
index 456acd3a256..56c8debf9b6 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
index d07c1aa0678..1ec67278ba3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,uBAA0B;AACf,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
index 7545a7d7481..cbe79e3318b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index 714b2137400..f5849debd83 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
index f42866a6613..391c6ef6630 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,6 +13,5 @@ define(["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
index 7e2762b41a4..15b12e3a189 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
index 601d3a94662..c95451ac730 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js
@@ -1,5 +1,6 @@
 define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -13,6 +14,5 @@ define(["require", "exports", "ref/m1"], function (require, exports, m1) {
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 07e9825a93a..43c2c887c65 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;;IACW,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
index 3eb09997f4f..02586d67fcc 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 exports.m1_a1 = 10;
 var m1_c1 = (function () {
     function m1_c1() {
@@ -11,5 +12,4 @@ function m1_f1() {
     return exports.m1_instance1;
 }
 exports.m1_f1 = m1_f1;
-exports.__esModule = true;
 //# sourceMappingURL=m1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
index eb883275568..6e97669732b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map
@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
+{"version":3,"file":"m1.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts"],"names":[],"mappings":";;AAAW,QAAA,KAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,sBAAK;AAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFD,sBAEC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
index 074abf07716..97ca26f3198 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var m1 = require("ref/m1");
 exports.a1 = 10;
 var c1 = (function () {
@@ -13,5 +14,4 @@ function f1() {
 }
 exports.f1 = f1;
 exports.a2 = m1.m1_c1;
-exports.__esModule = true;
 //# sourceMappingURL=test.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
index 4f024886c03..badcd2b1b9c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":[],"mappings":";;AAAA,2BAA8B;AACnB,QAAA,EAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,gBAAE;AAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFD,gBAEC;AAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
index 5f9a96e405e..22a9cf7b4d7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js
@@ -1,5 +1,6 @@
 define("ref/m1", ["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     exports.m1_a1 = 10;
     var m1_c1 = (function () {
         function m1_c1() {
@@ -12,10 +13,10 @@ define("ref/m1", ["require", "exports"], function (require, exports) {
         return exports.m1_instance1;
     }
     exports.m1_f1 = m1_f1;
-    exports.__esModule = true;
 });
 define("test", ["require", "exports", "ref/m1"], function (require, exports, m1) {
     "use strict";
+    exports.__esModule = true;
     exports.a1 = 10;
     var c1 = (function () {
         function c1() {
@@ -29,6 +30,5 @@ define("test", ["require", "exports", "ref/m1"], function (require, exports, m1)
     }
     exports.f1 = f1;
     exports.a2 = m1.m1_c1;
-    exports.__esModule = true;
 });
 //# 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
index a2fff6d9c90..6f4defc3e4c 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/bin/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["ref/m1.ts","test.ts"],"names":[],"mappings":";;;IAAW,QAAA,KAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,sBAAK;IAIP,QAAA,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFD,sBAEC;;;;;ICPU,QAAA,EAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,gBAAE;IAIJ,QAAA,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFD,gBAEC;IAEU,QAAA,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
index d80da6d9e1b..66facecde7f 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/amd/fs.js
@@ -1,5 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var RM = (function () {
         function RM() {
         }
@@ -15,5 +16,4 @@ define(["require", "exports"], function (require, exports) {
         return RM;
     }());
     exports.RM = RM;
-    exports.__esModule = true;
 });
diff --git a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
index a07a323df50..221c2322227 100644
--- a/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
+++ b/tests/baselines/reference/project/visibilityOfTypeUsedAcrossModules/node/fs.js
@@ -1,4 +1,5 @@
 "use strict";
+exports.__esModule = true;
 var RM = (function () {
     function RM() {
     }
@@ -14,4 +15,3 @@ var RM = (function () {
     return RM;
 }());
 exports.RM = RM;
-exports.__esModule = true;
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js
index a4356e562e7..cd4ce3c862e 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js	
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+Object.defineProperty(exports, "__esModule", { value: true });
 var ng = require("angular2/core");
 var MyClass1 = (function () {
     function MyClass1(_elementRef) {
@@ -20,5 +21,4 @@ MyClass1 = __decorate([
     __metadata("design:paramtypes", [typeof (_a = (typeof ng !== "undefined" && ng).ElementRef) === "function" && _a || Object])
 ], MyClass1);
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js
index 7e30c98d6e8..4571caffa31 100644
--- a/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js	
+++ b/tests/baselines/reference/transpile/Does not generate semantic diagnostics.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = 0;
 exports.__esModule = true;
+var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js
index f350f205d5a..4d133b7655c 100644
--- a/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js	
+++ b/tests/baselines/reference/transpile/Generates expected syntactic diagnostics.js	
@@ -1,5 +1,5 @@
 "use strict";
+exports.__esModule = true;
 a;
 b;
-exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates module output.js b/tests/baselines/reference/transpile/Generates module output.js
index 12a13d2aebf..2c7bb7add09 100644
--- a/tests/baselines/reference/transpile/Generates module output.js	
+++ b/tests/baselines/reference/transpile/Generates module output.js	
@@ -1,6 +1,6 @@
 define(["require", "exports"], function (require, exports) {
     "use strict";
-    var x = 0;
     exports.__esModule = true;
+    var x = 0;
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js
index 0b3dcfad991..04ba1d12e5e 100644
--- a/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js	
+++ b/tests/baselines/reference/transpile/Generates no diagnostics for missing file references.js	
@@ -1,5 +1,5 @@
 "use strict";
+exports.__esModule = true;
 /// <reference path="file2.ts" />
 var x = 0;
-exports.__esModule = true;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js
index 7e30c98d6e8..4571caffa31 100644
--- a/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js	
+++ b/tests/baselines/reference/transpile/Generates no diagnostics with valid inputs.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = 0;
 exports.__esModule = true;
+var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/No extra errors for file without extension.js b/tests/baselines/reference/transpile/No extra errors for file without extension.js
index 7e30c98d6e8..4571caffa31 100644
--- a/tests/baselines/reference/transpile/No extra errors for file without extension.js	
+++ b/tests/baselines/reference/transpile/No extra errors for file without extension.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = 0;
 exports.__esModule = true;
+var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - AMD.js b/tests/baselines/reference/transpile/Rename dependencies - AMD.js
index 4f5beb97d2c..c5ffb86a1aa 100644
--- a/tests/baselines/reference/transpile/Rename dependencies - AMD.js	
+++ b/tests/baselines/reference/transpile/Rename dependencies - AMD.js	
@@ -1,6 +1,6 @@
 define(["require", "exports", "SomeOtherName"], function (require, exports, SomeName_1) {
     "use strict";
-    use(SomeName_1.foo);
     exports.__esModule = true;
+    use(SomeName_1.foo);
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Rename dependencies - UMD.js b/tests/baselines/reference/transpile/Rename dependencies - UMD.js
index 97215e27b98..0ecfbce2397 100644
--- a/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
+++ b/tests/baselines/reference/transpile/Rename dependencies - UMD.js	
@@ -8,8 +8,8 @@
     }
 })(function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var SomeName_1 = require("SomeOtherName");
     use(SomeName_1.foo);
-    exports.__esModule = true;
 });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Support options with lib values.js b/tests/baselines/reference/transpile/Support options with lib values.js
index 1ac09c54ab8..72e077de381 100644
--- a/tests/baselines/reference/transpile/Support options with lib values.js	
+++ b/tests/baselines/reference/transpile/Support options with lib values.js	
@@ -1,4 +1,4 @@
 "use strict";
-var a = 10;
 exports.__esModule = true;
+var a = 10;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Support options with types values.js b/tests/baselines/reference/transpile/Support options with types values.js
index 1ac09c54ab8..72e077de381 100644
--- a/tests/baselines/reference/transpile/Support options with types values.js	
+++ b/tests/baselines/reference/transpile/Support options with types values.js	
@@ -1,4 +1,4 @@
 "use strict";
-var a = 10;
 exports.__esModule = true;
+var a = 10;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports backslashes in file name.js b/tests/baselines/reference/transpile/Supports backslashes in file name.js
index e109ef9014f..8ef38d2b617 100644
--- a/tests/baselines/reference/transpile/Supports backslashes in file name.js	
+++ b/tests/baselines/reference/transpile/Supports backslashes in file name.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x;
 exports.__esModule = true;
+var x;
 //# sourceMappingURL=b.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowJs.js b/tests/baselines/reference/transpile/Supports setting allowJs.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowJs.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowJs.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowSyntheticDefaultImports.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowUnreachableCode.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js	
+++ b/tests/baselines/reference/transpile/Supports setting allowUnusedLabels.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting alwaysStrict.js	
+++ b/tests/baselines/reference/transpile/Supports setting alwaysStrict.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting baseUrl.js b/tests/baselines/reference/transpile/Supports setting baseUrl.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting baseUrl.js	
+++ b/tests/baselines/reference/transpile/Supports setting baseUrl.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting charset.js b/tests/baselines/reference/transpile/Supports setting charset.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting charset.js	
+++ b/tests/baselines/reference/transpile/Supports setting charset.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting declaration.js b/tests/baselines/reference/transpile/Supports setting declaration.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting declaration.js	
+++ b/tests/baselines/reference/transpile/Supports setting declaration.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting declarationDir.js b/tests/baselines/reference/transpile/Supports setting declarationDir.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting declarationDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting declarationDir.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting emitBOM.js b/tests/baselines/reference/transpile/Supports setting emitBOM.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting emitBOM.js	
+++ b/tests/baselines/reference/transpile/Supports setting emitBOM.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js	
+++ b/tests/baselines/reference/transpile/Supports setting emitDecoratorMetadata.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js	
+++ b/tests/baselines/reference/transpile/Supports setting experimentalDecorators.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js	
+++ b/tests/baselines/reference/transpile/Supports setting forceConsistentCasingInFileNames.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting isolatedModules.js b/tests/baselines/reference/transpile/Supports setting isolatedModules.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting isolatedModules.js	
+++ b/tests/baselines/reference/transpile/Supports setting isolatedModules.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting jsx.js b/tests/baselines/reference/transpile/Supports setting jsx.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting jsx.js	
+++ b/tests/baselines/reference/transpile/Supports setting jsx.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting jsxFactory.js b/tests/baselines/reference/transpile/Supports setting jsxFactory.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting jsxFactory.js	
+++ b/tests/baselines/reference/transpile/Supports setting jsxFactory.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting lib.js b/tests/baselines/reference/transpile/Supports setting lib.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting lib.js	
+++ b/tests/baselines/reference/transpile/Supports setting lib.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting locale.js b/tests/baselines/reference/transpile/Supports setting locale.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting locale.js	
+++ b/tests/baselines/reference/transpile/Supports setting locale.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting module.js b/tests/baselines/reference/transpile/Supports setting module.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting module.js	
+++ b/tests/baselines/reference/transpile/Supports setting module.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting moduleResolution.js b/tests/baselines/reference/transpile/Supports setting moduleResolution.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting moduleResolution.js	
+++ b/tests/baselines/reference/transpile/Supports setting moduleResolution.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting newLine.js b/tests/baselines/reference/transpile/Supports setting newLine.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting newLine.js	
+++ b/tests/baselines/reference/transpile/Supports setting newLine.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmit.js b/tests/baselines/reference/transpile/Supports setting noEmit.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmit.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmit.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmitHelpers.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noEmitOnError.js	
+++ b/tests/baselines/reference/transpile/Supports setting noEmitOnError.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js	
+++ b/tests/baselines/reference/transpile/Supports setting noErrorTruncation.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js	
+++ b/tests/baselines/reference/transpile/Supports setting noFallthroughCasesInSwitch.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitAny.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitAny.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitReturns.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitThis.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitThis.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js
index 5233b2a8e48..8124d51fde3 100644
--- a/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js	
+++ b/tests/baselines/reference/transpile/Supports setting noImplicitUseStrict.js	
@@ -1,3 +1,3 @@
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noLib.js b/tests/baselines/reference/transpile/Supports setting noLib.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noLib.js	
+++ b/tests/baselines/reference/transpile/Supports setting noLib.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting noResolve.js b/tests/baselines/reference/transpile/Supports setting noResolve.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting noResolve.js	
+++ b/tests/baselines/reference/transpile/Supports setting noResolve.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting out.js b/tests/baselines/reference/transpile/Supports setting out.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting out.js	
+++ b/tests/baselines/reference/transpile/Supports setting out.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting outDir.js b/tests/baselines/reference/transpile/Supports setting outDir.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting outDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting outDir.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting outFile.js b/tests/baselines/reference/transpile/Supports setting outFile.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting outFile.js	
+++ b/tests/baselines/reference/transpile/Supports setting outFile.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting paths.js b/tests/baselines/reference/transpile/Supports setting paths.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting paths.js	
+++ b/tests/baselines/reference/transpile/Supports setting paths.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js	
+++ b/tests/baselines/reference/transpile/Supports setting preserveConstEnums.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting reactNamespace.js b/tests/baselines/reference/transpile/Supports setting reactNamespace.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting reactNamespace.js	
+++ b/tests/baselines/reference/transpile/Supports setting reactNamespace.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting removeComments.js b/tests/baselines/reference/transpile/Supports setting removeComments.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting removeComments.js	
+++ b/tests/baselines/reference/transpile/Supports setting removeComments.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting rootDir.js b/tests/baselines/reference/transpile/Supports setting rootDir.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting rootDir.js	
+++ b/tests/baselines/reference/transpile/Supports setting rootDir.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting rootDirs.js b/tests/baselines/reference/transpile/Supports setting rootDirs.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting rootDirs.js	
+++ b/tests/baselines/reference/transpile/Supports setting rootDirs.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js	
+++ b/tests/baselines/reference/transpile/Supports setting skipDefaultLibCheck.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting skipLibCheck.js	
+++ b/tests/baselines/reference/transpile/Supports setting skipLibCheck.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting strictNullChecks.js	
+++ b/tests/baselines/reference/transpile/Supports setting strictNullChecks.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting stripInternal.js b/tests/baselines/reference/transpile/Supports setting stripInternal.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting stripInternal.js	
+++ b/tests/baselines/reference/transpile/Supports setting stripInternal.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js	
+++ b/tests/baselines/reference/transpile/Supports setting suppressExcessPropertyErrors.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js	
+++ b/tests/baselines/reference/transpile/Supports setting suppressImplicitAnyIndexErrors.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting typeRoots.js b/tests/baselines/reference/transpile/Supports setting typeRoots.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting typeRoots.js	
+++ b/tests/baselines/reference/transpile/Supports setting typeRoots.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports setting types.js b/tests/baselines/reference/transpile/Supports setting types.js
index 5487d181a84..f960e73bcb8 100644
--- a/tests/baselines/reference/transpile/Supports setting types.js	
+++ b/tests/baselines/reference/transpile/Supports setting types.js	
@@ -1,4 +1,4 @@
 "use strict";
-x;
 exports.__esModule = true;
+x;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Supports urls in file name.js b/tests/baselines/reference/transpile/Supports urls in file name.js
index 071466dd65f..933981306d2 100644
--- a/tests/baselines/reference/transpile/Supports urls in file name.js	
+++ b/tests/baselines/reference/transpile/Supports urls in file name.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x;
 exports.__esModule = true;
+var x;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
index 54ceb0250e1..0b3bbaa8d73 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js	
@@ -1,4 +1,5 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 var db_1 = require("./db");
 function someDecorator(target) {
     return target;
@@ -16,5 +17,4 @@ MyClass = __decorate([
 ], MyClass);
 exports.MyClass = MyClass;
 var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Uses correct newLine character.js b/tests/baselines/reference/transpile/Uses correct newLine character.js
index 2c2e8563d24..04042012d18 100644
--- a/tests/baselines/reference/transpile/Uses correct newLine character.js	
+++ b/tests/baselines/reference/transpile/Uses correct newLine character.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = 0;
 exports.__esModule = true;
+var x = 0;
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/transpile .js files.js b/tests/baselines/reference/transpile/transpile .js files.js
index 54832b95928..b9048bd515d 100644
--- a/tests/baselines/reference/transpile/transpile .js files.js	
+++ b/tests/baselines/reference/transpile/transpile .js files.js	
@@ -1,4 +1,4 @@
 "use strict";
-var a = 10;
 exports.__esModule = true;
+var a = 10;
 //# sourceMappingURL=input.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js
index ff03528b3e5..2a73615e476 100644
--- a/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js	
+++ b/tests/baselines/reference/transpile/transpile file as tsx if jsx is specified.js	
@@ -1,4 +1,4 @@
 "use strict";
-var x = React.createElement("div", null);
 exports.__esModule = true;
+var x = React.createElement("div", null);
 //# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/withExportDecl.js b/tests/baselines/reference/withExportDecl.js
index 49cac46d212..97d528ecd62 100644
--- a/tests/baselines/reference/withExportDecl.js
+++ b/tests/baselines/reference/withExportDecl.js
@@ -61,6 +61,7 @@ export var eVar3 = 10, eVar4, eVar5;
 //// [withExportDecl.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var simpleVar;
     var anotherVar;
     var varWithSimpleType;
@@ -99,7 +100,6 @@ define(["require", "exports"], function (require, exports) {
     exports.eVar2 = 10;
     var eVar22;
     exports.eVar3 = 10;
-    exports.__esModule = true;
 });
 
 
diff --git a/tests/baselines/reference/withImportDecl.js b/tests/baselines/reference/withImportDecl.js
index feb48648252..f0a1a2d2f14 100644
--- a/tests/baselines/reference/withImportDecl.js
+++ b/tests/baselines/reference/withImportDecl.js
@@ -46,17 +46,18 @@ b.foo;
 //// [withImportDecl_0.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    exports.__esModule = true;
     var A = (function () {
         function A() {
         }
         return A;
     }());
     exports.A = A;
-    exports.__esModule = true;
 });
 //// [withImportDecl_1.js]
 define(["require", "exports", "withImportDecl_0"], function (require, exports, m3) {
     "use strict";
+    exports.__esModule = true;
     ///<reference path='withImportDecl_0.ts'/>
     var simpleVar;
     var anotherVar;
@@ -81,7 +82,6 @@ define(["require", "exports", "withImportDecl_0"], function (require, exports, m
     })(m1 || (m1 = {}));
     var b = new m3.A();
     b.foo;
-    exports.__esModule = true;
 });