chore: update all import paths

modules/angular2/src/web_workers/shared/api.ts

@@ -1,6 +1,6 @@
-import {CONST_EXPR} from "angular2/src/facade/lang";
+import {CONST_EXPR} from "angular2/src/core/facade/lang";
 import {OpaqueToken} from "angular2/di";
-import {RenderElementRef, RenderViewRef} from "angular2/src/render/api";
+import {RenderElementRef, RenderViewRef} from "angular2/src/core/render/api";
 
 export const ON_WEB_WORKER = CONST_EXPR(new OpaqueToken('WebWorker.onWebWorker'));
 

modules/angular2/src/web_workers/shared/client_message_broker.ts

@@ -1,17 +1,17 @@
 /// <reference path="../../../globals.d.ts" />
 import {MessageBus} from "angular2/src/web_workers/shared/message_bus";
-import {print, isPresent, DateWrapper, stringify} from "../../facade/lang";
+import {print, isPresent, DateWrapper, stringify} from "angular2/src/core/facade/lang";
 import {
   Promise,
   PromiseCompleter,
   PromiseWrapper,
   ObservableWrapper,
   EventEmitter
-} from "angular2/src/facade/async";
-import {ListWrapper, StringMapWrapper, MapWrapper} from "../../facade/collection";
+} from "angular2/src/core/facade/async";
+import {ListWrapper, StringMapWrapper, MapWrapper} from "angular2/src/core/facade/collection";
 import {Serializer} from "angular2/src/web_workers/shared/serializer";
 import {Injectable} from "angular2/di";
