diff --git a/modules/@angular/common/src/directives/ng_for.ts b/modules/@angular/common/src/directives/ng_for.ts
index baf82e3e64..0f4768c879 100644
--- a/modules/@angular/common/src/directives/ng_for.ts
+++ b/modules/@angular/common/src/directives/ng_for.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectorRef, CollectionChangeRecord, DefaultIterableDiffer, Directive, DoCheck, EmbeddedViewRef, Input, IterableDiffer, IterableDiffers, OnChanges, SimpleChanges, TemplateRef, TrackByFn, ViewContainerRef} from '@angular/core';
+import {BaseException, ChangeDetectorRef, CollectionChangeRecord, DefaultIterableDiffer, Directive, DoCheck, EmbeddedViewRef, Input, IterableDiffer, IterableDiffers, OnChanges, SimpleChanges, TemplateRef, TrackByFn, ViewContainerRef} from '@angular/core';
 
-import {BaseException} from '../facade/exceptions';
 import {getTypeNameForDebugging, isBlank, isPresent} from '../facade/lang';
 
 export class NgForRow {
diff --git a/modules/@angular/common/src/forms-deprecated/directives/abstract_control_directive.ts b/modules/@angular/common/src/forms-deprecated/directives/abstract_control_directive.ts
index 546ef4a171..90a5a292ba 100644
--- a/modules/@angular/common/src/forms-deprecated/directives/abstract_control_directive.ts
+++ b/modules/@angular/common/src/forms-deprecated/directives/abstract_control_directive.ts
@@ -6,10 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {unimplemented} from '../../facade/exceptions';
+import {BaseException} from '@angular/core';
 import {isPresent} from '../../facade/lang';
 import {AbstractControl} from '../model';
 
+function unimplemented(): any {
+  throw new BaseException('unimplemented');
+}
 
 /**
  * Base class for control directives.
diff --git a/modules/@angular/common/src/forms-deprecated/directives/ng_control.ts b/modules/@angular/common/src/forms-deprecated/directives/ng_control.ts
index 237108c341..3f97ea1acc 100644
--- a/modules/@angular/common/src/forms-deprecated/directives/ng_control.ts
+++ b/modules/@angular/common/src/forms-deprecated/directives/ng_control.ts
@@ -6,12 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {unimplemented} from '../../facade/exceptions';
-
+import {BaseException} from '@angular/core';
 import {AbstractControlDirective} from './abstract_control_directive';
 import {ControlValueAccessor} from './control_value_accessor';
 import {AsyncValidatorFn, ValidatorFn} from './validators';
 
+function unimplemented(): any {
+  throw new BaseException('unimplemented');
+}
 
 /**
  * A base class that all control directive extend.
diff --git a/modules/@angular/common/src/forms-deprecated/directives/ng_form_model.ts b/modules/@angular/common/src/forms-deprecated/directives/ng_form_model.ts
index c5e4a15316..f16e895f4f 100644
--- a/modules/@angular/common/src/forms-deprecated/directives/ng_form_model.ts
+++ b/modules/@angular/common/src/forms-deprecated/directives/ng_form_model.ts
@@ -6,11 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Inject, OnChanges, Optional, Self, SimpleChanges, forwardRef} from '@angular/core';
+import {BaseException, Directive, Inject, OnChanges, Optional, Self, SimpleChanges, forwardRef} from '@angular/core';
 
 import {EventEmitter} from '../../facade/async';
 import {ListWrapper, StringMapWrapper} from '../../facade/collection';
-import {BaseException} from '../../facade/exceptions';
 import {isBlank} from '../../facade/lang';
 import {Control, ControlGroup} from '../model';
 import {NG_ASYNC_VALIDATORS, NG_VALIDATORS, Validators} from '../validators';
diff --git a/modules/@angular/common/src/forms-deprecated/directives/shared.ts b/modules/@angular/common/src/forms-deprecated/directives/shared.ts
index 499b56453c..98392c11af 100644
--- a/modules/@angular/common/src/forms-deprecated/directives/shared.ts
+++ b/modules/@angular/common/src/forms-deprecated/directives/shared.ts
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {ListWrapper, StringMapWrapper} from '../../facade/collection';
-import {BaseException} from '../../facade/exceptions';
 import {hasConstructor, isBlank, isPresent, looseIdentical} from '../../facade/lang';
 import {Control, ControlGroup} from '../model';
 import {Validators} from '../validators';
diff --git a/modules/@angular/common/src/location/path_location_strategy.ts b/modules/@angular/common/src/location/path_location_strategy.ts
index 2e28253f18..e151967b50 100644
--- a/modules/@angular/common/src/location/path_location_strategy.ts
+++ b/modules/@angular/common/src/location/path_location_strategy.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, Optional} from '@angular/core';
+import {BaseException, Inject, Injectable, Optional} from '@angular/core';
 
-import {BaseException} from '../facade/exceptions';
 import {isBlank} from '../facade/lang';
 
 import {Location} from './location';
diff --git a/modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts b/modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts
index 7278f2cfc3..96998a5342 100644
--- a/modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts
+++ b/modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {BaseException} from '../facade/exceptions';
+import {BaseException} from '@angular/core';
 import {Type, stringify} from '../facade/lang';
 
 export class InvalidPipeArgumentException extends BaseException {
diff --git a/modules/@angular/compiler/src/animation/animation_compiler.ts b/modules/@angular/compiler/src/animation/animation_compiler.ts
index 08025815d1..344fee298c 100644
--- a/modules/@angular/compiler/src/animation/animation_compiler.ts
+++ b/modules/@angular/compiler/src/animation/animation_compiler.ts
@@ -6,12 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AUTO_STYLE} from '@angular/core';
+import {AUTO_STYLE, BaseException} from '@angular/core';
 
 import {ANY_STATE, DEFAULT_STATE, EMPTY_STATE} from '../../core_private';
 import {CompileDirectiveMetadata} from '../compile_metadata';
 import {StringMapWrapper} from '../facade/collection';
-import {BaseException} from '../facade/exceptions';
 import {isBlank, isPresent} from '../facade/lang';
 import {Identifiers} from '../identifiers';
 import * as o from '../output/output_ast';
diff --git a/modules/@angular/compiler/src/config.ts b/modules/@angular/compiler/src/config.ts
index a765f34324..c4a59856c4 100644
--- a/modules/@angular/compiler/src/config.ts
+++ b/modules/@angular/compiler/src/config.ts
@@ -6,13 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ViewEncapsulation, isDevMode} from '@angular/core';
-
-import {unimplemented} from '../src/facade/exceptions';
+import {BaseException, ViewEncapsulation, isDevMode} from '@angular/core';
 
 import {CompileIdentifierMetadata} from './compile_metadata';
 import {Identifiers} from './identifiers';
 
+function unimplemented(): any {
+  throw new BaseException('unimplemented');
+}
+
 export class CompilerConfig {
   public renderTypes: RenderTypes;
   public defaultEncapsulation: ViewEncapsulation;
diff --git a/modules/@angular/compiler/src/css_parser/css_lexer.ts b/modules/@angular/compiler/src/css_parser/css_lexer.ts
index 1ba42bb615..f96c007427 100644
--- a/modules/@angular/compiler/src/css_parser/css_lexer.ts
+++ b/modules/@angular/compiler/src/css_parser/css_lexer.ts
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import * as chars from '../chars';
-import {BaseException} from '../facade/exceptions';
 import {StringWrapper, isPresent, resolveEnumToken} from '../facade/lang';
 
 export enum CssTokenType {
diff --git a/modules/@angular/compiler/src/directive_normalizer.ts b/modules/@angular/compiler/src/directive_normalizer.ts
index e953daa8f2..6fec75d1d8 100644
--- a/modules/@angular/compiler/src/directive_normalizer.ts
+++ b/modules/@angular/compiler/src/directive_normalizer.ts
@@ -6,12 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, ViewEncapsulation} from '@angular/core';
+import {BaseException, Injectable, ViewEncapsulation} from '@angular/core';
 
 import {CompileDirectiveMetadata, CompileStylesheetMetadata, CompileTemplateMetadata, CompileTypeMetadata} from './compile_metadata';
 import {CompilerConfig} from './config';
 import {MapWrapper} from './facade/collection';
-import {BaseException} from './facade/exceptions';
 import {isBlank, isPresent} from './facade/lang';
 import * as html from './ml_parser/ast';
 import {HtmlParser} from './ml_parser/html_parser';
diff --git a/modules/@angular/compiler/src/directive_resolver.ts b/modules/@angular/compiler/src/directive_resolver.ts
index 53f51cd7b0..3adfc8d682 100644
--- a/modules/@angular/compiler/src/directive_resolver.ts
+++ b/modules/@angular/compiler/src/directive_resolver.ts
@@ -6,12 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ComponentMetadata, DirectiveMetadata, HostBindingMetadata, HostListenerMetadata, Injectable, InputMetadata, OutputMetadata, QueryMetadata, resolveForwardRef} from '@angular/core';
+import {BaseException, ComponentMetadata, DirectiveMetadata, HostBindingMetadata, HostListenerMetadata, Injectable, InputMetadata, OutputMetadata, QueryMetadata, resolveForwardRef} from '@angular/core';
 
 import {ReflectorReader, reflector} from '../core_private';
 
 import {StringMapWrapper} from './facade/collection';
-import {BaseException} from './facade/exceptions';
 import {Type, isPresent, stringify} from './facade/lang';
 import {splitAtColon} from './util';
 
diff --git a/modules/@angular/compiler/src/metadata_resolver.ts b/modules/@angular/compiler/src/metadata_resolver.ts
index 22fee162ad..980584e010 100644
--- a/modules/@angular/compiler/src/metadata_resolver.ts
+++ b/modules/@angular/compiler/src/metadata_resolver.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AnimationAnimateMetadata, AnimationEntryMetadata, AnimationGroupMetadata, AnimationKeyframesSequenceMetadata, AnimationMetadata, AnimationStateDeclarationMetadata, AnimationStateMetadata, AnimationStateTransitionMetadata, AnimationStyleMetadata, AnimationWithStepsMetadata, AttributeMetadata, ChangeDetectionStrategy, ComponentMetadata, HostMetadata, Inject, InjectMetadata, Injectable, ModuleWithProviders, NgModule, NgModuleMetadata, Optional, OptionalMetadata, Provider, QueryMetadata, SchemaMetadata, SelfMetadata, SkipSelfMetadata, ViewMetadata, ViewQueryMetadata, resolveForwardRef} from '@angular/core';
+import {AnimationAnimateMetadata, AnimationEntryMetadata, AnimationGroupMetadata, AnimationKeyframesSequenceMetadata, AnimationMetadata, AnimationStateDeclarationMetadata, AnimationStateMetadata, AnimationStateTransitionMetadata, AnimationStyleMetadata, AnimationWithStepsMetadata, AttributeMetadata, BaseException, ChangeDetectionStrategy, ComponentMetadata, HostMetadata, Inject, InjectMetadata, Injectable, ModuleWithProviders, NgModule, NgModuleMetadata, Optional, OptionalMetadata, Provider, QueryMetadata, SchemaMetadata, SelfMetadata, SkipSelfMetadata, ViewMetadata, ViewQueryMetadata, resolveForwardRef} from '@angular/core';
 
 import {Console, LIFECYCLE_HOOKS_VALUES, ReflectorReader, createProvider, isProviderLiteral, reflector} from '../core_private';
 import {StringMapWrapper} from '../src/facade/collection';
@@ -15,7 +15,6 @@ import {assertArrayOfStrings, assertInterpolationSymbols} from './assertions';
 import * as cpl from './compile_metadata';
 import {CompilerConfig} from './config';
 import {DirectiveResolver} from './directive_resolver';
-import {BaseException} from './facade/exceptions';
 import {Type, isArray, isBlank, isPresent, isString, stringify} from './facade/lang';
 import {Identifiers, identifierToken} from './identifiers';
 import {hasLifecycleHook} from './lifecycle_reflector';
diff --git a/modules/@angular/compiler/src/ng_module_resolver.ts b/modules/@angular/compiler/src/ng_module_resolver.ts
index 805bc0c29f..4af39e8fc4 100644
--- a/modules/@angular/compiler/src/ng_module_resolver.ts
+++ b/modules/@angular/compiler/src/ng_module_resolver.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, NgModuleMetadata} from '@angular/core';
+import {BaseException, Injectable, NgModuleMetadata} from '@angular/core';
 
 import {ReflectorReader, reflector} from '../core_private';
-import {BaseException} from '../src/facade/exceptions';
+
 import {Type, isPresent, stringify} from './facade/lang';
 
 function _isNgModuleMetadata(obj: any): obj is NgModuleMetadata {
diff --git a/modules/@angular/compiler/src/offline_compiler.ts b/modules/@angular/compiler/src/offline_compiler.ts
index c9ddbdb5e9..29dc11e3cb 100644
--- a/modules/@angular/compiler/src/offline_compiler.ts
+++ b/modules/@angular/compiler/src/offline_compiler.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {SchemaMetadata} from '@angular/core';
+import {BaseException, SchemaMetadata} from '@angular/core';
+
 import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileNgModuleMetadata, CompilePipeMetadata, StaticSymbol, createHostComponentMeta} from './compile_metadata';
 import {DirectiveNormalizer} from './directive_normalizer';
 import {ListWrapper} from './facade/collection';
-import {BaseException} from './facade/exceptions';
 import {Identifiers} from './identifiers';
 import {CompileMetadataResolver} from './metadata_resolver';
 import {NgModuleCompiler} from './ng_module_compiler';
diff --git a/modules/@angular/compiler/src/output/abstract_emitter.ts b/modules/@angular/compiler/src/output/abstract_emitter.ts
index 47a1b5f4b8..1a064fb582 100644
--- a/modules/@angular/compiler/src/output/abstract_emitter.ts
+++ b/modules/@angular/compiler/src/output/abstract_emitter.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {BaseException} from '../facade/exceptions';
+import {BaseException} from '@angular/core';
 import {StringWrapper, isBlank, isPresent, isString} from '../facade/lang';
 
 import * as o from './output_ast';
diff --git a/modules/@angular/compiler/src/output/abstract_js_emitter.ts b/modules/@angular/compiler/src/output/abstract_js_emitter.ts
index 1ac626b916..1b98f3b603 100644
--- a/modules/@angular/compiler/src/output/abstract_js_emitter.ts
+++ b/modules/@angular/compiler/src/output/abstract_js_emitter.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {BaseException} from '../facade/exceptions';
+import {BaseException} from '@angular/core';
 import {isPresent} from '../facade/lang';
 
 import {AbstractEmitterVisitor, CATCH_ERROR_VAR, CATCH_STACK_VAR, EmitterVisitorContext} from './abstract_emitter';
diff --git a/modules/@angular/compiler/src/output/output_ast.ts b/modules/@angular/compiler/src/output/output_ast.ts
index 0f87bf9765..d366657766 100644
--- a/modules/@angular/compiler/src/output/output_ast.ts
+++ b/modules/@angular/compiler/src/output/output_ast.ts
@@ -6,9 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {CompileIdentifierMetadata} from '../compile_metadata';
 import {StringMapWrapper} from '../facade/collection';
-import {BaseException} from '../facade/exceptions';
 import {isBlank, isPresent, isString} from '../facade/lang';
 import {ValueTransformer, visitValue} from '../util';
 
diff --git a/modules/@angular/compiler/src/output/path_util.ts b/modules/@angular/compiler/src/output/path_util.ts
index 33c6ecf4ef..963a3f64f2 100644
--- a/modules/@angular/compiler/src/output/path_util.ts
+++ b/modules/@angular/compiler/src/output/path_util.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable} from '@angular/core';
+import {BaseException, Injectable} from '@angular/core';
 
-import {BaseException} from '../facade/exceptions';
 import {Math, isBlank, isPresent} from '../facade/lang';
 
 
diff --git a/modules/@angular/compiler/src/output/ts_emitter.ts b/modules/@angular/compiler/src/output/ts_emitter.ts
index 3c6f4469d5..cb84542144 100644
--- a/modules/@angular/compiler/src/output/ts_emitter.ts
+++ b/modules/@angular/compiler/src/output/ts_emitter.ts
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {CompileIdentifierMetadata} from '../compile_metadata';
-import {BaseException} from '../facade/exceptions';
 import {isArray, isBlank, isPresent} from '../facade/lang';
 
 import {AbstractEmitterVisitor, CATCH_ERROR_VAR, CATCH_STACK_VAR, EmitterVisitorContext, OutputEmitter} from './abstract_emitter';
diff --git a/modules/@angular/compiler/src/output/value_util.ts b/modules/@angular/compiler/src/output/value_util.ts
index b57adbf23f..4accbde355 100644
--- a/modules/@angular/compiler/src/output/value_util.ts
+++ b/modules/@angular/compiler/src/output/value_util.ts
@@ -6,9 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {CompileIdentifierMetadata} from '../compile_metadata';
 import {StringMapWrapper} from '../facade/collection';
-import {BaseException} from '../facade/exceptions';
 import {ValueTransformer, visitValue} from '../util';
 
 import * as o from './output_ast';
diff --git a/modules/@angular/compiler/src/pipe_resolver.ts b/modules/@angular/compiler/src/pipe_resolver.ts
index 92fb8ee453..3d6e2db4e8 100644
--- a/modules/@angular/compiler/src/pipe_resolver.ts
+++ b/modules/@angular/compiler/src/pipe_resolver.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, PipeMetadata, resolveForwardRef} from '@angular/core';
+import {BaseException, Injectable, PipeMetadata, resolveForwardRef} from '@angular/core';
 
 import {ReflectorReader, reflector} from '../core_private';
-import {BaseException} from './facade/exceptions';
+
 import {Type, isPresent, stringify} from './facade/lang';
 
 function _isPipeMetadata(type: any): boolean {
diff --git a/modules/@angular/compiler/src/provider_analyzer.ts b/modules/@angular/compiler/src/provider_analyzer.ts
index c657bba86d..00f792a2f3 100644
--- a/modules/@angular/compiler/src/provider_analyzer.ts
+++ b/modules/@angular/compiler/src/provider_analyzer.ts
@@ -6,9 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {CompileDiDependencyMetadata, CompileDirectiveMetadata, CompileIdentifierMap, CompileNgModuleMetadata, CompileProviderMetadata, CompileQueryMetadata, CompileTokenMetadata, CompileTypeMetadata} from './compile_metadata';
 import {ListWrapper} from './facade/collection';
-import {BaseException} from './facade/exceptions';
 import {isArray, isBlank, isPresent, normalizeBlank} from './facade/lang';
 import {Identifiers, identifierToken} from './identifiers';
 import {ParseError, ParseSourceSpan} from './parse_util';
diff --git a/modules/@angular/compiler/src/runtime_compiler.ts b/modules/@angular/compiler/src/runtime_compiler.ts
index d41b28544d..85ea81d7bf 100644
--- a/modules/@angular/compiler/src/runtime_compiler.ts
+++ b/modules/@angular/compiler/src/runtime_compiler.ts
@@ -6,14 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Compiler, ComponentFactory, ComponentResolver, ComponentStillLoadingError, Injectable, Injector, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgModuleMetadata, OptionalMetadata, Provider, SchemaMetadata, SkipSelfMetadata} from '@angular/core';
+import {BaseException, Compiler, ComponentFactory, ComponentResolver, ComponentStillLoadingError, Injectable, Injector, ModuleWithComponentFactories, NgModule, NgModuleFactory, NgModuleMetadata, OptionalMetadata, Provider, SchemaMetadata, SkipSelfMetadata} from '@angular/core';
 
 import {Console} from '../core_private';
 
 import {CompileDirectiveMetadata, CompileIdentifierMetadata, CompileNgModuleMetadata, CompilePipeMetadata, createHostComponentMeta} from './compile_metadata';
 import {CompilerConfig} from './config';
 import {DirectiveNormalizer} from './directive_normalizer';
-import {BaseException} from './facade/exceptions';
 import {ConcreteType, Type, isBlank, isString, stringify} from './facade/lang';
 import {CompileMetadataResolver} from './metadata_resolver';
 import {NgModuleCompiler} from './ng_module_compiler';
diff --git a/modules/@angular/compiler/src/selector.ts b/modules/@angular/compiler/src/selector.ts
index 31ec5f5f99..8be4dfa1e6 100644
--- a/modules/@angular/compiler/src/selector.ts
+++ b/modules/@angular/compiler/src/selector.ts
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {ListWrapper} from './facade/collection';
-import {BaseException} from './facade/exceptions';
 import {StringWrapper, isBlank, isPresent} from './facade/lang';
 
 const _EMPTY_ATTR_VALUE = '';
diff --git a/modules/@angular/compiler/src/template_parser/template_parser.ts b/modules/@angular/compiler/src/template_parser/template_parser.ts
index 4077dbfdf3..1591182750 100644
--- a/modules/@angular/compiler/src/template_parser/template_parser.ts
+++ b/modules/@angular/compiler/src/template_parser/template_parser.ts
@@ -6,14 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, OpaqueToken, Optional, SchemaMetadata, SecurityContext} from '@angular/core';
+import {BaseException, Inject, Injectable, OpaqueToken, Optional, SchemaMetadata, SecurityContext} from '@angular/core';
 
 import {Console, MAX_INTERPOLATION_VALUES} from '../../core_private';
 import {CompileDirectiveMetadata, CompilePipeMetadata, CompileTokenMetadata, removeIdentifierDuplicates} from '../compile_metadata';
 import {AST, ASTWithSource, BindingPipe, EmptyExpr, Interpolation, ParserError, RecursiveAstVisitor, TemplateBinding} from '../expression_parser/ast';
 import {Parser} from '../expression_parser/parser';
 import {ListWrapper, SetWrapper, StringMapWrapper} from '../facade/collection';
-import {BaseException} from '../facade/exceptions';
 import {isBlank, isPresent} from '../facade/lang';
 import {Identifiers, identifierToken} from '../identifiers';
 import * as html from '../ml_parser/ast';
diff --git a/modules/@angular/compiler/src/view_compiler/compile_pipe.ts b/modules/@angular/compiler/src/view_compiler/compile_pipe.ts
index f6866d0dd9..130f82bf39 100644
--- a/modules/@angular/compiler/src/view_compiler/compile_pipe.ts
+++ b/modules/@angular/compiler/src/view_compiler/compile_pipe.ts
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {CompilePipeMetadata} from '../compile_metadata';
-import {BaseException} from '../facade/exceptions';
 import {isBlank, isPresent} from '../facade/lang';
 import {Identifiers, identifierToken} from '../identifiers';
 import * as o from '../output/output_ast';
diff --git a/modules/@angular/compiler/src/view_compiler/expression_converter.ts b/modules/@angular/compiler/src/view_compiler/expression_converter.ts
index f469547f58..f66dbe3951 100644
--- a/modules/@angular/compiler/src/view_compiler/expression_converter.ts
+++ b/modules/@angular/compiler/src/view_compiler/expression_converter.ts
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import * as cdAst from '../expression_parser/ast';
-import {BaseException} from '../facade/exceptions';
 import {isArray, isBlank, isPresent} from '../facade/lang';
 import {Identifiers} from '../identifiers';
 import * as o from '../output/output_ast';
diff --git a/modules/@angular/compiler/src/view_compiler/util.ts b/modules/@angular/compiler/src/view_compiler/util.ts
index ad256513dc..dedcdd5589 100644
--- a/modules/@angular/compiler/src/view_compiler/util.ts
+++ b/modules/@angular/compiler/src/view_compiler/util.ts
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {CompileDirectiveMetadata, CompileTokenMetadata} from '../compile_metadata';
-import {BaseException} from '../facade/exceptions';
 import {isBlank, isPresent} from '../facade/lang';
 import {Identifiers} from '../identifiers';
 import * as o from '../output/output_ast';
diff --git a/modules/@angular/compiler/test/css_parser/css_parser_spec.ts b/modules/@angular/compiler/test/css_parser/css_parser_spec.ts
index 80b0763ada..c53a99c8f5 100644
--- a/modules/@angular/compiler/test/css_parser/css_parser_spec.ts
+++ b/modules/@angular/compiler/test/css_parser/css_parser_spec.ts
@@ -6,10 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../../core/testing/testing_internal';
 import {CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssSelectorRuleAst, CssStyleSheetAst, CssStyleValueAst} from '../../src/css_parser/css_ast';
 import {BlockType, CssParseError, CssParser, CssToken, ParsedCssResult} from '../../src/css_parser/css_parser';
-import {BaseException} from '../../src/facade/exceptions';
 import {ParseLocation} from '../../src/parse_util';
 
 export function assertTokens(tokens: CssToken[], valuesArr: string[]) {
diff --git a/modules/@angular/compiler/test/css_parser/css_visitor_spec.ts b/modules/@angular/compiler/test/css_parser/css_visitor_spec.ts
index 171d19e080..7e4171f20c 100644
--- a/modules/@angular/compiler/test/css_parser/css_visitor_spec.ts
+++ b/modules/@angular/compiler/test/css_parser/css_visitor_spec.ts
@@ -6,10 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {afterEach, beforeEach, ddescribe, describe, expect, iit, it, xit} from '../../../core/testing/testing_internal';
 import {CssAst, CssAstVisitor, CssAtRulePredicateAst, CssBlockAst, CssBlockDefinitionRuleAst, CssBlockRuleAst, CssDefinitionAst, CssInlineRuleAst, CssKeyframeDefinitionAst, CssKeyframeRuleAst, CssMediaQueryRuleAst, CssPseudoSelectorAst, CssRuleAst, CssSelectorAst, CssSelectorRuleAst, CssSimpleSelectorAst, CssStyleSheetAst, CssStyleValueAst, CssStylesBlockAst, CssUnknownRuleAst, CssUnknownTokenListAst} from '../../src/css_parser/css_ast';
 import {BlockType, CssParseError, CssParser, CssToken} from '../../src/css_parser/css_parser';
-import {BaseException} from '../../src/facade/exceptions';
 import {isPresent} from '../../src/facade/lang';
 
 function _assertTokens(tokens: CssToken[], valuesArr: string[]): void {
diff --git a/modules/@angular/compiler/test/ml_parser/ast_spec_utils.ts b/modules/@angular/compiler/test/ml_parser/ast_spec_utils.ts
index 791410e031..02d341f049 100644
--- a/modules/@angular/compiler/test/ml_parser/ast_spec_utils.ts
+++ b/modules/@angular/compiler/test/ml_parser/ast_spec_utils.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '@angular/core';
 import * as html from '../../src/ml_parser/ast';
 import {ParseTreeResult} from '../../src/ml_parser/html_parser';
 import {ParseLocation} from '../../src/parse_util';
diff --git a/modules/@angular/compiler/test/output/output_emitter_codegen_typed.ts b/modules/@angular/compiler/test/output/output_emitter_codegen_typed.ts
index 7c51908c01..e8fc5f362b 100644
--- a/modules/@angular/compiler/test/output/output_emitter_codegen_typed.ts
+++ b/modules/@angular/compiler/test/output/output_emitter_codegen_typed.ts
@@ -9,11 +9,15 @@
 // ATTENTION: This file will be overwritten with generated code by main()
 import * as o from '@angular/compiler/src/output/output_ast';
 import {TypeScriptEmitter} from '@angular/compiler/src/output/ts_emitter';
+import {BaseException} from '@angular/core';
 
-import {unimplemented} from '../../src/facade/exceptions';
 import {print} from '../../src/facade/lang';
 import {assetUrl} from '../../src/util';
 
+function unimplemented(): any {
+  throw new BaseException('unimplemented');
+}
+
 import {SimpleJsImportGenerator, codegenExportsVars, codegenStmts} from './output_emitter_util';
 
 export function getExpressions(): any {
diff --git a/modules/@angular/compiler/test/output/output_emitter_codegen_untyped.ts b/modules/@angular/compiler/test/output/output_emitter_codegen_untyped.ts
index 12869d3b42..d89bdd0337 100644
--- a/modules/@angular/compiler/test/output/output_emitter_codegen_untyped.ts
+++ b/modules/@angular/compiler/test/output/output_emitter_codegen_untyped.ts
@@ -8,15 +8,15 @@
 
 // ATTENTION: This file will be overwritten with generated code by main()
 import {JavaScriptEmitter} from '@angular/compiler/src/output/js_emitter';
+import {BaseException} from '@angular/core';
 
-import {unimplemented} from '../../src/facade/exceptions';
 import {print} from '../../src/facade/lang';
 import {assetUrl} from '../../src/util';
 
 import {SimpleJsImportGenerator, codegenExportsVars, codegenStmts} from './output_emitter_util';
 
 export function getExpressions(): any {
-  return unimplemented();
+  throw new BaseException('unimplemented');
 }
 
 // Generator
diff --git a/modules/@angular/compiler/test/output/output_emitter_util.ts b/modules/@angular/compiler/test/output/output_emitter_util.ts
index e98f4c2c8d..c4e6a81e00 100644
--- a/modules/@angular/compiler/test/output/output_emitter_util.ts
+++ b/modules/@angular/compiler/test/output/output_emitter_util.ts
@@ -10,11 +10,9 @@ import {CompileIdentifierMetadata} from '@angular/compiler/src/compile_metadata'
 import * as o from '@angular/compiler/src/output/output_ast';
 import {ImportGenerator} from '@angular/compiler/src/output/path_util';
 import {assetUrl} from '@angular/compiler/src/util';
-import {EventEmitter} from '@angular/core';
+import {BaseException, EventEmitter} from '@angular/core';
 import {ViewType} from '@angular/core/src/linker/view_type';
 
-import {BaseException} from '../../src/facade/exceptions';
-
 export class ExternalClass {
   changeable: any;
   constructor(public data: any) { this.changeable = data; }
diff --git a/modules/@angular/compiler/testing/directive_resolver_mock.ts b/modules/@angular/compiler/testing/directive_resolver_mock.ts
index 30af94b97f..b96727e35c 100644
--- a/modules/@angular/compiler/testing/directive_resolver_mock.ts
+++ b/modules/@angular/compiler/testing/directive_resolver_mock.ts
@@ -6,14 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AnimationEntryMetadata, Compiler, ComponentMetadata, DirectiveMetadata, Injectable, Injector, ViewMetadata, resolveForwardRef} from '@angular/core';
+import {AnimationEntryMetadata, BaseException, Compiler, ComponentMetadata, DirectiveMetadata, Injectable, Injector, ViewMetadata, resolveForwardRef} from '@angular/core';
 
 import {DirectiveResolver} from '../src/directive_resolver';
 import {Map} from '../src/facade/collection';
-import {BaseException} from '../src/facade/exceptions';
 import {Type, isArray, isPresent, stringify} from '../src/facade/lang';
 
 
+
 /**
  * An implementation of {@link DirectiveResolver} that allows overriding
  * various properties of directives.
diff --git a/modules/@angular/compiler/testing/metadata_overrider.ts b/modules/@angular/compiler/testing/metadata_overrider.ts
index e0cccf5865..7094205b54 100644
--- a/modules/@angular/compiler/testing/metadata_overrider.ts
+++ b/modules/@angular/compiler/testing/metadata_overrider.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
 import {MetadataOverride} from '@angular/core/testing';
 
-import {BaseException} from '../src/facade/exceptions';
 import {ConcreteType, stringify} from '../src/facade/lang';
 
 type StringMap = {
diff --git a/modules/@angular/forms/src/directives/abstract_control_directive.ts b/modules/@angular/forms/src/directives/abstract_control_directive.ts
index d3f3e4db3f..c932defd4c 100644
--- a/modules/@angular/forms/src/directives/abstract_control_directive.ts
+++ b/modules/@angular/forms/src/directives/abstract_control_directive.ts
@@ -6,13 +6,11 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
 import {Observable} from '../facade/async';
-import {unimplemented} from '../facade/exceptions';
 import {isPresent} from '../facade/lang';
 import {AbstractControl} from '../model';
 
-
-
 /**
  * Base class for control directives.
  *
@@ -21,7 +19,7 @@ import {AbstractControl} from '../model';
  * @experimental
  */
 export abstract class AbstractControlDirective {
-  get control(): AbstractControl { return unimplemented(); }
+  get control(): AbstractControl { throw new BaseException('unimplemented'); }
 
   get value(): any { return isPresent(this.control) ? this.control.value : null; }
 
diff --git a/modules/@angular/forms/src/directives/ng_control.ts b/modules/@angular/forms/src/directives/ng_control.ts
index fadfd3a254..305185d4b9 100644
--- a/modules/@angular/forms/src/directives/ng_control.ts
+++ b/modules/@angular/forms/src/directives/ng_control.ts
@@ -6,12 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {unimplemented} from '../facade/exceptions';
+import {BaseException} from '@angular/core';
 
 import {AbstractControlDirective} from './abstract_control_directive';
 import {ControlValueAccessor} from './control_value_accessor';
 import {AsyncValidatorFn, ValidatorFn} from './validators';
 
+function unimplemented(): any {
+  throw new BaseException('unimplemented');
+}
 
 /**
  * A base class that all control directive extend.
diff --git a/modules/@angular/forms/src/directives/ng_model.ts b/modules/@angular/forms/src/directives/ng_model.ts
index eb986a5dfa..7876d1fc47 100644
--- a/modules/@angular/forms/src/directives/ng_model.ts
+++ b/modules/@angular/forms/src/directives/ng_model.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Host, Inject, Input, OnChanges, OnDestroy, Optional, Output, Self, SimpleChanges, forwardRef} from '@angular/core';
+import {BaseException, Directive, Host, Inject, Input, OnChanges, OnDestroy, Optional, Output, Self, SimpleChanges, forwardRef} from '@angular/core';
 
 import {EventEmitter} from '../facade/async';
-import {BaseException} from '../facade/exceptions';
 import {FormControl} from '../model';
 import {NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '../validators';
 
diff --git a/modules/@angular/forms/src/directives/ng_model_group.ts b/modules/@angular/forms/src/directives/ng_model_group.ts
index 1472919a2c..141563d331 100644
--- a/modules/@angular/forms/src/directives/ng_model_group.ts
+++ b/modules/@angular/forms/src/directives/ng_model_group.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Host, Inject, Input, OnDestroy, OnInit, Optional, Self, SkipSelf, forwardRef} from '@angular/core';
+import {BaseException, Directive, Host, Inject, Input, OnDestroy, OnInit, Optional, Self, SkipSelf, forwardRef} from '@angular/core';
 
-import {BaseException} from '../facade/exceptions';
 import {NG_ASYNC_VALIDATORS, NG_VALIDATORS} from '../validators';
 
 import {AbstractFormGroupDirective} from './abstract_form_group_directive';
diff --git a/modules/@angular/forms/src/directives/radio_control_value_accessor.ts b/modules/@angular/forms/src/directives/radio_control_value_accessor.ts
index 6f8d2e47a9..f33e2665e0 100644
--- a/modules/@angular/forms/src/directives/radio_control_value_accessor.ts
+++ b/modules/@angular/forms/src/directives/radio_control_value_accessor.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, ElementRef, Injectable, Injector, Input, OnDestroy, OnInit, Renderer, forwardRef} from '@angular/core';
+import {BaseException, Directive, ElementRef, Injectable, Injector, Input, OnDestroy, OnInit, Renderer, forwardRef} from '@angular/core';
 
 import {ListWrapper} from '../facade/collection';
-import {BaseException} from '../facade/exceptions';
 import {isPresent} from '../facade/lang';
 
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
diff --git a/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts b/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
index d3849ed976..e31078c9c3 100644
--- a/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
+++ b/modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts
@@ -6,11 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, Inject, Input, OnChanges, Optional, Output, Self, SimpleChanges, forwardRef} from '@angular/core';
+import {BaseException, Directive, Inject, Input, OnChanges, Optional, Output, Self, SimpleChanges, forwardRef} from '@angular/core';
 
 import {EventEmitter} from '../../facade/async';
 import {ListWrapper, StringMapWrapper} from '../../facade/collection';
-import {BaseException} from '../../facade/exceptions';
 import {isBlank} from '../../facade/lang';
 import {FormArray, FormControl, FormGroup} from '../../model';
 import {NG_ASYNC_VALIDATORS, NG_VALIDATORS, Validators} from '../../validators';
diff --git a/modules/@angular/forms/src/directives/reactive_errors.ts b/modules/@angular/forms/src/directives/reactive_errors.ts
index 58a0a06a0d..a7c2eff802 100644
--- a/modules/@angular/forms/src/directives/reactive_errors.ts
+++ b/modules/@angular/forms/src/directives/reactive_errors.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {BaseException} from '../facade/exceptions';
+import {BaseException} from '@angular/core';
 
 import {FormErrorExamples as Examples} from './error_examples';
 
diff --git a/modules/@angular/forms/src/directives/shared.ts b/modules/@angular/forms/src/directives/shared.ts
index 03a8b39c25..aa76f6f39d 100644
--- a/modules/@angular/forms/src/directives/shared.ts
+++ b/modules/@angular/forms/src/directives/shared.ts
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {ListWrapper, StringMapWrapper} from '../facade/collection';
-import {BaseException} from '../facade/exceptions';
 import {hasConstructor, isBlank, isPresent, looseIdentical} from '../facade/lang';
 import {FormArray, FormControl, FormGroup} from '../model';
 import {Validators} from '../validators';
diff --git a/modules/@angular/forms/src/directives/template_driven_errors.ts b/modules/@angular/forms/src/directives/template_driven_errors.ts
index 627be901aa..c36e0e1d2e 100644
--- a/modules/@angular/forms/src/directives/template_driven_errors.ts
+++ b/modules/@angular/forms/src/directives/template_driven_errors.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {BaseException} from '../facade/exceptions';
+import {BaseException} from '@angular/core';
 import {FormErrorExamples as Examples} from './error_examples';
 
 export class TemplateDrivenErrors {
@@ -58,4 +58,4 @@ export class TemplateDrivenErrors {
 
       ${Examples.ngModelGroup}`);
   }
-}
\ No newline at end of file
+}
diff --git a/modules/@angular/forms/src/model.ts b/modules/@angular/forms/src/model.ts
index 410cd54fd1..71a94fcf53 100644
--- a/modules/@angular/forms/src/model.ts
+++ b/modules/@angular/forms/src/model.ts
@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
 import {PromiseObservable} from 'rxjs/observable/PromiseObservable';
 
 import {composeAsyncValidators, composeValidators} from './directives/shared';
 import {AsyncValidatorFn, ValidatorFn} from './directives/validators';
 import {EventEmitter, Observable} from './facade/async';
 import {ListWrapper, StringMapWrapper} from './facade/collection';
-import {BaseException} from './facade/exceptions';
 import {isBlank, isPresent, isPromise, normalizeBool} from './facade/lang';
 
 
diff --git a/modules/@angular/http/src/headers.ts b/modules/@angular/http/src/headers.ts
index bd4beb150e..9d1f5982a8 100644
--- a/modules/@angular/http/src/headers.ts
+++ b/modules/@angular/http/src/headers.ts
@@ -6,11 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {ListWrapper, Map, MapWrapper, StringMapWrapper, isListLikeIterable, iterateListLike} from '../src/facade/collection';
-import {BaseException} from '../src/facade/exceptions';
 import {isBlank} from '../src/facade/lang';
 
 
+
 /**
  * Polyfill for [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers/Headers), as
  * specified in the [Fetch Spec](https://fetch.spec.whatwg.org/#headers-class).
diff --git a/modules/@angular/http/src/static_response.ts b/modules/@angular/http/src/static_response.ts
index c1f74b6e75..d8f12d6d30 100644
--- a/modules/@angular/http/src/static_response.ts
+++ b/modules/@angular/http/src/static_response.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {BaseException} from '../src/facade/exceptions';
+import {BaseException} from '@angular/core';
 import {Json, isString} from '../src/facade/lang';
 
 import {ResponseOptions} from './base_response_options';
diff --git a/modules/@angular/http/testing/mock_backend.ts b/modules/@angular/http/testing/mock_backend.ts
index 74dd20a8cf..15b0e16912 100644
--- a/modules/@angular/http/testing/mock_backend.ts
+++ b/modules/@angular/http/testing/mock_backend.ts
@@ -6,19 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable} from '@angular/core';
+import {BaseException, Injectable} from '@angular/core';
 import {ReplaySubject} from 'rxjs/ReplaySubject';
 import {Subject} from 'rxjs/Subject';
 import {take} from 'rxjs/operator/take';
 
 import {ReadyState} from '../src/enums';
-import {BaseException} from '../src/facade/exceptions';
 import {isPresent} from '../src/facade/lang';
 import {Connection, ConnectionBackend} from '../src/interfaces';
 import {Request} from '../src/static_request';
 import {Response} from '../src/static_response';
 
 
+
 /**
  *
  * Mock Connection to represent a {@link Connection} for tests.
diff --git a/modules/@angular/platform-browser-dynamic/src/xhr/xhr_cache.ts b/modules/@angular/platform-browser-dynamic/src/xhr/xhr_cache.ts
index 020537e03c..6296783606 100644
--- a/modules/@angular/platform-browser-dynamic/src/xhr/xhr_cache.ts
+++ b/modules/@angular/platform-browser-dynamic/src/xhr/xhr_cache.ts
@@ -7,7 +7,7 @@
  */
 
 import {XHR} from '@angular/compiler';
-import {BaseException} from '../facade/exceptions';
+import {BaseException} from '@angular/core';
 import {global} from '../facade/lang';
 
 /**
diff --git a/modules/@angular/platform-browser-dynamic/test/xhr/xhr_cache_spec.ts b/modules/@angular/platform-browser-dynamic/test/xhr/xhr_cache_spec.ts
index 53c9a825ae..ffd15aec38 100644
--- a/modules/@angular/platform-browser-dynamic/test/xhr/xhr_cache_spec.ts
+++ b/modules/@angular/platform-browser-dynamic/test/xhr/xhr_cache_spec.ts
@@ -7,12 +7,11 @@
  */
 
 import {UrlResolver, XHR} from '@angular/compiler';
-import {Component} from '@angular/core';
+import {BaseException, Component} from '@angular/core';
 import {TestBed, TestComponentBuilder, fakeAsync, flushMicrotasks, tick} from '@angular/core/testing';
 import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
 import {expect} from '@angular/platform-browser/testing/matchers';
 
-import {BaseException} from '../../src/facade/exceptions';
 import {CachedXHR} from '../../src/xhr/xhr_cache';
 
 import {setTemplateCache} from './xhr_cache_setter';
diff --git a/modules/@angular/platform-browser/src/dom/dom_renderer.ts b/modules/@angular/platform-browser/src/dom/dom_renderer.ts
index a86bcbb185..3e8331d729 100644
--- a/modules/@angular/platform-browser/src/dom/dom_renderer.ts
+++ b/modules/@angular/platform-browser/src/dom/dom_renderer.ts
@@ -6,11 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, OpaqueToken, RenderComponentType, Renderer, RootRenderer, ViewEncapsulation} from '@angular/core';
+import {BaseException, Inject, Injectable, OpaqueToken, RenderComponentType, Renderer, RootRenderer, ViewEncapsulation} from '@angular/core';
 
 import {AnimationKeyframe, AnimationPlayer, AnimationStyles, RenderDebugInfo} from '../../core_private';
 import {StringMapWrapper} from '../facade/collection';
-import {BaseException} from '../facade/exceptions';
 import {Json, StringWrapper, isArray, isBlank, isPresent, isString, stringify} from '../facade/lang';
 
 import {AnimationDriver} from './animation_driver';
diff --git a/modules/@angular/platform-browser/src/dom/events/event_manager.ts b/modules/@angular/platform-browser/src/dom/events/event_manager.ts
index 4c54513d29..155deca036 100644
--- a/modules/@angular/platform-browser/src/dom/events/event_manager.ts
+++ b/modules/@angular/platform-browser/src/dom/events/event_manager.ts
@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, NgZone, OpaqueToken} from '@angular/core';
+import {BaseException, Inject, Injectable, NgZone, OpaqueToken} from '@angular/core';
 
 import {ListWrapper} from '../../facade/collection';
