repackaging: all the repackaging changes squashed

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

@@ -1,5 +1,4 @@
-import {Type} from 'angular2/src/facade/lang';
-
+import {Type} from '@angular/core';
 import {FORM_DIRECTIVES} from './forms';
 import {CORE_DIRECTIVES} from './directives';
 
@@ -17,7 +16,7 @@ import {CORE_DIRECTIVES} from './directives';
  *
  * ```typescript
  * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, NgModel, NgForm} from
- * 'angular2/common';
+ * '@angular/common';
  * import {OtherDirective} from './myDirectives';
  *
  * @Component({
@@ -33,7 +32,7 @@ import {CORE_DIRECTIVES} from './directives';
  * one could import all the common directives at once:
  *
  * ```typescript
- * import {COMMON_DIRECTIVES} from 'angular2/common';
+ * import {COMMON_DIRECTIVES} from '@angular/common';
  * import {OtherDirective} from './myDirectives';
  *
  * @Component({

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

@@ -1,4 +1,4 @@
-import {Type} from 'angular2/src/facade/lang';
+import {Type} from '../../src/facade/lang';
 import {NgClass} from './ng_class';
 import {NgFor} from './ng_for';
 import {NgIf} from './ng_if';
@@ -19,7 +19,7 @@ import {NgPlural, NgPluralCase} from './ng_plural';
  * Instead of writing:
  *
  * ```typescript
- * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/common';
+ * import {NgClass, NgIf, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from '@angular/common';
  * import {OtherDirective} from './myDirectives';
  *
  * @Component({
@@ -34,7 +34,7 @@ import {NgPlural, NgPluralCase} from './ng_plural';
  * one could import all the core directives at once:
  *
  * ```typescript
- * import {CORE_DIRECTIVES} from 'angular2/common';
+ * import {CORE_DIRECTIVES} from '@angular/common';
  * import {OtherDirective} from './myDirectives';
  *
  * @Component({

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

@@ -1,4 +1,3 @@
-import {isPresent, isString, isArray} from 'angular2/src/facade/lang';
 import {
   DoCheck,
   OnDestroy,
@@ -11,8 +10,9 @@ import {
   KeyValueDiffer,
   CollectionChangeRecord,
   KeyValueChangeRecord
-} from 'angular2/core';
-import {StringMapWrapper, isListLikeIterable} from 'angular2/src/facade/collection';
+} from '@angular/core';
+import {isPresent, isString, isArray} from '../../src/facade/lang';
+import {StringMapWrapper, isListLikeIterable} from '../../src/facade/collection';
 
 /**
  * The `NgClass` directive conditionally adds and removes CSS classes on an HTML element based on
@@ -33,8 +33,8 @@ import {StringMapWrapper, isListLikeIterable} from 'angular2/src/facade/collecti
  * ### Example ([live demo](http://plnkr.co/edit/a4YdtmWywhJ33uqfpPPn?p=preview)):
  *
  * ```
- * import {Component} from 'angular2/core';
- * import {NgClass} from 'angular2/common';
+ * import {Component} from '@angular/core';
+ * import {NgClass} from '@angular/common';
  *
  * @Component({
  *   selector: 'toggle-button',

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

@@ -7,14 +7,12 @@ import {
   ViewContainerRef,
   TemplateRef,
   EmbeddedViewRef,
-  TrackByFn
-} from 'angular2/core';
-import {isPresent, isBlank, stringify, getTypeNameForDebugging} from 'angular2/src/facade/lang';
-import {
+  TrackByFn,
   DefaultIterableDiffer,
   CollectionChangeRecord
-} from "../../core/change_detection/differs/default_iterable_differ";
-import {BaseException} from "../../facade/exceptions";
+} from '@angular/core';
+import {isPresent, isBlank, getTypeNameForDebugging} from '../../src/facade/lang';
+import {BaseException} from '../../src/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 'angular2/core';
-import {isBlank} from 'angular2/src/facade/lang';
+import {Directive, ViewContainerRef, TemplateRef} from '@angular/core';
+import {isBlank} from '../../src/facade/lang';
 
 /**
  * Removes or recreates a portion of the DOM tree based on an {expression}.

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

@@ -7,9 +7,10 @@ import {
   Attribute,
   AfterContentInit,
   Input
-} from 'angular2/core';
-import {isPresent, NumberWrapper} from 'angular2/src/facade/lang';
-import {Map} from 'angular2/src/facade/collection';
+} from '@angular/core';
+import {isPresent, NumberWrapper} from '../../src/facade/lang';
+import {Map} from '../../src/facade/collection';
+
 import {SwitchView} from './ng_switch';
 
 const _CATEGORY_DEFAULT = 'other';

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

@@ -1,3 +1,4 @@
+import {KeyValueChangeRecord} from '@angular/core';
 import {
   DoCheck,
   KeyValueDiffer,
@@ -5,9 +6,8 @@ import {
   ElementRef,
   Directive,
   Renderer
-} from 'angular2/core';
-import {isPresent, isBlank, print} from 'angular2/src/facade/lang';
-import {KeyValueChangeRecord} from "../../core/change_detection/differs/default_keyvalue_differ";
+} from '@angular/core';
+import {isPresent, isBlank} from '../../src/facade/lang';
 
 /**
  * The `NgStyle` directive changes styles based on a result of expression evaluation.
@@ -24,8 +24,8 @@ import {KeyValueChangeRecord} from "../../core/change_detection/differs/default_
  * ### Example ([live demo](http://plnkr.co/edit/YamGS6GkUh9GqWNQhCyM?p=preview)):
  *
  * ```
- * import {Component} from 'angular2/core';
- * import {NgStyle} from 'angular2/common';
+ * import {Component} from '@angular/core';
+ * import {NgStyle} from '@angular/common';
  *
  * @Component({
  *  selector: 'ngStyle-example',

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

@@ -1,6 +1,6 @@
-import {Directive, Host, ViewContainerRef, TemplateRef} from 'angular2/core';
-import {isPresent, isBlank, normalizeBlank} from 'angular2/src/facade/lang';
-import {ListWrapper, Map} from 'angular2/src/facade/collection';
+import {Directive, Host, ViewContainerRef, TemplateRef} from '@angular/core';
+import {isPresent, isBlank, normalizeBlank} from '../../src/facade/lang';
+import {ListWrapper, Map} from '../../src/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 'angular2/core';
-import {isPresent} from 'angular2/src/facade/lang';
+import {Directive, Input, ViewContainerRef, ViewRef, TemplateRef} from '@angular/core';
+import {isPresent} from '../../src/facade/lang';
 
 /**
  * Creates and inserts an embedded view based on a prepared `TemplateRef`.

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

@@ -1,7 +1,7 @@
 // TS does not have Observables
 
 // I need to be here to make TypeScript think this is a module.
-import {} from 'angular2/src/facade/lang';
+import {} from '../../src/facade/lang';
 
 /**
  * This module exists in Dart, but not in Typescript. This exported symbol

modules/@angular/common/src/facade

@@ -0,0 +1 @@
+../../facade/src

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

@@ -7,9 +7,7 @@
  * to read information
  * from the form DOM elements.
  *
- * This module is not included in the `angular2` module; you must import the forms module
- * explicitly.
- *
+ * Forms providers are not included in default providers; you must import these providers explicitly.
  */
 export {AbstractControl, Control, ControlGroup, ControlArray} from './forms/model';
 
@@ -43,7 +41,7 @@ export {
 export {FormBuilder} from './forms/form_builder';
 import {FormBuilder} from './forms/form_builder';
 import {RadioControlRegistry} from './forms/directives/radio_control_value_accessor';
-import {Type} from 'angular2/src/facade/lang';
+import {Type} from '@angular/core';
 
 /**
  * Shorthand set of providers used for building Angular forms.

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

@@ -1,4 +1,4 @@
-import {Type} from 'angular2/src/facade/lang';
+import {Type} from '@angular/core';
 import {NgControlName} from './directives/ng_control_name';
 import {NgFormControl} from './directives/ng_form_control';
 import {NgModel} from './directives/ng_model';

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

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

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

@@ -1,5 +1,4 @@
-import {Directive, Renderer, ElementRef, Self, forwardRef, Provider} from 'angular2/core';
-
+import {Directive, Renderer, ElementRef, Self, forwardRef, Provider} from '@angular/core';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
 
 export const CHECKBOX_VALUE_ACCESSOR: any = /*@ts2dart_const*/ {

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

@@ -1,4 +1,4 @@
-import {OpaqueToken} from 'angular2/core';
+import {OpaqueToken} from '@angular/core';
 
 /**
  * A bridge between a control and a native element.

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

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

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

@@ -42,4 +42,4 @@ export interface Form {
    * Update the model for a particular control with a new value.
    */
   updateModel(dir: NgControl, value: any): void;
-}
+}

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

@@ -1,6 +1,7 @@
+import {unimplemented} from '../../../src/facade/exceptions';
+
 import {ControlValueAccessor} from './control_value_accessor';
 import {AbstractControlDirective} from './abstract_control_directive';
-import {unimplemented} from 'angular2/src/facade/exceptions';
 import {AsyncValidatorFn, ValidatorFn} from './validators';
 
 /**

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

@@ -9,8 +9,7 @@ import {
   forwardRef,
   Provider,
   Self
-} from 'angular2/core';
-
+} from '@angular/core';
 import {ControlContainer} from './control_container';
 import {controlPath, composeValidators, composeAsyncValidators} from './shared';
 import {ControlGroup} from '../model';
@@ -37,7 +36,7 @@ export const controlGroupProvider: any =
  *   directives: [FORM_DIRECTIVES],
  *   template: `
  *     <div>
- *       <h2>Angular2 Control &amp; ControlGroup Example</h2>
+ *       <h2>Angular Control &amp; ControlGroup Example</h2>
  *       <form #f="ngForm">
  *         <div ngControlGroup="name" #cg-name="form">
  *           <h3>Enter your name:</h3>

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

@@ -1,5 +1,3 @@
-import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
-
 import {
   OnChanges,
   OnDestroy,
@@ -13,8 +11,9 @@ import {
   Inject,
   Optional,
   Self
-} from 'angular2/core';
+} from '@angular/core';
 
+import {EventEmitter, ObservableWrapper} from '../../../src/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 'angular2/core';
+import {Directive, Self} from '@angular/core';
 import {NgControl} from './ng_control';
-import {isBlank, isPresent} from 'angular2/src/facade/lang';
+import {isPresent} from '../../../src/facade/lang';
 
 /**
  * Directive automatically applied to Angular forms that sets CSS classes

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

@@ -1,25 +1,22 @@
+import {Directive, forwardRef, Provider, Optional, Inject, Self} from '@angular/core';
 import {
   PromiseWrapper,
   ObservableWrapper,
   EventEmitter,
   PromiseCompleter
-} from 'angular2/src/facade/async';
-import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
-import {Directive, forwardRef, Provider, Optional, Inject, Self} from 'angular2/core';
+} from '../../../src/facade/async';
+import {ListWrapper} from '../../../src/facade/collection';
+import {isPresent} from '../../../src/facade/lang';
 import {NgControl} from './ng_control';
 import {Form} from './form_interface';
 import {NgControlGroup} from './ng_control_group';
 import {ControlContainer} from './control_container';
 import {AbstractControl, ControlGroup, Control} from '../model';
 import {setUpControl, setUpControlGroup, composeValidators, composeAsyncValidators} from './shared';
-import {Validators, NG_VALIDATORS, NG_ASYNC_VALIDATORS} from '../validators';
+import {NG_VALIDATORS, NG_ASYNC_VALIDATORS} from '../validators';
 
 export const formDirectiveProvider: any =
-    /*@ts2dart_const*/ /* @ts2dart_Provider */ {
-      provide: ControlContainer,
-      useExisting: forwardRef(() => NgForm)
-    };
+    /*@ts2dart_const*/ {provide: ControlContainer, useExisting: forwardRef(() => NgForm)};
 
 /**
  * If `NgForm` is bound in a component, `<form>` elements in that component will be

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

@@ -1,5 +1,3 @@
-import {StringMapWrapper} from 'angular2/src/facade/collection';
-import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
 import {
   OnChanges,
   SimpleChange,
@@ -10,10 +8,14 @@ import {
   Inject,
   Optional,
   Self
-} from 'angular2/core';
+} from '@angular/core';
+
+import {StringMapWrapper} from '../../../src/facade/collection';
+import {EventEmitter, ObservableWrapper} from '../../../src/facade/async';
+
 import {NgControl} from './ng_control';
 import {Control} from '../model';
-import {Validators, NG_VALIDATORS, NG_ASYNC_VALIDATORS} from '../validators';
+import {NG_VALIDATORS, NG_ASYNC_VALIDATORS} from '../validators';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
 import {
   setUpControl,

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

@@ -1,7 +1,3 @@
-import {isBlank} from 'angular2/src/facade/lang';
-import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {BaseException} from 'angular2/src/facade/exceptions';
-import {ObservableWrapper, EventEmitter} from 'angular2/src/facade/async';
 import {
   SimpleChange,
   OnChanges,
@@ -11,7 +7,11 @@ import {
   Inject,
   Optional,
   Self
-} from 'angular2/core';
+} from '@angular/core';
+import {isBlank} from '../../../src/facade/lang';
+import {ListWrapper, StringMapWrapper} from '../../../src/facade/collection';
+import {BaseException} from '../../../src/facade/exceptions';
+import {ObservableWrapper, EventEmitter} from '../../../src/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

@@ -1,4 +1,3 @@
-import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
 import {
   OnChanges,
   SimpleChange,
@@ -8,7 +7,8 @@ import {
   Inject,
   Optional,
   Self
-} from 'angular2/core';
+} from '@angular/core';
+import {EventEmitter, ObservableWrapper} from '../../../src/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/normalize_validator.ts

@@ -1,4 +1,4 @@
-import {AbstractControl} from "../model";
+import {AbstractControl} from '../model';
 import {Validator, ValidatorFn, AsyncValidatorFn} from './validators';
 
 export function normalizeValidator(validator: ValidatorFn | Validator): ValidatorFn {

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

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

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

@@ -2,23 +2,21 @@ import {
   Directive,
   ElementRef,
   Renderer,
-  Self,
   forwardRef,
   Provider,
-  Attribute,
   Input,
   OnInit,
   OnDestroy,
   Injector,
   Injectable
-} from 'angular2/core';
+} from '@angular/core';
+import {isPresent} from '../../../src/facade/lang';
+import {ListWrapper} from '../../../src/facade/collection';
 import {
   NG_VALUE_ACCESSOR,
   ControlValueAccessor
-} from 'angular2/src/common/forms/directives/control_value_accessor';
-import {NgControl} from 'angular2/src/common/forms/directives/ng_control';
-import {looseIdentical, isPresent} from 'angular2/src/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
+} from './control_value_accessor';
+import {NgControl} from './ng_control';
 
 export const RADIO_VALUE_ACCESSOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
   provide: NG_VALUE_ACCESSOR,

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

@@ -8,17 +8,17 @@ import {
   Host,
   OnDestroy,
   Optional
-} from 'angular2/core';
-import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
+} from '@angular/core';
 import {
   StringWrapper,
   isPrimitive,
   isPresent,
   isBlank,
   looseIdentical
-} from 'angular2/src/facade/lang';
+} from '../../../src/facade/lang';
+import {MapWrapper} from '../../../src/facade/collection';
 
-import {MapWrapper} from 'angular2/src/facade/collection';
+import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor';
 
 export const SELECT_VALUE_ACCESSOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
   provide: NG_VALUE_ACCESSOR,

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

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

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

@@ -1,5 +1,5 @@
-import {forwardRef, Attribute, Directive} from 'angular2/core';
-import {NumberWrapper} from 'angular2/src/facade/lang';
+import {forwardRef, Attribute, Directive} from '@angular/core';
+import {NumberWrapper} from '../../facade/lang';
 import {Validators, NG_VALIDATORS} from '../validators';
 import {AbstractControl} from '../model';
 import * as modelModule from '../model';

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

@@ -1,6 +1,6 @@
-import {Injectable} from 'angular2/core';
-import {StringMapWrapper} from 'angular2/src/facade/collection';
-import {isPresent, isArray, Type} from 'angular2/src/facade/lang';
+import {Injectable} from '@angular/core';
+import {StringMapWrapper} from '../../src/facade/collection';
+import {isPresent, isArray} from '../../src/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 'angular2/src/facade/lang';
-import {Observable, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
-import {PromiseWrapper} from 'angular2/src/facade/promise';
-import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
+import {isPresent, isBlank, normalizeBool} from '../../src/facade/lang';
+import {Observable, EventEmitter, ObservableWrapper} from '../../src/facade/async';
+import {PromiseWrapper} from '../../src/facade/promise';
+import {StringMapWrapper, ListWrapper} from '../../src/facade/collection';
 import {ValidatorFn, AsyncValidatorFn} from './directives/validators';
 
 /**

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

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

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

@@ -1,5 +1,5 @@
-export * from './browser/location/platform_location';
-export * from './browser/location/location_strategy';
-export * from './browser/location/hash_location_strategy';
-export * from './browser/location/path_location_strategy';
-export * from './browser/location/location';
+export * from './location/platform_location';
+export * from './location/location_strategy';
+export * from './location/hash_location_strategy';
+export * from './location/path_location_strategy';
+export * from './location/location';

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

@@ -1,8 +1,10 @@
-import {Injectable, Inject, Optional} from 'angular2/core';
+import {Injectable, Inject, Optional} from '@angular/core';
+import {isPresent} from '../../src/facade/lang';
+
 import {LocationStrategy, APP_BASE_HREF} from './location_strategy';
 import {Location} from './location';
 import {UrlChangeListener, PlatformLocation} from './platform_location';
-import {isPresent} from 'angular2/src/facade/lang';
+
 
 /**
  * `HashLocationStrategy` is a {@link LocationStrategy} used to configure the
@@ -16,17 +18,17 @@ import {isPresent} from 'angular2/src/facade/lang';
  * ### Example
  *
  * ```
- * import {Component, provide} from 'angular2/core';
+ * import {Component, provide} from '@angular/core';
  * import {
  *   Location,
  *   LocationStrategy,
  *   HashLocationStrategy
- * } from 'angular2/platform/common';
+ * } from '@angular/common';
  * import {
  *   ROUTER_DIRECTIVES,
  *   ROUTER_PROVIDERS,
  *   RouteConfig
- * } from 'angular2/router';
+ * } from '@angular/router';
  *
  * @Component({directives: [ROUTER_DIRECTIVES]})
  * @RouteConfig([

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

@@ -1,5 +1,6 @@
-import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
-import {Injectable, Inject} from 'angular2/core';
+import {Injectable, Inject} from '@angular/core';
+import {EventEmitter, ObservableWrapper} from '../../src/facade/async';
+
 import {LocationStrategy} from './location_strategy';
 
 /**
@@ -21,13 +22,13 @@ import {LocationStrategy} from './location_strategy';
  * ### Example
  *
  * ```
- * import {Component} from 'angular2/core';
- * import {Location} from 'angular2/platform/common';
+ * import {Component} from '@angular/core';
+ * import {Location} from '@angular/common';
  * import {
  *   ROUTER_DIRECTIVES,
  *   ROUTER_PROVIDERS,
  *   RouteConfig
- * } from 'angular2/router';
+ * } from '@angular/router';
  *
  * @Component({directives: [ROUTER_DIRECTIVES]})
  * @RouteConfig([

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

@@ -1,4 +1,4 @@
-import {OpaqueToken} from 'angular2/core';
+import {OpaqueToken} from '@angular/core';
 import {UrlChangeListener} from './platform_location';
 
 /**
@@ -40,9 +40,9 @@ export abstract class LocationStrategy {
  * ### Example
  *
  * ```
- * import {Component} from 'angular2/core';
- * import {ROUTER_DIRECTIVES, ROUTER_PROVIDERS, RouteConfig} from 'angular2/router';
- * import {APP_BASE_HREF} from 'angular2/platform/common';
+ * import {Component} from '@angular/core';
+ * import {ROUTER_DIRECTIVES, ROUTER_PROVIDERS, RouteConfig} from '@angular/router';
+ * import {APP_BASE_HREF} from '@angular/common';
  *
  * @Component({directives: [ROUTER_DIRECTIVES]})
  * @RouteConfig([

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

@@ -1,6 +1,7 @@
-import {Injectable, Inject, Optional} from 'angular2/core';
-import {isBlank} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
+import {Injectable, Inject, Optional} from '@angular/core';
+import {isBlank} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
+
 import {PlatformLocation, UrlChangeListener} from './platform_location';
 import {LocationStrategy, APP_BASE_HREF} from './location_strategy';
 import {Location} from './location';
@@ -25,17 +26,17 @@ import {Location} from './location';
  * ### Example
  *
  * ```
- * import {Component, provide} from 'angular2/core';
- * import {bootstrap} from 'angular2/platform/browser';
+ * import {Component, provide} from '@angular/core';
+ * import {bootstrap} from '@angular/platform-browser/browser';
  * import {
  *   Location,
  *   APP_BASE_HREF
- * } from 'angular2/platform/common';
+ * } from '@angular/common';
  * import {
  *   ROUTER_DIRECTIVES,
  *   ROUTER_PROVIDERS,
  *   RouteConfig
- * } from 'angular2/router';
+ * } from '@angular/router';
  *
  * @Component({directives: [ROUTER_DIRECTIVES]})
  * @RouteConfig([

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

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

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

@@ -1,15 +1,12 @@
+import {PipeTransform, Pipe, Injectable} from '@angular/core';
 import {
   isDate,
   isNumber,
-  isPresent,
-  Date,
   DateWrapper,
   isBlank,
-  FunctionWrapper
-} from 'angular2/src/facade/lang';
-import {DateFormatter} from 'angular2/src/facade/intl';
-import {PipeTransform, WrappedValue, Pipe, Injectable} from 'angular2/core';
-import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
+} from '../../src/facade/lang';
+import {DateFormatter} from '../../src/facade/intl';
+import {StringMapWrapper} from '../../src/facade/collection';
 
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 

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

@@ -1,5 +1,10 @@
-import {isStringMap, StringWrapper, isPresent, RegExpWrapper} from 'angular2/src/facade/lang';
-import {Injectable, PipeTransform, Pipe} from 'angular2/core';
+import {Injectable, PipeTransform, Pipe} from '@angular/core';
+import {
+  isStringMap,
+  StringWrapper,
+  isPresent,
+  RegExpWrapper
+} from '../../src/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 {isStringMap} from 'angular2/src/facade/lang';
-import {StringMapWrapper} from 'angular2/src/facade/collection';
-import {Injectable, PipeTransform, Pipe} from 'angular2/core';
+import {Injectable, PipeTransform, Pipe} from '@angular/core';
+import {isStringMap} from '../../src/facade/lang';
+import {StringMapWrapper} from '../../src/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 'angular2/src/facade/lang';
-import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
+import {Type, stringify} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
 
 export class InvalidPipeArgumentException extends BaseException {
   constructor(type: Type, value: Object) {

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

@@ -1,5 +1,6 @@
-import {isBlank, isPresent, Json} from 'angular2/src/facade/lang';
-import {Injectable, PipeTransform, WrappedValue, Pipe} from 'angular2/core';
+import {Injectable, PipeTransform, WrappedValue, Pipe} from '@angular/core';
+import {Json} from '../../src/facade/lang';
+
 
 /**
  * Transforms any input value using `JSON.stringify`. Useful for debugging.

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

@@ -1,5 +1,5 @@
-import {isString, isBlank} from 'angular2/src/facade/lang';
-import {Injectable, PipeTransform, WrappedValue, Pipe} from 'angular2/core';
+import {Injectable, PipeTransform, WrappedValue, Pipe} from '@angular/core';
+import {isString, isBlank} from '../../src/facade/lang';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
 /**
@@ -9,6 +9,7 @@ import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
  *
  * {@example core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts region='LowerUpperPipe'}
  */
+/* @ts2dart_const */
 @Pipe({name: 'lowercase'})
 @Injectable()
 export class LowerCasePipe implements PipeTransform {

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

@@ -1,15 +1,15 @@
+import {Injectable, PipeTransform, WrappedValue, Pipe} from '@angular/core';
+
 import {
   isNumber,
   isPresent,
   isBlank,
-  StringWrapper,
   NumberWrapper,
   RegExpWrapper,
-  FunctionWrapper
-} from 'angular2/src/facade/lang';
-import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
-import {NumberFormatter, NumberFormatStyle} from 'angular2/src/facade/intl';
-import {Injectable, PipeTransform, WrappedValue, Pipe} from 'angular2/core';
+} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
+import {NumberFormatter, NumberFormatStyle} from '../../src/facade/intl';
+import {ListWrapper} from '../../src/facade/collection';
 
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 

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

@@ -1,3 +1,5 @@
+import {Injectable, PipeTransform, Pipe} from '@angular/core';
+
 import {
   isBlank,
   isString,
@@ -5,8 +7,8 @@ import {
   isFunction,
   RegExpWrapper,
   StringWrapper
-} from 'angular2/src/facade/lang';
-import {Injectable, PipeTransform, Pipe} from 'angular2/core';
+} from '../../src/facade/lang';
+
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
 /**

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

@@ -1,6 +1,9 @@
-import {isBlank, isString, isArray, StringWrapper} from 'angular2/src/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
-import {Injectable, PipeTransform, WrappedValue, Pipe} from 'angular2/core';
+import {Injectable, PipeTransform, WrappedValue, Pipe} from '@angular/core';
+
+import {isBlank, isString, isArray, StringWrapper} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
+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 {isString, isBlank} from 'angular2/src/facade/lang';
-import {PipeTransform, WrappedValue, Injectable, Pipe} from 'angular2/core';
+import {PipeTransform, WrappedValue, Injectable, Pipe} from '@angular/core';
+import {isString, isBlank} from '../../src/facade/lang';
 import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception';
 
 /**