diff --git a/modules/angular2/angular2_exports.ts b/modules/angular2/angular2_exports.ts
deleted file mode 100644
index 088ab78d42..0000000000
--- a/modules/angular2/angular2_exports.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export * from './metadata';
-export * from './change_detection';
-export * from './core';
-export * from './di';
-export * from './directives';
-export * from './forms';
-export * from './render';
-export * from './profile';
-export {bootstrap} from 'angular2/src/core/application';
-export * from './lifecycle_hooks';
diff --git a/modules/angular2/di_errors.ts b/modules/angular2/di_errors.ts
deleted file mode 100644
index cdcc57c8e4..0000000000
--- a/modules/angular2/di_errors.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * @module
- * @description
- * Errors thrown by the {@link Injector}.
- */
diff --git a/modules/angular2/di_metadata.ts b/modules/angular2/di_metadata.ts
deleted file mode 100644
index 2d124e9603..0000000000
--- a/modules/angular2/di_metadata.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * @module
- * @description
- * Metadata which control how the dependencies are resolved by the {@link Injector}.
- */
diff --git a/modules/angular2/metadata.dart b/modules/angular2/metadata.dart
deleted file mode 100644
index eb4c1f4399..0000000000
--- a/modules/angular2/metadata.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-library angular2.metadata;
-
-export 'package:angular2/src/core/metadata.dart';
diff --git a/modules/angular2/metadata.ts b/modules/angular2/metadata.ts
deleted file mode 100644
index e0c8f2113c..0000000000
--- a/modules/angular2/metadata.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @module
- * @description
- *
- * Annotations provide the additional information that Angular requires in order to run your
- * application. This module contains {@link ComponentMetadata}, {@link DirectiveMetadata}, and
- * {@link ViewMetadata} annotations, as well as the {@link Host} annotation that is used by Angular
- * to resolve dependencies.
- *
- */
-
-export {
-  ComponentMetadata,
-  DirectiveMetadata,
-  PipeMetadata,
-  ViewMetadata,
-  ViewEncapsulation,
-  QueryMetadata,
-  AttributeMetadata,
-  Attribute,
-  AttributeFactory,
-  Component,
-  ComponentDecorator,
-  ComponentFactory,
-  Directive,
-  DirectiveDecorator,
-  DirectiveFactory,
-  View,
-  ViewDecorator,
-  ViewFactory,
-  Query,
-  QueryFactory,
-  ViewQuery,
-  Pipe,
-  PipeFactory,
-  Property,
-  PropertyFactory,
-  PropertyMetadata,
-  Event,
-  EventFactory,
-  EventMetadata,
-  HostBinding,
-  HostBindingFactory,
-  HostBindingMetadata,
-  HostListener,
-  HostListenerFactory,
-  HostListenerMetadata
-} from './src/core/metadata';
-
-
-export {Class, ClassDefinition, TypeDecorator} from './src/core/util/decorators';
diff --git a/modules/angular2/change_detection.ts b/modules/angular2/src/core/change_detection.ts
similarity index 100%
rename from modules/angular2/change_detection.ts
rename to modules/angular2/src/core/change_detection.ts
diff --git a/modules/angular2/debug.ts b/modules/angular2/src/core/debug.ts
similarity index 100%
rename from modules/angular2/debug.ts
rename to modules/angular2/src/core/debug.ts
diff --git a/modules/angular2/di.ts b/modules/angular2/src/core/di.ts
similarity index 100%
rename from modules/angular2/di.ts
rename to modules/angular2/src/core/di.ts
diff --git a/modules/angular2/di_transformer.dart b/modules/angular2/src/core/di/di_transformer.dart
similarity index 100%
rename from modules/angular2/di_transformer.dart
rename to modules/angular2/src/core/di/di_transformer.dart
diff --git a/modules/angular2/directives.ts b/modules/angular2/src/core/directives.ts
similarity index 100%
rename from modules/angular2/directives.ts
rename to modules/angular2/src/core/directives.ts
diff --git a/modules/angular2/forms.ts b/modules/angular2/src/core/forms.ts
similarity index 100%
rename from modules/angular2/forms.ts
rename to modules/angular2/src/core/forms.ts
diff --git a/modules/angular2/src/forms/directives.ts b/modules/angular2/src/core/forms/directives.ts
similarity index 100%
rename from modules/angular2/src/forms/directives.ts
rename to modules/angular2/src/core/forms/directives.ts
diff --git a/modules/angular2/src/forms/directives/abstract_control_directive.ts b/modules/angular2/src/core/forms/directives/abstract_control_directive.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/abstract_control_directive.ts
rename to modules/angular2/src/core/forms/directives/abstract_control_directive.ts
diff --git a/modules/angular2/src/forms/directives/checkbox_value_accessor.ts b/modules/angular2/src/core/forms/directives/checkbox_value_accessor.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/checkbox_value_accessor.ts
rename to modules/angular2/src/core/forms/directives/checkbox_value_accessor.ts
diff --git a/modules/angular2/src/forms/directives/control_container.ts b/modules/angular2/src/core/forms/directives/control_container.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/control_container.ts
rename to modules/angular2/src/core/forms/directives/control_container.ts
diff --git a/modules/angular2/src/forms/directives/control_value_accessor.ts b/modules/angular2/src/core/forms/directives/control_value_accessor.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/control_value_accessor.ts
rename to modules/angular2/src/core/forms/directives/control_value_accessor.ts
diff --git a/modules/angular2/src/forms/directives/default_value_accessor.ts b/modules/angular2/src/core/forms/directives/default_value_accessor.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/default_value_accessor.ts
rename to modules/angular2/src/core/forms/directives/default_value_accessor.ts
diff --git a/modules/angular2/src/forms/directives/form_interface.ts b/modules/angular2/src/core/forms/directives/form_interface.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/form_interface.ts
rename to modules/angular2/src/core/forms/directives/form_interface.ts
diff --git a/modules/angular2/src/forms/directives/ng_control.ts b/modules/angular2/src/core/forms/directives/ng_control.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/ng_control.ts
rename to modules/angular2/src/core/forms/directives/ng_control.ts
diff --git a/modules/angular2/src/forms/directives/ng_control_group.ts b/modules/angular2/src/core/forms/directives/ng_control_group.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/ng_control_group.ts
rename to modules/angular2/src/core/forms/directives/ng_control_group.ts
diff --git a/modules/angular2/src/forms/directives/ng_control_name.ts b/modules/angular2/src/core/forms/directives/ng_control_name.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/ng_control_name.ts
rename to modules/angular2/src/core/forms/directives/ng_control_name.ts
diff --git a/modules/angular2/src/forms/directives/ng_form.ts b/modules/angular2/src/core/forms/directives/ng_form.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/ng_form.ts
rename to modules/angular2/src/core/forms/directives/ng_form.ts
diff --git a/modules/angular2/src/forms/directives/ng_form_control.ts b/modules/angular2/src/core/forms/directives/ng_form_control.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/ng_form_control.ts
rename to modules/angular2/src/core/forms/directives/ng_form_control.ts
diff --git a/modules/angular2/src/forms/directives/ng_form_model.ts b/modules/angular2/src/core/forms/directives/ng_form_model.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/ng_form_model.ts
rename to modules/angular2/src/core/forms/directives/ng_form_model.ts
diff --git a/modules/angular2/src/forms/directives/ng_model.ts b/modules/angular2/src/core/forms/directives/ng_model.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/ng_model.ts
rename to modules/angular2/src/core/forms/directives/ng_model.ts
diff --git a/modules/angular2/src/forms/directives/select_control_value_accessor.ts b/modules/angular2/src/core/forms/directives/select_control_value_accessor.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/select_control_value_accessor.ts
rename to modules/angular2/src/core/forms/directives/select_control_value_accessor.ts
diff --git a/modules/angular2/src/forms/directives/shared.ts b/modules/angular2/src/core/forms/directives/shared.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/shared.ts
rename to modules/angular2/src/core/forms/directives/shared.ts
diff --git a/modules/angular2/src/forms/directives/validators.ts b/modules/angular2/src/core/forms/directives/validators.ts
similarity index 100%
rename from modules/angular2/src/forms/directives/validators.ts
rename to modules/angular2/src/core/forms/directives/validators.ts
diff --git a/modules/angular2/src/forms/form_builder.ts b/modules/angular2/src/core/forms/form_builder.ts
similarity index 100%
rename from modules/angular2/src/forms/form_builder.ts
rename to modules/angular2/src/core/forms/form_builder.ts
diff --git a/modules/angular2/src/forms/model.ts b/modules/angular2/src/core/forms/model.ts
similarity index 100%
rename from modules/angular2/src/forms/model.ts
rename to modules/angular2/src/core/forms/model.ts
diff --git a/modules/angular2/src/forms/validators.ts b/modules/angular2/src/core/forms/validators.ts
similarity index 100%
rename from modules/angular2/src/forms/validators.ts
rename to modules/angular2/src/core/forms/validators.ts
diff --git a/modules/angular2/pipes.ts b/modules/angular2/src/core/pipes.ts
similarity index 100%
rename from modules/angular2/pipes.ts
rename to modules/angular2/src/core/pipes.ts
diff --git a/modules/angular2/test/forms/directives_spec.ts b/modules/angular2/test/core/forms/directives_spec.ts
similarity index 100%
rename from modules/angular2/test/forms/directives_spec.ts
rename to modules/angular2/test/core/forms/directives_spec.ts
diff --git a/modules/angular2/test/forms/form_builder_spec.ts b/modules/angular2/test/core/forms/form_builder_spec.ts
similarity index 100%
rename from modules/angular2/test/forms/form_builder_spec.ts
rename to modules/angular2/test/core/forms/form_builder_spec.ts
diff --git a/modules/angular2/test/forms/integration_spec.ts b/modules/angular2/test/core/forms/integration_spec.ts
similarity index 100%
rename from modules/angular2/test/forms/integration_spec.ts
rename to modules/angular2/test/core/forms/integration_spec.ts
diff --git a/modules/angular2/test/forms/model_spec.ts b/modules/angular2/test/core/forms/model_spec.ts
similarity index 100%
rename from modules/angular2/test/forms/model_spec.ts
rename to modules/angular2/test/core/forms/model_spec.ts
diff --git a/modules/angular2/test/forms/validators_spec.ts b/modules/angular2/test/core/forms/validators_spec.ts
similarity index 100%
rename from modules/angular2/test/forms/validators_spec.ts
rename to modules/angular2/test/core/forms/validators_spec.ts
diff --git a/modules/angular2/test/pipes/async_pipe_spec.ts b/modules/angular2/test/core/pipes/async_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/pipes/async_pipe_spec.ts
rename to modules/angular2/test/core/pipes/async_pipe_spec.ts
diff --git a/modules/angular2/test/pipes/date_pipe_spec.ts b/modules/angular2/test/core/pipes/date_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/pipes/date_pipe_spec.ts
rename to modules/angular2/test/core/pipes/date_pipe_spec.ts
diff --git a/modules/angular2/test/pipes/json_pipe_spec.ts b/modules/angular2/test/core/pipes/json_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/pipes/json_pipe_spec.ts
rename to modules/angular2/test/core/pipes/json_pipe_spec.ts
diff --git a/modules/angular2/test/pipes/limit_to_pipe_spec.ts b/modules/angular2/test/core/pipes/limit_to_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/pipes/limit_to_pipe_spec.ts
rename to modules/angular2/test/core/pipes/limit_to_pipe_spec.ts
diff --git a/modules/angular2/test/pipes/lowercase_pipe_spec.ts b/modules/angular2/test/core/pipes/lowercase_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/pipes/lowercase_pipe_spec.ts
rename to modules/angular2/test/core/pipes/lowercase_pipe_spec.ts
diff --git a/modules/angular2/test/pipes/number_pipe_spec.ts b/modules/angular2/test/core/pipes/number_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/pipes/number_pipe_spec.ts
rename to modules/angular2/test/core/pipes/number_pipe_spec.ts
diff --git a/modules/angular2/test/pipes/spies.dart b/modules/angular2/test/core/pipes/spies.dart
similarity index 100%
rename from modules/angular2/test/pipes/spies.dart
rename to modules/angular2/test/core/pipes/spies.dart
diff --git a/modules/angular2/test/pipes/spies.ts b/modules/angular2/test/core/pipes/spies.ts
similarity index 100%
rename from modules/angular2/test/pipes/spies.ts
rename to modules/angular2/test/core/pipes/spies.ts
diff --git a/modules/angular2/test/pipes/uppercase_pipe_spec.ts b/modules/angular2/test/core/pipes/uppercase_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/pipes/uppercase_pipe_spec.ts
rename to modules/angular2/test/core/pipes/uppercase_pipe_spec.ts
diff --git a/modules/angular2/view.ts b/modules/angular2/view.ts
deleted file mode 100644
index ea59225d32..0000000000
--- a/modules/angular2/view.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * @module
- * @description
- * Provides API for working with Angular views.
- */