-import {BaseException} from '../../facade/exceptions';
+
 
 
 /**
diff --git a/modules/@angular/platform-browser/src/dom/events/hammer_gestures.ts b/modules/@angular/platform-browser/src/dom/events/hammer_gestures.ts
index 04f15f8b4c..d4091e50f8 100644
--- a/modules/@angular/platform-browser/src/dom/events/hammer_gestures.ts
+++ b/modules/@angular/platform-browser/src/dom/events/hammer_gestures.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Inject, Injectable, OpaqueToken} from '@angular/core';
+import {BaseException, Inject, Injectable, OpaqueToken} from '@angular/core';
 
-import {BaseException} from '../../facade/exceptions';
 import {isPresent} from '../../facade/lang';
 
 import {HammerGesturesPluginCommon} from './hammer_common';
diff --git a/modules/@angular/platform-browser/src/web_workers/shared/post_message_bus.ts b/modules/@angular/platform-browser/src/web_workers/shared/post_message_bus.ts
index 055cab7d59..f3724d857b 100644
--- a/modules/@angular/platform-browser/src/web_workers/shared/post_message_bus.ts
+++ b/modules/@angular/platform-browser/src/web_workers/shared/post_message_bus.ts
@@ -6,15 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, NgZone} from '@angular/core';
+import {BaseException, Injectable, NgZone} from '@angular/core';
 
 import {EventEmitter} from '../../facade/async';
 import {StringMapWrapper} from '../../facade/collection';
-import {BaseException} from '../../facade/exceptions';
 
 import {MessageBus, MessageBusSink, MessageBusSource} from './message_bus';
 
 
+
 // TODO(jteplitz602) Replace this with the definition in lib.webworker.d.ts(#3492)
 export interface PostMessageTarget {
   postMessage: (message: any, transfer?: [ArrayBuffer]) => void;
diff --git a/modules/@angular/platform-browser/src/web_workers/shared/serializer.ts b/modules/@angular/platform-browser/src/web_workers/shared/serializer.ts
index fcb44e30d8..41ec793825 100644
--- a/modules/@angular/platform-browser/src/web_workers/shared/serializer.ts
+++ b/modules/@angular/platform-browser/src/web_workers/shared/serializer.ts
@@ -6,17 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Injectable, RenderComponentType, ViewEncapsulation} from '@angular/core';
+import {BaseException, Injectable, RenderComponentType, ViewEncapsulation} from '@angular/core';
 
 import {VIEW_ENCAPSULATION_VALUES} from '../../../core_private';
 import {Map, MapWrapper, StringMapWrapper} from '../../facade/collection';
-import {BaseException} from '../../facade/exceptions';
 import {Type, isArray, isPresent, serializeEnum} from '../../facade/lang';
 
 import {RenderStore} from './render_store';
 import {LocationType} from './serialized_types';
 
 
+
 // PRIMITIVE is any type that does not need to be serialized (string, number, boolean)
 // We set it to String so that it is considered a Type.
 /**
diff --git a/modules/@angular/platform-browser/src/web_workers/ui/event_dispatcher.ts b/modules/@angular/platform-browser/src/web_workers/ui/event_dispatcher.ts
index 9fb8280880..79f0eebad4 100644
--- a/modules/@angular/platform-browser/src/web_workers/ui/event_dispatcher.ts
+++ b/modules/@angular/platform-browser/src/web_workers/ui/event_dispatcher.ts
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {EventEmitter} from '../../facade/async';
-import {BaseException} from '../../facade/exceptions';
 import {RenderStoreObject, Serializer} from '../shared/serializer';
 
 import {serializeEventWithTarget, serializeGenericEvent, serializeKeyboardEvent, serializeMouseEvent, serializeTransitionEvent} from './event_serializer';
diff --git a/modules/@angular/platform-browser/src/web_workers/worker/platform_location.ts b/modules/@angular/platform-browser/src/web_workers/worker/platform_location.ts
index 53ff729579..f953b269e9 100644
--- a/modules/@angular/platform-browser/src/web_workers/worker/platform_location.ts
+++ b/modules/@angular/platform-browser/src/web_workers/worker/platform_location.ts
@@ -7,11 +7,10 @@
  */
 
 import {PlatformLocation, UrlChangeListener} from '@angular/common';
