diff --git a/modules/angular2/src/core/services/anchor_based_app_root_url.ts b/modules/angular2/src/core/compiler/anchor_based_app_root_url.ts
similarity index 100%
rename from modules/angular2/src/core/services/anchor_based_app_root_url.ts
rename to modules/angular2/src/core/compiler/anchor_based_app_root_url.ts
diff --git a/modules/angular2/src/core/services/app_root_url.ts b/modules/angular2/src/core/compiler/app_root_url.ts
similarity index 100%
rename from modules/angular2/src/core/services/app_root_url.ts
rename to modules/angular2/src/core/compiler/app_root_url.ts
diff --git a/modules/angular2/src/core/render/dom/schema/dom_element_schema_registry.ts b/modules/angular2/src/core/compiler/schema/dom_element_schema_registry.ts
similarity index 100%
rename from modules/angular2/src/core/render/dom/schema/dom_element_schema_registry.ts
rename to modules/angular2/src/core/compiler/schema/dom_element_schema_registry.ts
diff --git a/modules/angular2/src/core/render/dom/schema/element_schema_registry.ts b/modules/angular2/src/core/compiler/schema/element_schema_registry.ts
similarity index 100%
rename from modules/angular2/src/core/render/dom/schema/element_schema_registry.ts
rename to modules/angular2/src/core/compiler/schema/element_schema_registry.ts
diff --git a/modules/angular2/src/core/render/dom/compiler/selector.ts b/modules/angular2/src/core/compiler/selector.ts
similarity index 100%
rename from modules/angular2/src/core/render/dom/compiler/selector.ts
rename to modules/angular2/src/core/compiler/selector.ts
diff --git a/modules/angular2/src/core/render/dom/compiler/shadow_css.ts b/modules/angular2/src/core/compiler/shadow_css.ts
similarity index 100%
rename from modules/angular2/src/core/render/dom/compiler/shadow_css.ts
rename to modules/angular2/src/core/compiler/shadow_css.ts
diff --git a/modules/angular2/src/core/services/url_resolver.dart b/modules/angular2/src/core/compiler/url_resolver.dart
similarity index 100%
rename from modules/angular2/src/core/services/url_resolver.dart
rename to modules/angular2/src/core/compiler/url_resolver.dart
diff --git a/modules/angular2/src/core/services/url_resolver.ts b/modules/angular2/src/core/compiler/url_resolver.ts
similarity index 100%
rename from modules/angular2/src/core/services/url_resolver.ts
rename to modules/angular2/src/core/compiler/url_resolver.ts
diff --git a/modules/angular2/src/core/render/xhr.ts b/modules/angular2/src/core/compiler/xhr.ts
similarity index 100%
rename from modules/angular2/src/core/render/xhr.ts
rename to modules/angular2/src/core/compiler/xhr.ts
diff --git a/modules/angular2/src/core/render/xhr_impl.dart b/modules/angular2/src/core/compiler/xhr_impl.dart
similarity index 100%
rename from modules/angular2/src/core/render/xhr_impl.dart
rename to modules/angular2/src/core/compiler/xhr_impl.dart
diff --git a/modules/angular2/src/core/render/xhr_impl.ts b/modules/angular2/src/core/compiler/xhr_impl.ts
similarity index 100%
rename from modules/angular2/src/core/render/xhr_impl.ts
rename to modules/angular2/src/core/compiler/xhr_impl.ts
diff --git a/modules/angular2/src/core/render/xhr_mock.ts b/modules/angular2/src/core/compiler/xhr_mock.ts
similarity index 100%
rename from modules/angular2/src/core/render/xhr_mock.ts
rename to modules/angular2/src/core/compiler/xhr_mock.ts
diff --git a/modules/angular2/src/core/render/event_config.ts b/modules/angular2/src/core/linker/event_config.ts
similarity index 100%
rename from modules/angular2/src/core/render/event_config.ts
rename to modules/angular2/src/core/linker/event_config.ts
diff --git a/modules/angular2/src/core/render/dom/view/shared_styles_host.ts b/modules/angular2/src/core/render/dom/shared_styles_host.ts
similarity index 100%
rename from modules/angular2/src/core/render/dom/view/shared_styles_host.ts
rename to modules/angular2/src/core/render/dom/shared_styles_host.ts
diff --git a/modules/angular2/test/core/render/dom/schema/dom_element_schema_registry_spec.ts b/modules/angular2/test/core/compiler/schema/dom_element_schema_registry_spec.ts
similarity index 100%
rename from modules/angular2/test/core/render/dom/schema/dom_element_schema_registry_spec.ts
rename to modules/angular2/test/core/compiler/schema/dom_element_schema_registry_spec.ts
diff --git a/modules/angular2/test/core/render/dom/compiler/selector_spec.ts b/modules/angular2/test/core/compiler/selector_spec.ts
similarity index 100%
rename from modules/angular2/test/core/render/dom/compiler/selector_spec.ts
rename to modules/angular2/test/core/compiler/selector_spec.ts
diff --git a/modules/angular2/test/core/render/dom/compiler/shadow_css_html5lib.server.spec.dart b/modules/angular2/test/core/compiler/shadow_css_html5lib.server.spec.dart
similarity index 100%
rename from modules/angular2/test/core/render/dom/compiler/shadow_css_html5lib.server.spec.dart
rename to modules/angular2/test/core/compiler/shadow_css_html5lib.server.spec.dart
diff --git a/modules/angular2/test/core/render/dom/compiler/shadow_css_spec.ts b/modules/angular2/test/core/compiler/shadow_css_spec.ts
similarity index 100%
rename from modules/angular2/test/core/render/dom/compiler/shadow_css_spec.ts
rename to modules/angular2/test/core/compiler/shadow_css_spec.ts
diff --git a/modules/angular2/test/core/services/url_resolver_spec.ts b/modules/angular2/test/core/compiler/url_resolver_spec.ts
similarity index 100%
rename from modules/angular2/test/core/services/url_resolver_spec.ts
rename to modules/angular2/test/core/compiler/url_resolver_spec.ts
diff --git a/modules/angular2/test/core/render/xhr_impl_spec.ts b/modules/angular2/test/core/compiler/xhr_impl_spec.ts
similarity index 100%
rename from modules/angular2/test/core/render/xhr_impl_spec.ts
rename to modules/angular2/test/core/compiler/xhr_impl_spec.ts
diff --git a/modules/angular2/test/core/render/xhr_mock_spec.ts b/modules/angular2/test/core/compiler/xhr_mock_spec.ts
similarity index 100%
rename from modules/angular2/test/core/render/xhr_mock_spec.ts
rename to modules/angular2/test/core/compiler/xhr_mock_spec.ts
diff --git a/modules/angular2/test/core/render/event_config_spec.ts b/modules/angular2/test/core/linker/event_config_spec.ts
similarity index 100%
rename from modules/angular2/test/core/render/event_config_spec.ts
rename to modules/angular2/test/core/linker/event_config_spec.ts
diff --git a/modules/angular2/test/core/render/dom/view/shared_styles_host_spec.ts b/modules/angular2/test/core/render/dom/shared_styles_host_spec.ts
similarity index 100%
rename from modules/angular2/test/core/render/dom/view/shared_styles_host_spec.ts
rename to modules/angular2/test/core/render/dom/shared_styles_host_spec.ts