refactor(imports): simplify paths

modules/@angular/common/src/directives/core_directives.ts

@@ -1,4 +1,4 @@
-import {Type} from '../../src/facade/lang';
+import {Type} from '../facade/lang';
 import {NgClass} from './ng_class';
 import {NgFor} from './ng_for';
 import {NgIf} from './ng_if';

modules/@angular/common/src/directives/ng_class.ts

@@ -11,8 +11,8 @@ import {
   CollectionChangeRecord,
   KeyValueChangeRecord
 } from '@angular/core';
-import {isPresent, isString, isArray} from '../../src/facade/lang';
+import {isPresent, isString, isArray} from '../facade/lang';
-import {StringMapWrapper, isListLikeIterable} from '../../src/facade/collection';
+import {StringMapWrapper, isListLikeIterable} from '../facade/collection';
 
 /**
  * The `NgClass` directive conditionally adds and removes CSS classes on an HTML element based on

modules/@angular/common/src/directives/ng_for.ts

@@ -11,8 +11,8 @@ import {
   DefaultIterableDiffer,
   CollectionChangeRecord
 } from '@angular/core';
-import {isPresent, isBlank, getTypeNameForDebugging} from '../../src/facade/lang';
+import {isPresent, isBlank, getTypeNameForDebugging} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 
 export class NgForRow {
   constructor(public $implicit: any, public index: number, public count: number) {}

modules/@angular/common/src/directives/ng_if.ts

@@ -1,5 +1,5 @@
 import {Directive, ViewContainerRef, TemplateRef} from '@angular/core';
-import {isBlank} from '../../src/facade/lang';
+import {isBlank} from '../facade/lang';
 
 /**
  * Removes or recreates a portion of the DOM tree based on an {expression}.

modules/@angular/common/src/directives/ng_plural.ts

@@ -8,8 +8,8 @@ import {
   AfterContentInit,
   Input
 } from '@angular/core';
-import {isPresent, NumberWrapper} from '../../src/facade/lang';
+import {isPresent, NumberWrapper} from '../facade/lang';
-import {Map} from '../../src/facade/collection';
+import {Map} from '../facade/collection';
 
 import {SwitchView} from './ng_switch';
 

modules/@angular/common/src/directives/ng_style.ts

@@ -7,7 +7,7 @@ import {
   Directive,
   Renderer
 } from '@angular/core';
-import {isPresent, isBlank} from '../../src/facade/lang';
+import {isPresent, isBlank} from '../facade/lang';
 
 /**
  * The `NgStyle` directive changes styles based on a result of expression evaluation.

modules/@angular/common/src/directives/ng_switch.ts

@@ -1,6 +1,6 @@
 import {Directive, Host, ViewContainerRef, TemplateRef} from '@angular/core';
-import {isPresent, isBlank, normalizeBlank} from '../../src/facade/lang';
+import {isPresent, isBlank, normalizeBlank} from '../facade/lang';
-import {ListWrapper, Map} from '../../src/facade/collection';
+import {ListWrapper, Map} from '../facade/collection';
 
 const _WHEN_DEFAULT = /*@ts2dart_const*/ new Object();
 

modules/@angular/common/src/directives/ng_template_outlet.ts

@@ -1,5 +1,5 @@
 import {Directive, Input, ViewContainerRef, ViewRef, TemplateRef} from '@angular/core';
-import {isPresent} from '../../src/facade/lang';
+import {isPresent} from '../facade/lang';
 
 /**
  * Creates and inserts an embedded view based on a prepared `TemplateRef`.

modules/@angular/common/src/forms/directives/abstract_control_directive.ts

@@ -1,6 +1,6 @@
 import {AbstractControl} from '../model';
-import {isPresent} from '../../../src/facade/lang';
+import {isPresent} from '../../facade/lang';
-import {unimplemented} from '../../../src/facade/exceptions';
+import {unimplemented} from '../../facade/exceptions';
 
 /**
  * Base class for control directives.

modules/@angular/common/src/forms/directives/default_value_accessor.ts

@@ -1,5 +1,5 @@
 import {Directive, ElementRef, Renderer, forwardRef} from '@angular/core';
-import {isBlank} from '../../../src/facade/lang';
+import {isBlank} from '../../facade/lang';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
 
 export const DEFAULT_VALUE_ACCESSOR: any = /*@ts2dart_const*/

modules/@angular/common/src/forms/directives/ng_control.ts

@@ -1,4 +1,4 @@
-import {unimplemented} from '../../../src/facade/exceptions';
+import {unimplemented} from '../../facade/exceptions';
 
 import {ControlValueAccessor} from './control_value_accessor';
 import {AbstractControlDirective} from './abstract_control_directive';

modules/@angular/common/src/forms/directives/ng_control_name.ts

@@ -11,7 +11,7 @@ import {
   Self
 } from '@angular/core';
 
-import {EventEmitter, ObservableWrapper} from '../../../src/facade/async';
+import {EventEmitter, ObservableWrapper} from '../../facade/async';
 import {ControlContainer} from './control_container';
 import {NgControl} from './ng_control';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';

modules/@angular/common/src/forms/directives/ng_control_status.ts

@@ -1,6 +1,6 @@
 import {Directive, Self} from '@angular/core';
 import {NgControl} from './ng_control';