-import {Injectable} from '@angular/core';
+import {BaseException, Injectable} from '@angular/core';
 
 import {EventEmitter} from '../../facade/async';
 import {StringMapWrapper} from '../../facade/collection';
-import {BaseException} from '../../facade/exceptions';
 import {StringWrapper} from '../../facade/lang';
 import {ClientMessageBroker, ClientMessageBrokerFactory, FnArg, UiArguments} from '../shared/client_message_broker';
 import {MessageBus} from '../shared/message_bus';
diff --git a/modules/@angular/platform-browser/src/worker_render.ts b/modules/@angular/platform-browser/src/worker_render.ts
index 963dab9478..c1a7912643 100644
--- a/modules/@angular/platform-browser/src/worker_render.ts
+++ b/modules/@angular/platform-browser/src/worker_render.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ExceptionHandler, Injectable, Injector, NgZone, OpaqueToken, PLATFORM_COMMON_PROVIDERS, PLATFORM_INITIALIZER, PlatformRef, ReflectiveInjector, RootRenderer, Testability, assertPlatform, createPlatform, createPlatformFactory, getPlatform, isDevMode, platformCore} from '@angular/core';
+import {BaseException, ExceptionHandler, Injectable, Injector, NgZone, OpaqueToken, PLATFORM_COMMON_PROVIDERS, PLATFORM_INITIALIZER, PlatformRef, ReflectiveInjector, RootRenderer, Testability, assertPlatform, createPlatform, createPlatformFactory, getPlatform, isDevMode, platformCore} from '@angular/core';
 
 import {wtfInit} from '../core_private';
 