-import {Type} from "angular2/src/facade/lang";
+import {Type} from "angular2/src/core/facade/lang";
 
 @Injectable()
 export class ClientMessageBrokerFactory {

modules/angular2/src/web_workers/shared/isolate_message_bus.dart

@@ -5,7 +5,7 @@ import 'dart:async';
 import 'dart:core';
 import 'package:angular2/src/web_workers/shared/message_bus.dart'
     show MessageBus, MessageBusSink, MessageBusSource;
-import 'package:angular2/src/facade/async.dart';
+import 'package:angular2/src/core/facade/async.dart';
 
 class IsolateMessageBus implements MessageBus {
   final IsolateMessageBusSink sink;

modules/angular2/src/web_workers/shared/message_bus.ts

@@ -1,5 +1,5 @@
-import {EventEmitter} from 'angular2/src/facade/async';
-import {BaseException} from 'angular2/src/facade/lang';
+import {EventEmitter} from 'angular2/src/core/facade/async';
+import {BaseException} from 'angular2/src/core/facade/lang';
 
 function _abstract() {
   throw new BaseException("This method is abstract");

modules/angular2/src/web_workers/shared/post_message_bus.ts

@@ -3,8 +3,8 @@ import {
   MessageBusSource,
   MessageBusSink
 } from "angular2/src/web_workers/shared/message_bus";
-import {EventEmitter} from 'angular2/src/facade/async';
-import {StringMap, StringMapWrapper} from 'angular2/src/facade/collection';
+import {EventEmitter} from 'angular2/src/core/facade/async';
+import {StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {Injectable} from "angular2/di";
 
 /**

modules/angular2/src/web_workers/shared/render_proto_view_ref_store.ts

@@ -1,5 +1,5 @@
 import {Injectable, Inject} from "angular2/di";
-import {RenderProtoViewRef} from "angular2/src/render/api";
+import {RenderProtoViewRef} from "angular2/src/core/render/api";
 import {ON_WEB_WORKER} from "angular2/src/web_workers/shared/api";
 
 @Injectable()

modules/angular2/src/web_workers/shared/render_view_with_fragments_store.ts

@@ -1,7 +1,11 @@
 import {Injectable, Inject} from "angular2/di";
-import {RenderViewRef, RenderFragmentRef, RenderViewWithFragments} from "angular2/src/render/api";
+import {
+  RenderViewRef,
+  RenderFragmentRef,
+  RenderViewWithFragments
+} from "angular2/src/core/render/api";
 import {ON_WEB_WORKER} from "angular2/src/web_workers/shared/api";
-import {List, ListWrapper} from "angular2/src/facade/collection";
+import {List, ListWrapper} from "angular2/src/core/facade/collection";
 
 @Injectable()
 export class RenderViewWithFragmentsStore {

modules/angular2/src/web_workers/shared/serializer.ts

@@ -5,7 +5,7 @@ import {
   serializeEnum,
   deserializeEnum,
   BaseException
-} from "angular2/src/facade/lang";
+} from "angular2/src/core/facade/lang";
 import {
   List,
   ListWrapper,
@@ -13,7 +13,7 @@ import {
   StringMap,
   StringMapWrapper,
   MapWrapper
-} from "angular2/src/facade/collection";
+} from "angular2/src/core/facade/collection";
 import {
   ProtoViewDto,
   RenderDirectiveMetadata,
@@ -30,10 +30,10 @@ import {
   ViewType,
   ViewEncapsulation,
   PropertyBindingType
-} from "angular2/src/render/api";
+} from "angular2/src/core/render/api";
 import {WebWorkerElementRef} from 'angular2/src/web_workers/shared/api';
-import {AST, ASTWithSource} from 'angular2/src/change_detection/change_detection';
-import {Parser} from "angular2/src/change_detection/parser/parser";
+import {AST, ASTWithSource} from 'angular2/src/core/change_detection/change_detection';
+import {Parser} from "angular2/src/core/change_detection/parser/parser";
 import {Injectable} from "angular2/di";
 import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store';
 import {

modules/angular2/src/web_workers/shared/service_message_broker.ts

@@ -1,9 +1,14 @@
 import {Injectable} from 'angular2/di';
-import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection';
+import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection';
 import {Serializer} from "angular2/src/web_workers/shared/serializer";
-import {isPresent, Type, FunctionWrapper} from "angular2/src/facade/lang";
+import {isPresent, Type, FunctionWrapper} from "angular2/src/core/facade/lang";
 import {MessageBus} from "angular2/src/web_workers/shared/message_bus";
-import {EventEmitter, Promise, PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async';
+import {
+  EventEmitter,
+  Promise,
+  PromiseWrapper,
+  ObservableWrapper
+} from 'angular2/src/core/facade/async';
 
 @Injectable()
 export class ServiceMessageBrokerFactory {

modules/angular2/src/web_workers/ui/application.ts

@@ -4,7 +4,7 @@ import {
   PostMessageBusSource
 } from 'angular2/src/web_workers/shared/post_message_bus';
 import {MessageBus} from 'angular2/src/web_workers/shared/message_bus';
-import {BaseException} from "angular2/src/facade/lang";
+import {BaseException} from "angular2/src/core/facade/lang";
 import {bootstrapUICommon} from "angular2/src/web_workers/ui/impl";
 
 /**

modules/angular2/src/web_workers/ui/di_bindings.ts

@@ -1,8 +1,8 @@
 // TODO (jteplitz602): This whole file is nearly identical to core/application.ts.
 // There should be a way to refactor application so that this file is unnecessary. See #3277
 import {Injector, bind, Binding} from "angular2/di";
-import {Reflector, reflector} from 'angular2/src/reflection/reflection';
-import {List, ListWrapper} from 'angular2/src/facade/collection';
+import {Reflector, reflector} from 'angular2/src/core/reflection/reflection';
+import {List, ListWrapper} from 'angular2/src/core/facade/collection';
 import {
   Parser,
   Lexer,
@@ -10,16 +10,16 @@ import {
   DynamicChangeDetection,
   JitChangeDetection,
   PreGeneratedChangeDetection
-} from 'angular2/src/change_detection/change_detection';
+} from 'angular2/src/core/change_detection/change_detection';
 import {DEFAULT_PIPES} from 'angular2/pipes';
-import {EventManager, DomEventsPlugin} from 'angular2/src/render/dom/events/event_manager';
+import {EventManager, DomEventsPlugin} from 'angular2/src/core/render/dom/events/event_manager';
 import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
-import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter';
-import {KeyEventsPlugin} from 'angular2/src/render/dom/events/key_events';
-import {HammerGesturesPlugin} from 'angular2/src/render/dom/events/hammer_gestures';
+import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
+import {KeyEventsPlugin} from 'angular2/src/core/render/dom/events/key_events';
+import {HammerGesturesPlugin} from 'angular2/src/core/render/dom/events/hammer_gestures';
 import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/compiler/view_pool';
-import {Renderer, RenderCompiler} from 'angular2/src/render/api';
-import {AppRootUrl} from 'angular2/src/services/app_root_url';
+import {Renderer, RenderCompiler} from 'angular2/src/core/render/api';
+import {AppRootUrl} from 'angular2/src/core/services/app_root_url';
 import {
   DomRenderer,
   DOCUMENT,
@@ -27,38 +27,40 @@ import {
   APP_ID_RANDOM_BINDING,
   MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE,
   TemplateCloner
-} from 'angular2/src/render/render';
-import {ElementSchemaRegistry} from 'angular2/src/render/dom/schema/element_schema_registry';
-import {DomElementSchemaRegistry} from 'angular2/src/render/dom/schema/dom_element_schema_registry';
+} from 'angular2/src/core/render/render';
+import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry';
+import {
+  DomElementSchemaRegistry
+} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry';
 import {
   SharedStylesHost,
   DomSharedStylesHost
-} from 'angular2/src/render/dom/view/shared_styles_host';
-import {DOM} from 'angular2/src/dom/dom_adapter';
+} from 'angular2/src/core/render/dom/view/shared_styles_host';
+import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
 import {AppViewManager} from 'angular2/src/core/compiler/view_manager';
 import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils';
 import {AppViewListener} from 'angular2/src/core/compiler/view_listener';
 import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory';
 import {ViewResolver} from 'angular2/src/core/compiler/view_resolver';
-import {ViewLoader} from 'angular2/src/render/dom/compiler/view_loader';
+import {ViewLoader} from 'angular2/src/core/render/dom/compiler/view_loader';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
 import {ExceptionHandler} from 'angular2/src/core/exception_handler';
 import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper';
-import {StyleInliner} from 'angular2/src/render/dom/compiler/style_inliner';
+import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner';
 import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
-import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver';
-import {UrlResolver} from 'angular2/src/services/url_resolver';
+import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver';
+import {UrlResolver} from 'angular2/src/core/services/url_resolver';
 import {Testability} from 'angular2/src/core/testability/testability';
-import {XHR} from 'angular2/src/render/xhr';
-import {XHRImpl} from 'angular2/src/render/xhr_impl';
+import {XHR} from 'angular2/src/core/render/xhr';
+import {XHRImpl} from 'angular2/src/core/render/xhr_impl';
 import {Serializer} from 'angular2/src/web_workers/shared/serializer';
 import {ON_WEB_WORKER} from 'angular2/src/web_workers/shared/api';
 import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store';
 import {
   RenderViewWithFragmentsStore
 } from 'angular2/src/web_workers/shared/render_view_with_fragments_store';
-import {AnchorBasedAppRootUrl} from 'angular2/src/services/anchor_based_app_root_url';
+import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url';
 import {WebWorkerMain} from 'angular2/src/web_workers/ui/impl';
 import {MessageBus} from 'angular2/src/web_workers/shared/message_bus';
 import {MessageBasedRenderCompiler} from 'angular2/src/web_workers/ui/render_compiler';

modules/angular2/src/web_workers/ui/event_dispatcher.ts

@@ -1,7 +1,7 @@
 import {
   RenderViewRef,
   RenderEventDispatcher,
-} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/api';
 import {Serializer} from 'angular2/src/web_workers/shared/serializer';
 import {
   serializeMouseEvent,
@@ -9,9 +9,9 @@ import {
   serializeGenericEvent,
   serializeEventWithTarget
 } from 'angular2/src/web_workers/ui/event_serializer';
-import {BaseException} from "angular2/src/facade/lang";
-import {StringMapWrapper} from 'angular2/src/facade/collection';
-import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
+import {BaseException} from "angular2/src/core/facade/lang";
+import {StringMapWrapper} from 'angular2/src/core/facade/collection';
+import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 
 export class EventDispatcher implements RenderEventDispatcher {
   constructor(private _viewRef: RenderViewRef, private _sink: EventEmitter,

modules/angular2/src/web_workers/ui/event_serializer.dart

@@ -1,6 +1,6 @@
 library angular2.src.web_workers.event_serializer;
 
-import 'package:angular2/src/facade/collection.dart';
+import 'package:angular2/src/core/facade/collection.dart';
 // TODO(jteplitz602): Remove Mirrors from serialization #3348
 @MirrorsUsed(
     symbols: "altKey, bubbles, button, cancelable, client, ctrlKey, " +

modules/angular2/src/web_workers/ui/event_serializer.ts

@@ -1,5 +1,5 @@
-import {StringMap, Set} from 'angular2/src/facade/collection';
-import {isPresent} from 'angular2/src/facade/lang';
+import {StringMap, Set} from 'angular2/src/core/facade/collection';
+import {isPresent} from 'angular2/src/core/facade/lang';
 
 const MOUSE_EVENT_PROPERTIES = [
   "altKey",

modules/angular2/src/web_workers/ui/impl.ts

@@ -9,8 +9,8 @@ import {createInjector} from "./di_bindings";
 import {MessageBus, MessageBusSink} from "angular2/src/web_workers/shared/message_bus";
 import {createNgZone} from 'angular2/src/core/application_common';
 import {Injectable} from 'angular2/di';
-import {BrowserDomAdapter} from 'angular2/src/dom/browser_adapter';
-import {wtfInit} from 'angular2/src/profile/wtf_init';
+import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
+import {wtfInit} from 'angular2/src/core/profile/wtf_init';
 import {WebWorkerSetup} from 'angular2/src/web_workers/ui/setup';
 import {MessageBasedRenderCompiler} from 'angular2/src/web_workers/ui/render_compiler';
 import {MessageBasedRenderer} from 'angular2/src/web_workers/ui/renderer';

modules/angular2/src/web_workers/ui/render_compiler.ts

@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/di';
+import {Injectable} from 'angular2/src/core/di/decorators';
 import {
   RenderDirectiveMetadata,
   ProtoViewDto,
@@ -6,7 +6,7 @@ import {
   RenderProtoViewRef,
   RenderProtoViewMergeMapping,
   RenderCompiler
-} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/api';
 import {RENDER_COMPILER_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api';
 import {bind} from './bind';
 import {ServiceMessageBrokerFactory} from 'angular2/src/web_workers/shared/service_message_broker';

modules/angular2/src/web_workers/ui/renderer.ts

@@ -6,10 +6,10 @@ import {
   RenderFragmentRef,
   RenderProtoViewRef,
   Renderer
-} from 'angular2/src/render/api';
+} from 'angular2/src/core/render/api';
 import {WebWorkerElementRef} from 'angular2/src/web_workers/shared/api';
 import {EVENT_CHANNEL, RENDERER_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api';
-import {BaseException, Type} from 'angular2/src/facade/lang';
+import {BaseException, Type} from 'angular2/src/core/facade/lang';
 import {bind} from './bind';
 import {EventDispatcher} from 'angular2/src/web_workers/ui/event_dispatcher';
 import {

modules/angular2/src/web_workers/ui/setup.ts

@@ -1,7 +1,7 @@
 import {SETUP_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api';
-import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
+import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 import {MessageBus} from 'angular2/src/web_workers/shared/message_bus';
-import {AnchorBasedAppRootUrl} from 'angular2/src/services/anchor_based_app_root_url';
+import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url';
 import {Injectable} from 'angular2/di';
 
 @Injectable()

modules/angular2/src/web_workers/ui/xhr_impl.ts

@@ -1,7 +1,7 @@
 import {Injectable} from 'angular2/di';
 import {PRIMITIVE} from 'angular2/src/web_workers/shared/serializer';
 import {XHR_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api';
-import {XHR} from 'angular2/src/render/xhr';
+import {XHR} from 'angular2/src/core/render/xhr';
 import {ServiceMessageBrokerFactory} from 'angular2/src/web_workers/shared/service_message_broker';
 import {bind} from './bind';
 

modules/angular2/src/web_workers/worker/application.dart

@@ -3,9 +3,9 @@ library angular2.src.web_workers.worker;
 import "package:angular2/src/web_workers/shared/isolate_message_bus.dart";
 import "package:angular2/src/web_workers/worker/application_common.dart"
     show bootstrapWebWorkerCommon;
-import "package:angular2/src/facade/async.dart" show Future;
+import "package:angular2/src/core/facade/async.dart" show Future;
 import "package:angular2/src/core/application_ref.dart" show ApplicationRef;
-import "package:angular2/src/facade/lang.dart" show Type, BaseException;
+import "package:angular2/src/core/facade/lang.dart" show Type, BaseException;
 import "dart:isolate";
 import "dart:async";
 import 'dart:core';

modules/angular2/src/web_workers/worker/application.ts

@@ -3,10 +3,10 @@ import {
   PostMessageBusSink,
   PostMessageBusSource
 } from 'angular2/src/web_workers/shared/post_message_bus';
-import {Type, BaseException} from "angular2/src/facade/lang";
+import {Type, BaseException} from "angular2/src/core/facade/lang";
 import {Binding} from "angular2/di";
-import {Map} from 'angular2/src/facade/collection';
-import {Promise} from 'angular2/src/facade/async';
+import {Map} from 'angular2/src/core/facade/collection';
+import {Promise} from 'angular2/src/core/facade/async';
 import {bootstrapWebWorkerCommon} from "angular2/src/web_workers/worker/application_common";
 import {ApplicationRef} from "angular2/src/core/application_ref";
 import {Injectable} from "angular2/di";

modules/angular2/src/web_workers/worker/application_common.ts

@@ -8,9 +8,9 @@ import {
   assertionsEnabled,
   print,
   stringify
-} from 'angular2/src/facade/lang';
+} from 'angular2/src/core/facade/lang';
 import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
-import {Reflector, reflector} from 'angular2/src/reflection/reflection';
+import {Reflector, reflector} from 'angular2/src/core/reflection/reflection';
 import {
   Parser,
   Lexer,
@@ -22,22 +22,22 @@ import {
   defaultIterableDiffers,
   KeyValueDiffers,
   defaultKeyValueDiffers
-} from 'angular2/src/change_detection/change_detection';
+} from 'angular2/src/core/change_detection/change_detection';
 import {DEFAULT_PIPES} from 'angular2/pipes';
-import {StyleUrlResolver} from 'angular2/src/render/dom/compiler/style_url_resolver';
+import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver';
 import {ExceptionHandler} from 'angular2/src/core/exception_handler';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
 import {PipeResolver} from 'angular2/src/core/compiler/pipe_resolver';
 import {ViewResolver} from 'angular2/src/core/compiler/view_resolver';
-import {List, ListWrapper} from 'angular2/src/facade/collection';
-import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/async';
+import {List, ListWrapper} from 'angular2/src/core/facade/collection';
+import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
 import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
-import {XHR} from 'angular2/src/render/xhr';
+import {XHR} from 'angular2/src/core/render/xhr';
 import {WebWorkerXHRImpl} from 'angular2/src/web_workers/worker/xhr_impl';
 import {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper';
-import {UrlResolver} from 'angular2/src/services/url_resolver';
-import {AppRootUrl} from 'angular2/src/services/app_root_url';
+import {UrlResolver} from 'angular2/src/core/services/url_resolver';
+import {AppRootUrl} from 'angular2/src/core/services/app_root_url';
 import {
   ComponentRef,
   DynamicComponentLoader
@@ -49,7 +49,7 @@ import {AppViewManagerUtils} from 'angular2/src/core/compiler/view_manager_utils
 import {AppViewListener} from 'angular2/src/core/compiler/view_listener';
 import {ProtoViewFactory} from 'angular2/src/core/compiler/proto_view_factory';
 import {WebWorkerRenderer, WebWorkerCompiler} from './renderer';
-import {Renderer, RenderCompiler} from 'angular2/src/render/api';
+import {Renderer, RenderCompiler} from 'angular2/src/core/render/api';
 import {internalView} from 'angular2/src/core/compiler/view_ref';
 
 import {ClientMessageBrokerFactory} from 'angular2/src/web_workers/shared/client_message_broker';
@@ -62,7 +62,7 @@ import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_pr
 import {
   RenderViewWithFragmentsStore
 } from 'angular2/src/web_workers/shared/render_view_with_fragments_store';
-import {ObservableWrapper} from 'angular2/src/facade/async';
+import {ObservableWrapper} from 'angular2/src/core/facade/async';
 import {SETUP_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api';
 import {WebWorkerEventDispatcher} from 'angular2/src/web_workers/worker/event_dispatcher';
 

modules/angular2/src/web_workers/worker/event_deserializer.ts

@@ -1,4 +1,4 @@
-import {StringMap} from "angular2/src/facade/collection";
+import {StringMap} from "angular2/src/core/facade/collection";
 
 // no deserialization is necessary in TS.
 // This is only here to match dart interface

modules/angular2/src/web_workers/worker/event_dispatcher.ts

@@ -1,10 +1,10 @@
 import {Injectable} from 'angular2/di';
-import {Map, MapWrapper} from 'angular2/src/facade/collection';
-import {RenderViewRef, RenderEventDispatcher} from 'angular2/src/render/api';
+import {Map, MapWrapper} from 'angular2/src/core/facade/collection';
+import {RenderViewRef, RenderEventDispatcher} from 'angular2/src/core/render/api';
 import {Serializer} from 'angular2/src/web_workers/shared/serializer';
 import {EVENT_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api';
 import {MessageBus} from 'angular2/src/web_workers/shared/message_bus';
-import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
+import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 import {deserializeGenericEvent} from './event_deserializer';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
 

modules/angular2/src/web_workers/worker/renderer.ts

@@ -11,15 +11,15 @@ import {
   RenderProtoViewMergeMapping,
   RenderViewWithFragments,
   RenderFragmentRef
-} from 'angular2/src/render/api';
-import {Promise, PromiseWrapper} from "angular2/src/facade/async";
+} from 'angular2/src/core/render/api';
+import {Promise, PromiseWrapper} from "angular2/src/core/facade/async";
 import {
   ClientMessageBroker,
   ClientMessageBrokerFactory,
   FnArg,
   UiArguments
 } from "angular2/src/web_workers/shared/client_message_broker";
-import {isPresent, print, BaseException} from "angular2/src/facade/lang";
+import {isPresent, print, BaseException} from "angular2/src/core/facade/lang";
 import {Injectable} from "angular2/di";
 import {
   RenderViewWithFragmentsStore,

modules/angular2/src/web_workers/worker/xhr_impl.ts

@@ -1,6 +1,6 @@
 import {Injectable} from 'angular2/di';
-import {Promise} from 'angular2/src/facade/async';
-import {XHR} from 'angular2/src/render/xhr';
+import {Promise} from 'angular2/src/core/facade/async';
+import {XHR} from 'angular2/src/core/render/xhr';
 import {
   FnArg,
   UiArguments,