-import {isPresent} from '../../../src/facade/lang';
+import {isPresent} from '../../facade/lang';
 
 /**
  * Directive automatically applied to Angular forms that sets CSS classes

modules/@angular/common/src/forms/directives/ng_form.ts

@@ -3,9 +3,9 @@ import {
   PromiseWrapper,
   ObservableWrapper,
   EventEmitter
-} from '../../../src/facade/async';
+} from '../../facade/async';
-import {ListWrapper} from '../../../src/facade/collection';
+import {ListWrapper} from '../../facade/collection';
-import {isPresent} from '../../../src/facade/lang';
+import {isPresent} from '../../facade/lang';
 import {NgControl} from './ng_control';
 import {Form} from './form_interface';
 import {NgControlGroup} from './ng_control_group';

modules/@angular/common/src/forms/directives/ng_form_control.ts

@@ -8,8 +8,8 @@ import {
   Self
 } from '@angular/core';
 
-import {StringMapWrapper} from '../../../src/facade/collection';
+import {StringMapWrapper} from '../../facade/collection';
-import {EventEmitter, ObservableWrapper} from '../../../src/facade/async';
+import {EventEmitter, ObservableWrapper} from '../../facade/async';
 
 import {NgControl} from './ng_control';
 import {Control} from '../model';

modules/@angular/common/src/forms/directives/ng_form_model.ts

@@ -7,10 +7,10 @@ import {
   Optional,
   Self
 } from '@angular/core';
-import {isBlank} from '../../../src/facade/lang';
+import {isBlank} from '../../facade/lang';
-import {ListWrapper, StringMapWrapper} from '../../../src/facade/collection';
+import {ListWrapper, StringMapWrapper} from '../../facade/collection';
-import {BaseException} from '../../../src/facade/exceptions';
+import {BaseException} from '../../facade/exceptions';
-import {ObservableWrapper, EventEmitter} from '../../../src/facade/async';
+import {ObservableWrapper, EventEmitter} from '../../facade/async';
 import {NgControl} from './ng_control';
 import {NgControlGroup} from './ng_control_group';
 import {ControlContainer} from './control_container';

modules/@angular/common/src/forms/directives/ng_model.ts

@@ -7,7 +7,7 @@ import {
   Optional,
   Self
 } from '@angular/core';
-import {EventEmitter, ObservableWrapper} from '../../../src/facade/async';
+import {EventEmitter, ObservableWrapper} from '../../facade/async';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
 import {NgControl} from './ng_control';
 import {Control} from '../model';

modules/@angular/common/src/forms/directives/number_value_accessor.ts

@@ -1,5 +1,5 @@
 import {Directive, ElementRef, Renderer, forwardRef} from '@angular/core';
-import {NumberWrapper} from '../../../src/facade/lang';
+import {NumberWrapper} from '../../facade/lang';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
 
 export const NUMBER_VALUE_ACCESSOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {

modules/@angular/common/src/forms/directives/radio_control_value_accessor.ts

@@ -9,8 +9,8 @@ import {
   Injector,
   Injectable
 } from '@angular/core';
-import {isPresent} from '../../../src/facade/lang';
+import {isPresent} from '../../facade/lang';
-import {ListWrapper} from '../../../src/facade/collection';
+import {ListWrapper} from '../../facade/collection';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
 import {NgControl} from './ng_control';
 

modules/@angular/common/src/forms/directives/select_control_value_accessor.ts

@@ -14,8 +14,8 @@ import {
   isPresent,
   isBlank,
   looseIdentical
-} from '../../../src/facade/lang';
+} from '../../facade/lang';
-import {MapWrapper} from '../../../src/facade/collection';
+import {MapWrapper} from '../../facade/collection';
 
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
 

modules/@angular/common/src/forms/directives/select_multiple_control_value_accessor.ts

@@ -16,9 +16,9 @@ import {
   isPresent, 
   looseIdentical, 
   isString
-} from '../../../src/facade/lang';
+} from '../../facade/lang';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
-import {MapWrapper} from '../../../src/facade/collection';
+import {MapWrapper} from '../../facade/collection';
 
 const SELECT_MULTIPLE_VALUE_ACCESSOR = {
   provide: NG_VALUE_ACCESSOR,

modules/@angular/common/src/forms/directives/shared.ts

@@ -1,6 +1,6 @@
-import {ListWrapper, StringMapWrapper} from '../../../src/facade/collection';
+import {ListWrapper, StringMapWrapper} from '../../facade/collection';
-import {isBlank, isPresent, looseIdentical, hasConstructor} from '../../../src/facade/lang';
+import {isBlank, isPresent, looseIdentical, hasConstructor} from '../../facade/lang';
-import {BaseException} from '../../../src/facade/exceptions';
+import {BaseException} from '../../facade/exceptions';
 
 import {ControlContainer} from './control_container';
 import {NgControl} from './ng_control';

modules/@angular/common/src/forms/form_builder.ts

@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
-import {StringMapWrapper} from '../../src/facade/collection';
+import {StringMapWrapper} from '../facade/collection';
-import {isPresent, isArray} from '../../src/facade/lang';
+import {isPresent, isArray} from '../facade/lang';
 import * as modelModule from './model';
 import {ValidatorFn, AsyncValidatorFn} from './directives/validators';
 

modules/@angular/common/src/forms/model.ts

@@ -1,7 +1,7 @@
-import {isPresent, isBlank, normalizeBool} from '../../src/facade/lang';
+import {isPresent, isBlank, normalizeBool} from '../facade/lang';
-import {Observable, EventEmitter, ObservableWrapper} from '../../src/facade/async';
+import {Observable, EventEmitter, ObservableWrapper} from '../facade/async';
-import {PromiseWrapper} from '../../src/facade/promise';
+import {PromiseWrapper} from '../facade/promise';
-import {StringMapWrapper, ListWrapper} from '../../src/facade/collection';
+import {StringMapWrapper, ListWrapper} from '../facade/collection';
 import {ValidatorFn, AsyncValidatorFn} from './directives/validators';
 
 /**

modules/@angular/common/src/forms/validators.ts

@@ -1,8 +1,8 @@
 import {OpaqueToken} from '@angular/core';
-import {isBlank, isPresent, isString} from '../../src/facade/lang';
+import {isBlank, isPresent, isString} from '../facade/lang';
-import {PromiseWrapper} from '../../src/facade/promise';
+import {PromiseWrapper} from '../facade/promise';
-import {ObservableWrapper} from '../../src/facade/async';
+import {ObservableWrapper} from '../facade/async';
-import {StringMapWrapper} from '../../src/facade/collection';
+import {StringMapWrapper} from '../facade/collection';
 import * as modelModule from './model';
 import {ValidatorFn, AsyncValidatorFn} from './directives/validators';
 

modules/@angular/common/src/location/hash_location_strategy.ts

@@ -1,5 +1,5 @@
 import {Injectable, Inject, Optional} from '@angular/core';
-import {isPresent} from '../../src/facade/lang';
+import {isPresent} from '../facade/lang';
 
 import {LocationStrategy, APP_BASE_HREF} from './location_strategy';
 import {Location} from './location';

modules/@angular/common/src/location/location.ts

@@ -1,5 +1,5 @@
 import {Injectable, EventEmitter} from '@angular/core';
-import {ObservableWrapper} from '../../src/facade/async';
+import {ObservableWrapper} from '../facade/async';
 
 import {LocationStrategy} from './location_strategy';
 

modules/@angular/common/src/location/path_location_strategy.ts

@@ -1,6 +1,6 @@
 import {Injectable, Inject, Optional} from '@angular/core';
-import {isBlank} from '../../src/facade/lang';
+import {isBlank} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 
 import {PlatformLocation, UrlChangeListener} from './platform_location';
 import {LocationStrategy, APP_BASE_HREF} from './location_strategy';

modules/@angular/common/src/pipes/async_pipe.ts

@@ -1,7 +1,7 @@
 import {Pipe, Injectable, ChangeDetectorRef, OnDestroy, WrappedValue} from '@angular/core';
 
-import {isBlank, isPresent, isPromise} from '../../src/facade/lang';
+import {isBlank, isPresent, isPromise} from '../facade/lang';
-import {ObservableWrapper, Observable, EventEmitter} from '../../src/facade/async';
+import {ObservableWrapper, Observable, EventEmitter} from '../facade/async';
 
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 

modules/@angular/common/src/pipes/date_pipe.ts

@@ -5,9 +5,9 @@ import {
   isString,
   DateWrapper,
   isBlank,
-} from '../../src/facade/lang';
+} from '../facade/lang';
-import {DateFormatter} from '../../src/facade/intl';
+import {DateFormatter} from '../facade/intl';
-import {StringMapWrapper} from '../../src/facade/collection';
+import {StringMapWrapper} from '../facade/collection';
 
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 

modules/@angular/common/src/pipes/i18n_plural_pipe.ts

@@ -1,5 +1,5 @@
 import {PipeTransform, Pipe} from '@angular/core';
-import {isStringMap, StringWrapper, isPresent, RegExpWrapper} from '../../src/facade/lang';
+import {isStringMap, StringWrapper, isPresent, RegExpWrapper} from '../facade/lang';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
 var interpolationExp: RegExp = RegExpWrapper.create('#');

modules/@angular/common/src/pipes/i18n_select_pipe.ts

@@ -1,6 +1,6 @@
 import {PipeTransform, Pipe} from '@angular/core';
-import {isStringMap} from '../../src/facade/lang';
+import {isStringMap} from '../facade/lang';
-import {StringMapWrapper} from '../../src/facade/collection';
+import {StringMapWrapper} from '../facade/collection';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
 /**

modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts

@@ -1,5 +1,5 @@
-import {Type, stringify} from '../../src/facade/lang';
+import {Type, stringify} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 
 export class InvalidPipeArgumentException extends BaseException {
   constructor(type: Type, value: Object) {

modules/@angular/common/src/pipes/json_pipe.ts

@@ -1,5 +1,5 @@
 import {PipeTransform, Pipe} from '@angular/core';
-import {Json} from '../../src/facade/lang';
+import {Json} from '../facade/lang';
 
 
 /**

modules/@angular/common/src/pipes/lowercase_pipe.ts

@@ -1,5 +1,5 @@
 import {PipeTransform, Pipe} from '@angular/core';
-import {isString, isBlank} from '../../src/facade/lang';
+import {isString, isBlank} from '../facade/lang';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
 /**

modules/@angular/common/src/pipes/number_pipe.ts

@@ -7,9 +7,10 @@ import {
   NumberWrapper,
   RegExpWrapper,
   Type
-} from '../../src/facade/lang';
+} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
-import {NumberFormatter, NumberFormatStyle} from '../../src/facade/intl';
+import {NumberFormatter, NumberFormatStyle} from '../facade/intl';
+
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
 var defaultLocale: string = 'en-US';

modules/@angular/common/src/pipes/replace_pipe.ts

@@ -7,7 +7,7 @@ import {
   isFunction,
   RegExpWrapper,
   StringWrapper
-} from '../../src/facade/lang';
+} from '../facade/lang';
 
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 

modules/@angular/common/src/pipes/slice_pipe.ts

@@ -1,7 +1,6 @@
 import {PipeTransform, Pipe} from '@angular/core';
-
+import {isBlank, isString, isArray, StringWrapper} from '../facade/lang';
-import {isBlank, isString, isArray, StringWrapper} from '../../src/facade/lang';
+import {ListWrapper} from '../facade/collection';
-import {ListWrapper} from '../../src/facade/collection';
 
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 

modules/@angular/common/src/pipes/uppercase_pipe.ts

@@ -1,5 +1,5 @@
 import {PipeTransform, Pipe} from '@angular/core';
-import {isString, isBlank} from '../../src/facade/lang';
+import {isString, isBlank} from '../facade/lang';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
 /**

modules/@angular/compiler/src/compiler.ts

@@ -1,5 +1,5 @@
 import {ComponentResolver, Type} from '@angular/core';
-import {assertionsEnabled} from '../src/facade/lang';
+import {assertionsEnabled} from './facade/lang';
 
 export * from './template_ast';
 export {TEMPLATE_TRANSFORMS} from './template_parser';

modules/@angular/compiler/src/css/lexer.ts

@@ -1,5 +1,5 @@
-import {NumberWrapper, StringWrapper, isPresent, resolveEnumToken} from '../../src/facade/lang';
+import {NumberWrapper, StringWrapper, isPresent, resolveEnumToken} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 
 import {
   isWhitespace,

modules/@angular/compiler/src/css/parser.ts

@@ -11,7 +11,7 @@ import {
   NumberWrapper,
   StringWrapper,
   isPresent
-} from '../../src/facade/lang';
+} from '../facade/lang';
 
 import {
   CssLexerMode,

modules/@angular/compiler/src/expression_parser/ast.ts

@@ -1,4 +1,4 @@
-import {ListWrapper} from '../../src/facade/collection';
+import {ListWrapper} from '../facade/collection';
 
 export class AST {
   visit(visitor: AstVisitor, context: any = null): any { return null; }

modules/@angular/compiler/src/expression_parser/lexer.ts

@@ -1,7 +1,7 @@
 import {Injectable} from '@angular/core';
-import {SetWrapper} from '../../src/facade/collection';
+import {SetWrapper} from '../facade/collection';
-import {NumberWrapper, StringJoiner, StringWrapper, isPresent} from '../../src/facade/lang';
+import {NumberWrapper, StringJoiner, StringWrapper, isPresent} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 
 export enum TokenType {
   Character,

modules/@angular/compiler/src/expression_parser/parser.ts

@@ -1,7 +1,7 @@
 import {Injectable} from '@angular/core';
-import {isBlank, isPresent, StringWrapper} from '../../src/facade/lang';
+import {isBlank, isPresent, StringWrapper} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
-import {ListWrapper} from '../../src/facade/collection';
+import {ListWrapper} from '../facade/collection';
 import {
   Lexer,
   EOF,

modules/@angular/compiler/src/i18n/expander.ts

@@ -10,7 +10,7 @@ import {
   htmlVisitAll
 } from '../html_ast';
 
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 
 
 /**

modules/@angular/compiler/src/i18n/message.ts

@@ -1,4 +1,4 @@
-import {isPresent, escape} from '../../src/facade/lang';
+import {isPresent, escape} from '../facade/lang';
 
 /**
  * A message extracted from a template.

modules/@angular/compiler/src/i18n/shared.ts

@@ -10,7 +10,7 @@ import {
   HtmlExpansionCaseAst,
   htmlVisitAll
 } from '../html_ast';
-import {isPresent, isBlank, StringWrapper} from '../../src/facade/lang';
+import {isPresent, isBlank, StringWrapper} from '../facade/lang';
 import {Message} from './message';
 import {Parser} from '../expression_parser/parser';
 

modules/@angular/compiler/src/i18n/xmb_serializer.ts

@@ -1,4 +1,4 @@
-import {isPresent, isBlank, RegExpWrapper} from '../../src/facade/lang';
+import {isPresent, isBlank, RegExpWrapper} from '../facade/lang';
 import {HtmlAst, HtmlElementAst} from '../html_ast';
 import {Message, id} from './message';
 import {HtmlParser} from '../html_parser';

modules/@angular/compiler/src/offline_compiler.ts

@@ -7,8 +7,8 @@ import {
   createHostComponentMeta
 } from './compile_metadata';
 
-import {BaseException} from '../src/facade/exceptions';
+import {BaseException} from './facade/exceptions';
-import {ListWrapper} from '../src/facade/collection';
+import {ListWrapper} from './facade/collection';
 import {StyleCompiler, StylesCompileResult} from './style_compiler';
 import {ViewCompiler, ViewCompileResult} from './view_compiler/view_compiler';
 import {TemplateParser} from './template_parser';
@@ -17,10 +17,7 @@ import {OutputEmitter} from './output/abstract_emitter';
 import * as o from './output/output_ast';
 import {XHR} from './xhr';
 
-import {
+import {assetUrl} from './util';
-  MODULE_SUFFIX,
-  assetUrl,
-} from './util';
 
 var _COMPONENT_FACTORY_IDENTIFIER = new CompileIdentifierMetadata({
   name: 'ComponentFactory',

modules/@angular/compiler/src/output/abstract_emitter.ts

@@ -1,5 +1,5 @@
-import {isPresent, isBlank, isString, StringWrapper} from '../../src/facade/lang';
+import {isPresent, isBlank, isString, StringWrapper} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 import * as o from './output_ast';
 
 var _SINGLE_QUOTE_ESCAPE_STRING_RE = /'|\\|\n|\r|\$/g;

modules/@angular/compiler/src/output/abstract_js_emitter.ts

@@ -1,5 +1,5 @@
-import {isPresent} from '../../src/facade/lang';
+import {isPresent} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 import * as o from './output_ast';
 import {
   EmitterVisitorContext,

modules/@angular/compiler/src/output/dart_emitter.ts

@@ -1,5 +1,5 @@
-import {isPresent, isBlank, isArray} from '../../src/facade/lang';
+import {isPresent, isBlank, isArray} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 import {CompileIdentifierMetadata} from '../compile_metadata';
 import * as o from './output_ast';
 import {

modules/@angular/compiler/src/output/dart_imports.ts

@@ -1,5 +1,5 @@
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
-import {isPresent, isBlank, RegExpWrapper, Math} from '../../src/facade/lang';
+import {isPresent, isBlank, RegExpWrapper, Math} from '../facade/lang';
 import {Injectable} from '@angular/core';
 
 import {AssetUrl, ImportGenerator} from './path_util';

modules/@angular/compiler/src/output/interpretive_view.ts

@@ -1,7 +1,7 @@
 import {AppElement, AppView, DebugAppView} from '../../core_private';
 
-import {isPresent} from '../../src/facade/lang';
+import {isPresent} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 import {InstanceFactory, DynamicInstance} from './output_interpreter';
 
 export class InterpretiveAppViewInstanceFactory implements InstanceFactory {

modules/@angular/compiler/src/output/output_ast.ts

@@ -1,4 +1,4 @@
-import {isString, isPresent, isBlank} from '../../src/facade/lang';
+import {isString, isPresent, isBlank} from '../facade/lang';
 import {CompileIdentifierMetadata} from '../compile_metadata';
 
 //// Types

modules/@angular/compiler/src/output/output_interpreter.ts

@@ -1,8 +1,8 @@
 import {reflector} from '../../core_private';
-import {isPresent, IS_DART, FunctionWrapper} from '../../src/facade/lang';
+import {isPresent, IS_DART, FunctionWrapper} from '../facade/lang';
-import {ObservableWrapper} from '../../src/facade/async';
+import {ObservableWrapper} from '../facade/async';
-import {BaseException, unimplemented} from '../../src/facade/exceptions';
+import {BaseException, unimplemented} from '../facade/exceptions';
-import {ListWrapper} from '../../src/facade/collection';
+import {ListWrapper} from '../facade/collection';
 
 import * as o from './output_ast';
 import {debugOutputAstAsDart} from './dart_emitter';

modules/@angular/compiler/src/output/output_jit.ts

@@ -1,7 +1,7 @@
 import {
   isPresent,
   evalExpression,
-} from '../../src/facade/lang';
+} from '../facade/lang';
 import * as o from './output_ast';
 import {EmitterVisitorContext} from './abstract_emitter';
 import {AbstractJsEmitterVisitor} from './abstract_js_emitter';

modules/@angular/compiler/src/output/path_util.ts

@@ -1,5 +1,5 @@
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
-import {isPresent, isBlank, RegExpWrapper, Math} from '../../src/facade/lang';
+import {isPresent, isBlank, RegExpWrapper, Math} from '../facade/lang';
 import {Injectable} from '@angular/core';
 
 // asset:<package-name>/<realm>/<path-to-module>

modules/@angular/compiler/src/output/ts_emitter.ts

@@ -1,6 +1,6 @@
 import * as o from './output_ast';
-import {isPresent, isBlank, isArray} from '../../src/facade/lang';
+import {isPresent, isBlank, isArray} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 import {CompileIdentifierMetadata} from '../compile_metadata';
 import {
   OutputEmitter,

modules/@angular/compiler/src/view_compiler/compile_element.ts

@@ -1,6 +1,6 @@
 import {BaseException} from '@angular/core';
-import {isPresent, isBlank} from '../../src/facade/lang';
+import {isPresent, isBlank} from '../facade/lang';
-import {ListWrapper, StringMapWrapper} from '../../src/facade/collection';
+import {ListWrapper, StringMapWrapper} from '../facade/collection';
 
 import * as o from '../output/output_ast';
 import {Identifiers, identifierToken} from '../identifiers';

modules/@angular/compiler/src/view_compiler/compile_method.ts

@@ -1,5 +1,5 @@
-import {isPresent} from '../../src/facade/lang';
+import {isPresent} from '../facade/lang';
-import {ListWrapper} from '../../src/facade/collection';
+import {ListWrapper} from '../facade/collection';
 
 import * as o from '../output/output_ast';
 import {TemplateAst} from '../template_ast';

modules/@angular/compiler/src/view_compiler/compile_query.ts

@@ -1,5 +1,5 @@
-import {isPresent, isBlank} from '../../src/facade/lang';
+import {isPresent, isBlank} from '../facade/lang';
-import {ListWrapper} from '../../src/facade/collection';
+import {ListWrapper} from '../facade/collection';
 
 import * as o from '../output/output_ast';
 import {Identifiers} from '../identifiers';

modules/@angular/compiler/src/view_compiler/compile_view.ts

@@ -1,7 +1,7 @@
 import {ViewType} from '../../core_private';
 
-import {isPresent, isBlank} from '../../src/facade/lang';
+import {isPresent, isBlank} from '../facade/lang';
-import {ListWrapper} from '../../src/facade/collection';
+import {ListWrapper} from '../facade/collection';
 
 import * as o from '../output/output_ast';
 import {EventHandlerVars} from './constants';

modules/@angular/compiler/src/view_compiler/constants.ts

@@ -1,7 +1,7 @@
 import {ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
 import {ChangeDetectorState, ViewType} from '../../core_private';
 
-import {isBlank, resolveEnumToken} from '../../src/facade/lang';
+import {isBlank, resolveEnumToken} from '../facade/lang';
 import {CompileIdentifierMetadata} from '../compile_metadata';
 import * as o from '../output/output_ast';
 import {Identifiers} from '../identifiers';

modules/@angular/compiler/src/view_compiler/event_binder.ts

@@ -1,5 +1,5 @@
-import {isBlank, isPresent, StringWrapper} from '../../src/facade/lang';
+import {isBlank, isPresent, StringWrapper} from '../facade/lang';
-import {ListWrapper, StringMapWrapper} from '../../src/facade/collection';
+import {ListWrapper, StringMapWrapper} from '../facade/collection';
 
 import {EventHandlerVars, ViewProperties} from './constants';
 

modules/@angular/compiler/src/view_compiler/expression_converter.ts

@@ -1,5 +1,5 @@
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
-import {isBlank, isPresent, isArray} from '../../src/facade/lang';
+import {isBlank, isPresent, isArray} from '../facade/lang';
 
 import * as cdAst from '../expression_parser/ast';
 import * as o from '../output/output_ast';

modules/@angular/compiler/src/view_compiler/property_binder.ts

@@ -1,6 +1,6 @@
 import {EMPTY_STATE as EMPTY_ANIMATION_STATE, LifecycleHooks, isDefaultChangeDetectionStrategy, SecurityContext} from '../../core_private';
 
-import {isBlank, isPresent} from '../../src/facade/lang';
+import {isBlank, isPresent} from '../facade/lang';
 
 import * as cdAst from '../expression_parser/ast';
 import * as o from '../output/output_ast';

modules/@angular/compiler/src/view_compiler/util.ts

@@ -1,5 +1,5 @@
-import {isPresent, isBlank} from '../../src/facade/lang';
+import {isPresent, isBlank} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 
 import * as o from '../output/output_ast';
 import {

modules/@angular/compiler/src/view_compiler/view_binder.ts

@@ -1,6 +1,6 @@
 import {
   ListWrapper,
-} from '../../src/facade/collection';
+} from '../facade/collection';
 import {
   TemplateAst,
   TemplateAstVisitor,

modules/@angular/compiler/src/view_compiler/view_builder.ts

@@ -1,8 +1,8 @@
 import {ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
 import {isDefaultChangeDetectionStrategy, ViewType} from '../../core_private';
 
-import {isPresent, StringWrapper} from '../../src/facade/lang';
+import {isPresent, StringWrapper} from '../facade/lang';
-import {ListWrapper, StringMapWrapper, SetWrapper} from '../../src/facade/collection';
+import {ListWrapper, StringMapWrapper, SetWrapper} from '../facade/collection';
 
 import * as o from '../output/output_ast';
 import {Identifiers, identifierToken} from '../identifiers';

modules/@angular/core/src/change_detection/change_detection_util.ts

@@ -1,7 +1,7 @@
-import {looseIdentical, isPrimitive} from '../../src/facade/lang';
+import {looseIdentical, isPrimitive} from '../facade/lang';
-import {isListLikeIterable, areIterablesEqual} from '../../src/facade/collection';
+import {isListLikeIterable, areIterablesEqual} from '../facade/collection';
 
-export {looseIdentical} from '../../src/facade/lang';
+export {looseIdentical} from '../facade/lang';
 export var uninitialized: Object = /*@ts2dart_const*/ new Object();
 
 export function devModeEqual(a: any, b: any): boolean {

modules/@angular/core/src/change_detection/constants.ts

@@ -1,4 +1,4 @@
-import {isBlank} from '../../src/facade/lang';
+import {isBlank} from '../facade/lang';
 
 /**
  * Describes the current state of the change detector.

modules/@angular/core/src/change_detection/differs/default_iterable_differ.ts

@@ -1,5 +1,5 @@
-import {BaseException} from '../../../src/facade/exceptions';
+import {BaseException} from '../../facade/exceptions';
-import {isListLikeIterable, iterateListLike} from '../../../src/facade/collection';
+import {isListLikeIterable, iterateListLike} from '../../facade/collection';
 
 import {
   isBlank,
@@ -8,7 +8,7 @@ import {
   getMapKey,
   looseIdentical,
   isArray
-} from '../../../src/facade/lang';
+} from '../../facade/lang';
 
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {IterableDiffer, IterableDifferFactory, TrackByFn} from './iterable_differs';

modules/@angular/core/src/change_detection/differs/default_keyvalue_differ.ts

@@ -1,6 +1,6 @@
-import {MapWrapper, StringMapWrapper} from '../../../src/facade/collection';
+import {MapWrapper, StringMapWrapper} from '../../facade/collection';
-import {stringify, looseIdentical, isJsObject, isBlank} from '../../../src/facade/lang';
+import {stringify, looseIdentical, isJsObject, isBlank} from '../../facade/lang';
-import {BaseException} from '../../../src/facade/exceptions';
+import {BaseException} from '../../facade/exceptions';
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {KeyValueDiffer, KeyValueDifferFactory} from './keyvalue_differs';
 

modules/@angular/core/src/change_detection/differs/iterable_differs.ts

@@ -1,6 +1,6 @@
-import {isBlank, isPresent, getTypeNameForDebugging} from '../../../src/facade/lang';
+import {isBlank, isPresent, getTypeNameForDebugging} from '../../facade/lang';
-import {BaseException} from '../../../src/facade/exceptions';
+import {BaseException} from '../../facade/exceptions';
-import {ListWrapper} from '../../../src/facade/collection';
+import {ListWrapper} from '../../facade/collection';
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {Provider, SkipSelfMetadata, OptionalMetadata} from '../../di';
 

modules/@angular/core/src/change_detection/differs/keyvalue_differs.ts

@@ -1,6 +1,6 @@
-import {isBlank, isPresent} from '../../../src/facade/lang';
+import {isBlank, isPresent} from '../../facade/lang';
-import {BaseException} from '../../../src/facade/exceptions';
+import {BaseException} from '../../facade/exceptions';
-import {ListWrapper} from '../../../src/facade/collection';
+import {ListWrapper} from '../../facade/collection';
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {Provider, SkipSelfMetadata, OptionalMetadata} from '../../di';
 

modules/@angular/core/src/debug/debug_node.ts

@@ -1,5 +1,5 @@
-import {isPresent} from '../../src/facade/lang';
+import {isPresent} from '../facade/lang';
-import {Predicate, ListWrapper, MapWrapper} from '../../src/facade/collection';
+import {Predicate, ListWrapper, MapWrapper} from '../facade/collection';
 import {Injector} from '../di';
 import {RenderDebugInfo} from '../render/api';
 

modules/@angular/core/src/debug/debug_renderer.ts

@@ -1,4 +1,4 @@
-import {isPresent} from '../../src/facade/lang';
+import {isPresent} from '../facade/lang';
 import {Renderer, RootRenderer, RenderComponentType, RenderDebugInfo} from '../render/api';
 import {
   DebugNode,

modules/@angular/core/src/di/forward_ref.ts

@@ -1,4 +1,4 @@
-import {Type, stringify, isFunction} from '../../src/facade/lang';
+import {Type, stringify, isFunction} from '../facade/lang';
 
 /**
  * An interface that a function passed into {@link forwardRef} has to implement.

modules/@angular/core/src/di/injector.ts

@@ -1,4 +1,4 @@
-import {unimplemented} from '../../src/facade/exceptions';
+import {unimplemented} from '../facade/exceptions';
 
 const _THROW_IF_NOT_FOUND = /*@ts2dart_const*/ new Object();
 export const THROW_IF_NOT_FOUND = /*@ts2dart_const*/ _THROW_IF_NOT_FOUND;

modules/@angular/core/src/di/metadata.ts

@@ -1,4 +1,4 @@
-import {stringify} from '../../src/facade/lang';
+import {stringify} from '../facade/lang';
 
 /**
  * A parameter metadata that specifies a dependency.

modules/@angular/core/src/di/provider.ts

@@ -1,5 +1,5 @@
-import {normalizeBool, Type, isType, isBlank, isFunction, stringify} from '../../src/facade/lang';
+import {normalizeBool, Type, isType, isBlank, isFunction, stringify} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 
 /**
  * Describes how the {@link Injector} should instantiate a given token.

modules/@angular/core/src/di/reflective_exceptions.ts

@@ -1,6 +1,6 @@
-import {ListWrapper} from '../../src/facade/collection';
+import {ListWrapper} from '../facade/collection';
-import {stringify, isBlank} from '../../src/facade/lang';
+import {stringify, isBlank} from '../facade/lang';
-import {BaseException, WrappedException} from '../../src/facade/exceptions';
+import {BaseException, WrappedException} from '../facade/exceptions';
 import {ReflectiveKey} from './reflective_key';
 import {ReflectiveInjector} from './reflective_injector';
 

modules/@angular/core/src/di/reflective_injector.ts

@@ -1,4 +1,4 @@
-import {ListWrapper} from '../../src/facade/collection';
+import {ListWrapper} from '../facade/collection';
 import {Provider} from './provider';
 import {
   ResolvedReflectiveProvider,
@@ -13,8 +13,8 @@ import {
   InstantiationError,
   OutOfBoundsError
 } from './reflective_exceptions';
-import {Type} from '../../src/facade/lang';
+import {Type} from '../facade/lang';
-import {BaseException, unimplemented} from '../../src/facade/exceptions';
+import {BaseException, unimplemented} from '../facade/exceptions';
 import {ReflectiveKey} from './reflective_key';
 import {SelfMetadata, SkipSelfMetadata} from './metadata';
 import {Injector, THROW_IF_NOT_FOUND} from './injector';

modules/@angular/core/src/di/reflective_key.ts

@@ -1,5 +1,5 @@
-import {stringify, isBlank} from '../../src/facade/lang';
+import {stringify, isBlank} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 import {resolveForwardRef} from './forward_ref';
 
 /**

modules/@angular/core/src/di/reflective_provider.ts

@@ -3,8 +3,8 @@ import {
   isBlank,
   isPresent,
   isArray,
-} from '../../src/facade/lang';
+} from '../facade/lang';
-import {MapWrapper, ListWrapper} from '../../src/facade/collection';
+import {MapWrapper, ListWrapper} from '../facade/collection';
 import {reflector} from '../reflection/reflection';
 import {ReflectiveKey} from './reflective_key';
 import {

modules/@angular/core/src/linker/component_factory.ts

@@ -1,5 +1,5 @@
-import {Type, isPresent, isBlank} from '../../src/facade/lang';
+import {Type, isPresent, isBlank} from '../facade/lang';
-import {unimplemented} from '../../src/facade/exceptions';
+import {unimplemented} from '../facade/exceptions';
 import {ElementRef} from './element_ref';
 import {ViewRef, ViewRef_} from './view_ref';
 import {AppElement} from './element';

modules/@angular/core/src/linker/component_resolver.ts

@@ -1,6 +1,6 @@
-import {Type, isBlank, isString, stringify} from '../../src/facade/lang';
+import {Type, isBlank, isString, stringify} from '../facade/lang';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
-import {PromiseWrapper} from '../../src/facade/async';
+import {PromiseWrapper} from '../facade/async';
 import {reflector} from '../reflection/reflection';
 import {ComponentFactory} from './component_factory';
 import {Injectable} from '../di/decorators';

modules/@angular/core/src/linker/debug_context.ts

@@ -1,5 +1,5 @@
-import {isPresent, isBlank} from '../../src/facade/lang';
+import {isPresent, isBlank} from '../facade/lang';
-import {ListWrapper, StringMapWrapper} from '../../src/facade/collection';
+import {ListWrapper, StringMapWrapper} from '../facade/collection';
 import {Injector} from '../di';
 import {ViewType} from './view_type';
 import {RenderDebugInfo} from '../render/api';

modules/@angular/core/src/linker/dynamic_component_loader.ts

@@ -1,5 +1,5 @@
 import {ComponentResolver} from './component_resolver';
-import {Type, isPresent} from '../../src/facade/lang';
+import {Type, isPresent} from '../facade/lang';
 import {ComponentRef} from './component_factory';
 import {ViewContainerRef} from './view_container_ref';
 import {ResolvedReflectiveProvider} from '../di/reflective_provider';

modules/@angular/core/src/linker/element.ts

@@ -1,6 +1,6 @@
-import {isPresent} from '../../src/facade/lang';
+import {isPresent} from '../facade/lang';
-import {ListWrapper} from '../../src/facade/collection';
+import {ListWrapper} from '../facade/collection';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 
 import {AppView} from './view';
 import {ViewType} from './view_type';

modules/@angular/core/src/linker/exceptions.ts

@@ -1,4 +1,4 @@
-import {BaseException, WrappedException} from '../../src/facade/exceptions';
+import {BaseException, WrappedException} from '../facade/exceptions';
 
 /**
  * An error thrown if application changes model breaking the top-down data flow.

modules/@angular/core/src/linker/query_list.ts

@@ -1,6 +1,6 @@
-import {ListWrapper} from '../../src/facade/collection';
+import {ListWrapper} from '../facade/collection';
-import {getSymbolIterator} from '../../src/facade/lang';
+import {getSymbolIterator} from '../facade/lang';
-import {Observable, EventEmitter} from '../../src/facade/async';
+import {Observable, EventEmitter} from '../facade/async';
 
 
 /**

modules/@angular/core/src/linker/systemjs_component_resolver.ts

@@ -1,5 +1,5 @@
 import { ComponentResolver } from './component_resolver';
-import { Type, isString, global } from '../../src/facade/lang';
+import { Type, isString, global } from '../facade/lang';
 import { ComponentFactory } from './component_factory';
 
 /**

modules/@angular/core/src/linker/view_container_ref.ts

@@ -1,7 +1,7 @@
-import {ListWrapper} from '../../src/facade/collection';
+import {ListWrapper} from '../facade/collection';
-import {unimplemented} from '../../src/facade/exceptions';
+import {unimplemented} from '../facade/exceptions';
 import {Injector} from '../di/injector';
-import {isPresent} from '../../src/facade/lang';
+import {isPresent} from '../facade/lang';
 import {wtfCreateScope, wtfLeave, WtfScopeFn} from '../profile/profile';
 
 import {AppElement} from './element';

modules/@angular/core/src/linker/view_ref.ts

@@ -1,4 +1,4 @@
-import {unimplemented} from '../../src/facade/exceptions';
+import {unimplemented} from '../facade/exceptions';
 import {ChangeDetectorRef} from '../change_detection/change_detector_ref';
 import {AppView} from './view';
 import {ChangeDetectionStrategy} from '../change_detection/constants';

modules/@angular/core/src/linker/view_utils.ts

@@ -1,7 +1,7 @@
 import {SanitizationService} from '../security';
-import {isBlank, isPresent, looseIdentical} from '../../src/facade/lang';
+import {isBlank, isPresent, looseIdentical} from '../facade/lang';
-import {ListWrapper, StringMapWrapper} from '../../src/facade/collection';
+import {ListWrapper, StringMapWrapper} from '../facade/collection';
-import {BaseException} from '../../src/facade/exceptions';
+import {BaseException} from '../facade/exceptions';
 import {AppElement} from './element';
 import {ExpressionChangedAfterItHasBeenCheckedException} from './exceptions';
 import {devModeEqual} from '../change_detection/change_detection';

modules/@angular/core/src/metadata/di.ts

@@ -1,4 +1,4 @@
-import {stringify, isString, Type, StringWrapper} from '../../src/facade/lang';
+import {stringify, isString, Type, StringWrapper} from '../facade/lang';
 import {DependencyMetadata} from '../di/metadata';
 import {resolveForwardRef} from '../di/forward_ref';
 

modules/@angular/core/src/metadata/directives.ts

@@ -1,4 +1,4 @@
-import {isPresent, Type} from '../../src/facade/lang';
+import {isPresent, Type} from '../facade/lang';
 import {InjectableMetadata} from '../di/metadata';
 import {ViewEncapsulation} from './view';
 import {ChangeDetectionStrategy} from '../change_detection/constants';