@@ -22,7 +22,6 @@ import {EVENT_MANAGER_PLUGINS, EventManager} from './dom/events/event_manager';
 import {HAMMER_GESTURE_CONFIG, HammerGestureConfig, HammerGesturesPlugin} from './dom/events/hammer_gestures';
 import {KeyEventsPlugin} from './dom/events/key_events';
 import {DomSharedStylesHost, SharedStylesHost} from './dom/shared_styles_host';
-import {BaseException} from './facade/exceptions';
 import {isBlank} from './facade/lang';
 import {ON_WEB_WORKER} from './web_workers/shared/api';
 import {ClientMessageBrokerFactory, ClientMessageBrokerFactory_} from './web_workers/shared/client_message_broker';
diff --git a/modules/@angular/platform-browser/test/web_workers/shared/web_worker_test_util.ts b/modules/@angular/platform-browser/test/web_workers/shared/web_worker_test_util.ts
index c83f662dbf..b452100487 100644
--- a/modules/@angular/platform-browser/test/web_workers/shared/web_worker_test_util.ts
+++ b/modules/@angular/platform-browser/test/web_workers/shared/web_worker_test_util.ts
@@ -6,11 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
 import {NgZone} from '@angular/core/src/zone/ng_zone';
 import {ClientMessageBroker, ClientMessageBrokerFactory_, UiArguments} from '@angular/platform-browser/src/web_workers/shared/client_message_broker';
 import {MessageBus, MessageBusSink, MessageBusSource} from '@angular/platform-browser/src/web_workers/shared/message_bus';
+
 import {ListWrapper, StringMapWrapper} from '../../../src/facade/collection';
-import {BaseException} from '../../../src/facade/exceptions';
 import {Type, isPresent} from '../../../src/facade/lang';
 import {SpyMessageBroker} from '../worker/spies';
 
diff --git a/modules/@angular/platform-browser/testing/benchmark_util.ts b/modules/@angular/platform-browser/testing/benchmark_util.ts
index 53ab56417d..d494413889 100644
--- a/modules/@angular/platform-browser/testing/benchmark_util.ts
+++ b/modules/@angular/platform-browser/testing/benchmark_util.ts
@@ -6,9 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {BaseException} from '@angular/core';
+
 import {BrowserDomAdapter} from '../src/browser/browser_adapter';
 import {document, window} from '../src/facade/browser';
-import {BaseException} from '../src/facade/exceptions';
 import {NumberWrapper, isBlank} from '../src/facade/lang';
 
 var DOM = new BrowserDomAdapter();
diff --git a/modules/@angular/platform-server/src/parse5_adapter.ts b/modules/@angular/platform-server/src/parse5_adapter.ts
index 84d7cd08ac..8aa651819c 100644
--- a/modules/@angular/platform-server/src/parse5_adapter.ts
+++ b/modules/@angular/platform-server/src/parse5_adapter.ts
@@ -11,7 +11,7 @@ var parse5 = require('parse5/index');
 import {ListWrapper, StringMapWrapper} from '../src/facade/collection';
 import {DomAdapter, setRootDomAdapter} from '../platform_browser_private';
 import {isPresent, isBlank, global, Type, setValueOnPath, DateWrapper} from '../src/facade/lang';
-import {BaseException} from '../src/facade/exceptions';
+import {BaseException} from '@angular/core';
 import {SelectorMatcher, CssSelector} from '../compiler_private';
 import {XHR} from '@angular/compiler';
 
diff --git a/modules/playground/src/sourcemap/index.ts b/modules/playground/src/sourcemap/index.ts
index 41602a37c1..a992248417 100644
--- a/modules/playground/src/sourcemap/index.ts
+++ b/modules/playground/src/sourcemap/index.ts
@@ -7,7 +7,7 @@
  */
 
 import {Component} from '@angular/core';
-import {BaseException} from '@angular/core/src/facade/exceptions';
+import {BaseException} from '@angular/core';
 import {bootstrap} from '@angular/platform-browser-dynamic';
 
 @Component({