diff --git a/modules/angular2/README.dart.md b/modules/@angular/README.dart.md
similarity index 100%
rename from modules/angular2/README.dart.md
rename to modules/@angular/README.dart.md
diff --git a/modules/angular2/README.js.md b/modules/@angular/README.js.md
similarity index 100%
rename from modules/angular2/README.js.md
rename to modules/@angular/README.js.md
diff --git a/modules/angular2/src/common/common_directives.ts b/modules/@angular/common/src/common_directives.ts
similarity index 100%
rename from modules/angular2/src/common/common_directives.ts
rename to modules/@angular/common/src/common_directives.ts
diff --git a/modules/angular2/src/common/directives.ts b/modules/@angular/common/src/directives.ts
similarity index 100%
rename from modules/angular2/src/common/directives.ts
rename to modules/@angular/common/src/directives.ts
diff --git a/modules/angular2/src/common/directives/core_directives.ts b/modules/@angular/common/src/directives/core_directives.ts
similarity index 100%
rename from modules/angular2/src/common/directives/core_directives.ts
rename to modules/@angular/common/src/directives/core_directives.ts
diff --git a/modules/angular2/src/common/directives/ng_class.ts b/modules/@angular/common/src/directives/ng_class.ts
similarity index 100%
rename from modules/angular2/src/common/directives/ng_class.ts
rename to modules/@angular/common/src/directives/ng_class.ts
diff --git a/modules/angular2/src/common/directives/ng_for.ts b/modules/@angular/common/src/directives/ng_for.ts
similarity index 100%
rename from modules/angular2/src/common/directives/ng_for.ts
rename to modules/@angular/common/src/directives/ng_for.ts
diff --git a/modules/angular2/src/common/directives/ng_if.ts b/modules/@angular/common/src/directives/ng_if.ts
similarity index 100%
rename from modules/angular2/src/common/directives/ng_if.ts
rename to modules/@angular/common/src/directives/ng_if.ts
diff --git a/modules/angular2/src/common/directives/ng_plural.ts b/modules/@angular/common/src/directives/ng_plural.ts
similarity index 100%
rename from modules/angular2/src/common/directives/ng_plural.ts
rename to modules/@angular/common/src/directives/ng_plural.ts
diff --git a/modules/angular2/src/common/directives/ng_style.ts b/modules/@angular/common/src/directives/ng_style.ts
similarity index 100%
rename from modules/angular2/src/common/directives/ng_style.ts
rename to modules/@angular/common/src/directives/ng_style.ts
diff --git a/modules/angular2/src/common/directives/ng_switch.ts b/modules/@angular/common/src/directives/ng_switch.ts
similarity index 100%
rename from modules/angular2/src/common/directives/ng_switch.ts
rename to modules/@angular/common/src/directives/ng_switch.ts
diff --git a/modules/angular2/src/common/directives/ng_template_outlet.ts b/modules/@angular/common/src/directives/ng_template_outlet.ts
similarity index 100%
rename from modules/angular2/src/common/directives/ng_template_outlet.ts
rename to modules/@angular/common/src/directives/ng_template_outlet.ts
diff --git a/modules/angular2/src/common/directives/observable_list_diff.dart b/modules/@angular/common/src/directives/observable_list_diff.dart
similarity index 100%
rename from modules/angular2/src/common/directives/observable_list_diff.dart
rename to modules/@angular/common/src/directives/observable_list_diff.dart
diff --git a/modules/angular2/src/common/directives/observable_list_diff.ts b/modules/@angular/common/src/directives/observable_list_diff.ts
similarity index 100%
rename from modules/angular2/src/common/directives/observable_list_diff.ts
rename to modules/@angular/common/src/directives/observable_list_diff.ts
diff --git a/modules/angular2/src/common/forms.ts b/modules/@angular/common/src/forms.ts
similarity index 100%
rename from modules/angular2/src/common/forms.ts
rename to modules/@angular/common/src/forms.ts
diff --git a/modules/angular2/src/common/forms/directives.ts b/modules/@angular/common/src/forms/directives.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives.ts
rename to modules/@angular/common/src/forms/directives.ts
diff --git a/modules/angular2/src/common/forms/directives/abstract_control_directive.ts b/modules/@angular/common/src/forms/directives/abstract_control_directive.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/abstract_control_directive.ts
rename to modules/@angular/common/src/forms/directives/abstract_control_directive.ts
diff --git a/modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts b/modules/@angular/common/src/forms/directives/checkbox_value_accessor.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/checkbox_value_accessor.ts
rename to modules/@angular/common/src/forms/directives/checkbox_value_accessor.ts
diff --git a/modules/angular2/src/common/forms/directives/control_container.ts b/modules/@angular/common/src/forms/directives/control_container.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/control_container.ts
rename to modules/@angular/common/src/forms/directives/control_container.ts
diff --git a/modules/angular2/src/common/forms/directives/control_value_accessor.ts b/modules/@angular/common/src/forms/directives/control_value_accessor.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/control_value_accessor.ts
rename to modules/@angular/common/src/forms/directives/control_value_accessor.ts
diff --git a/modules/angular2/src/common/forms/directives/default_value_accessor.ts b/modules/@angular/common/src/forms/directives/default_value_accessor.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/default_value_accessor.ts
rename to modules/@angular/common/src/forms/directives/default_value_accessor.ts
diff --git a/modules/angular2/src/common/forms/directives/form_interface.ts b/modules/@angular/common/src/forms/directives/form_interface.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/form_interface.ts
rename to modules/@angular/common/src/forms/directives/form_interface.ts
diff --git a/modules/angular2/src/common/forms/directives/ng_control.ts b/modules/@angular/common/src/forms/directives/ng_control.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/ng_control.ts
rename to modules/@angular/common/src/forms/directives/ng_control.ts
diff --git a/modules/angular2/src/common/forms/directives/ng_control_group.ts b/modules/@angular/common/src/forms/directives/ng_control_group.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/ng_control_group.ts
rename to modules/@angular/common/src/forms/directives/ng_control_group.ts
diff --git a/modules/angular2/src/common/forms/directives/ng_control_name.ts b/modules/@angular/common/src/forms/directives/ng_control_name.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/ng_control_name.ts
rename to modules/@angular/common/src/forms/directives/ng_control_name.ts
diff --git a/modules/angular2/src/common/forms/directives/ng_control_status.ts b/modules/@angular/common/src/forms/directives/ng_control_status.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/ng_control_status.ts
rename to modules/@angular/common/src/forms/directives/ng_control_status.ts
diff --git a/modules/angular2/src/common/forms/directives/ng_form.ts b/modules/@angular/common/src/forms/directives/ng_form.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/ng_form.ts
rename to modules/@angular/common/src/forms/directives/ng_form.ts
diff --git a/modules/angular2/src/common/forms/directives/ng_form_control.ts b/modules/@angular/common/src/forms/directives/ng_form_control.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/ng_form_control.ts
rename to modules/@angular/common/src/forms/directives/ng_form_control.ts
diff --git a/modules/angular2/src/common/forms/directives/ng_form_model.ts b/modules/@angular/common/src/forms/directives/ng_form_model.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/ng_form_model.ts
rename to modules/@angular/common/src/forms/directives/ng_form_model.ts
diff --git a/modules/angular2/src/common/forms/directives/ng_model.ts b/modules/@angular/common/src/forms/directives/ng_model.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/ng_model.ts
rename to modules/@angular/common/src/forms/directives/ng_model.ts
diff --git a/modules/angular2/src/common/forms/directives/normalize_validator.dart b/modules/@angular/common/src/forms/directives/normalize_validator.dart
similarity index 100%
rename from modules/angular2/src/common/forms/directives/normalize_validator.dart
rename to modules/@angular/common/src/forms/directives/normalize_validator.dart
diff --git a/modules/angular2/src/common/forms/directives/normalize_validator.ts b/modules/@angular/common/src/forms/directives/normalize_validator.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/normalize_validator.ts
rename to modules/@angular/common/src/forms/directives/normalize_validator.ts
diff --git a/modules/angular2/src/common/forms/directives/number_value_accessor.ts b/modules/@angular/common/src/forms/directives/number_value_accessor.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/number_value_accessor.ts
rename to modules/@angular/common/src/forms/directives/number_value_accessor.ts
diff --git a/modules/angular2/src/common/forms/directives/radio_control_value_accessor.ts b/modules/@angular/common/src/forms/directives/radio_control_value_accessor.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/radio_control_value_accessor.ts
rename to modules/@angular/common/src/forms/directives/radio_control_value_accessor.ts
diff --git a/modules/angular2/src/common/forms/directives/select_control_value_accessor.ts b/modules/@angular/common/src/forms/directives/select_control_value_accessor.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/select_control_value_accessor.ts
rename to modules/@angular/common/src/forms/directives/select_control_value_accessor.ts
diff --git a/modules/angular2/src/common/forms/directives/shared.ts b/modules/@angular/common/src/forms/directives/shared.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/shared.ts
rename to modules/@angular/common/src/forms/directives/shared.ts
diff --git a/modules/angular2/src/common/forms/directives/validators.ts b/modules/@angular/common/src/forms/directives/validators.ts
similarity index 100%
rename from modules/angular2/src/common/forms/directives/validators.ts
rename to modules/@angular/common/src/forms/directives/validators.ts
diff --git a/modules/angular2/src/common/forms/form_builder.ts b/modules/@angular/common/src/forms/form_builder.ts
similarity index 100%
rename from modules/angular2/src/common/forms/form_builder.ts
rename to modules/@angular/common/src/forms/form_builder.ts
diff --git a/modules/angular2/src/common/forms/model.ts b/modules/@angular/common/src/forms/model.ts
similarity index 100%
rename from modules/angular2/src/common/forms/model.ts
rename to modules/@angular/common/src/forms/model.ts
diff --git a/modules/angular2/src/common/forms/validators.ts b/modules/@angular/common/src/forms/validators.ts
similarity index 100%
rename from modules/angular2/src/common/forms/validators.ts
rename to modules/@angular/common/src/forms/validators.ts
diff --git a/modules/angular2/src/platform/location.ts b/modules/@angular/common/src/location.ts
similarity index 100%
rename from modules/angular2/src/platform/location.ts
rename to modules/@angular/common/src/location.ts
diff --git a/modules/angular2/src/platform/browser/location/hash_location_strategy.ts b/modules/@angular/common/src/location/hash_location_strategy.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/location/hash_location_strategy.ts
rename to modules/@angular/common/src/location/hash_location_strategy.ts
diff --git a/modules/angular2/src/platform/browser/location/location.ts b/modules/@angular/common/src/location/location.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/location/location.ts
rename to modules/@angular/common/src/location/location.ts
diff --git a/modules/angular2/src/platform/browser/location/location_strategy.ts b/modules/@angular/common/src/location/location_strategy.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/location/location_strategy.ts
rename to modules/@angular/common/src/location/location_strategy.ts
diff --git a/modules/angular2/src/platform/browser/location/path_location_strategy.ts b/modules/@angular/common/src/location/path_location_strategy.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/location/path_location_strategy.ts
rename to modules/@angular/common/src/location/path_location_strategy.ts
diff --git a/modules/angular2/src/platform/browser/location/platform_location.ts b/modules/@angular/common/src/location/platform_location.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/location/platform_location.ts
rename to modules/@angular/common/src/location/platform_location.ts
diff --git a/modules/angular2/src/common/pipes.ts b/modules/@angular/common/src/pipes.ts
similarity index 100%
rename from modules/angular2/src/common/pipes.ts
rename to modules/@angular/common/src/pipes.ts
diff --git a/modules/angular2/src/common/pipes/async_pipe.ts b/modules/@angular/common/src/pipes/async_pipe.ts
similarity index 100%
rename from modules/angular2/src/common/pipes/async_pipe.ts
rename to modules/@angular/common/src/pipes/async_pipe.ts
diff --git a/modules/angular2/src/common/pipes/common_pipes.ts b/modules/@angular/common/src/pipes/common_pipes.ts
similarity index 100%
rename from modules/angular2/src/common/pipes/common_pipes.ts
rename to modules/@angular/common/src/pipes/common_pipes.ts
diff --git a/modules/angular2/src/common/pipes/date_pipe.ts b/modules/@angular/common/src/pipes/date_pipe.ts
similarity index 100%
rename from modules/angular2/src/common/pipes/date_pipe.ts
rename to modules/@angular/common/src/pipes/date_pipe.ts
diff --git a/modules/angular2/src/common/pipes/i18n_plural_pipe.ts b/modules/@angular/common/src/pipes/i18n_plural_pipe.ts
similarity index 100%
rename from modules/angular2/src/common/pipes/i18n_plural_pipe.ts
rename to modules/@angular/common/src/pipes/i18n_plural_pipe.ts
diff --git a/modules/angular2/src/common/pipes/i18n_select_pipe.ts b/modules/@angular/common/src/pipes/i18n_select_pipe.ts
similarity index 100%
rename from modules/angular2/src/common/pipes/i18n_select_pipe.ts
rename to modules/@angular/common/src/pipes/i18n_select_pipe.ts
diff --git a/modules/angular2/src/common/pipes/invalid_pipe_argument_exception.ts b/modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts
similarity index 100%
rename from modules/angular2/src/common/pipes/invalid_pipe_argument_exception.ts
rename to modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts
diff --git a/modules/angular2/src/common/pipes/json_pipe.ts b/modules/@angular/common/src/pipes/json_pipe.ts
similarity index 100%
rename from modules/angular2/src/common/pipes/json_pipe.ts
rename to modules/@angular/common/src/pipes/json_pipe.ts
diff --git a/modules/angular2/src/common/pipes/lowercase_pipe.ts b/modules/@angular/common/src/pipes/lowercase_pipe.ts
similarity index 100%
rename from modules/angular2/src/common/pipes/lowercase_pipe.ts
rename to modules/@angular/common/src/pipes/lowercase_pipe.ts
diff --git a/modules/angular2/src/common/pipes/number_pipe.ts b/modules/@angular/common/src/pipes/number_pipe.ts
similarity index 100%
rename from modules/angular2/src/common/pipes/number_pipe.ts
rename to modules/@angular/common/src/pipes/number_pipe.ts
diff --git a/modules/angular2/src/common/pipes/replace_pipe.ts b/modules/@angular/common/src/pipes/replace_pipe.ts
similarity index 100%
rename from modules/angular2/src/common/pipes/replace_pipe.ts
rename to modules/@angular/common/src/pipes/replace_pipe.ts
diff --git a/modules/angular2/src/common/pipes/slice_pipe.ts b/modules/@angular/common/src/pipes/slice_pipe.ts
similarity index 100%
rename from modules/angular2/src/common/pipes/slice_pipe.ts
rename to modules/@angular/common/src/pipes/slice_pipe.ts
diff --git a/modules/angular2/src/common/pipes/uppercase_pipe.ts b/modules/@angular/common/src/pipes/uppercase_pipe.ts
similarity index 100%
rename from modules/angular2/src/common/pipes/uppercase_pipe.ts
rename to modules/@angular/common/src/pipes/uppercase_pipe.ts
diff --git a/modules/angular2/test/common/directives/ng_class_spec.ts b/modules/@angular/common/test/directives/ng_class_spec.ts
similarity index 100%
rename from modules/angular2/test/common/directives/ng_class_spec.ts
rename to modules/@angular/common/test/directives/ng_class_spec.ts
diff --git a/modules/angular2/test/common/directives/ng_for_spec.ts b/modules/@angular/common/test/directives/ng_for_spec.ts
similarity index 100%
rename from modules/angular2/test/common/directives/ng_for_spec.ts
rename to modules/@angular/common/test/directives/ng_for_spec.ts
diff --git a/modules/angular2/test/common/directives/ng_if_spec.ts b/modules/@angular/common/test/directives/ng_if_spec.ts
similarity index 100%
rename from modules/angular2/test/common/directives/ng_if_spec.ts
rename to modules/@angular/common/test/directives/ng_if_spec.ts
diff --git a/modules/angular2/test/common/directives/ng_plural_spec.ts b/modules/@angular/common/test/directives/ng_plural_spec.ts
similarity index 100%
rename from modules/angular2/test/common/directives/ng_plural_spec.ts
rename to modules/@angular/common/test/directives/ng_plural_spec.ts
diff --git a/modules/angular2/test/common/directives/ng_style_spec.ts b/modules/@angular/common/test/directives/ng_style_spec.ts
similarity index 100%
rename from modules/angular2/test/common/directives/ng_style_spec.ts
rename to modules/@angular/common/test/directives/ng_style_spec.ts
diff --git a/modules/angular2/test/common/directives/ng_switch_spec.ts b/modules/@angular/common/test/directives/ng_switch_spec.ts
similarity index 100%
rename from modules/angular2/test/common/directives/ng_switch_spec.ts
rename to modules/@angular/common/test/directives/ng_switch_spec.ts
diff --git a/modules/angular2/test/common/directives/ng_template_outlet_spec.ts b/modules/@angular/common/test/directives/ng_template_outlet_spec.ts
similarity index 100%
rename from modules/angular2/test/common/directives/ng_template_outlet_spec.ts
rename to modules/@angular/common/test/directives/ng_template_outlet_spec.ts
diff --git a/modules/angular2/test/common/directives/non_bindable_spec.ts b/modules/@angular/common/test/directives/non_bindable_spec.ts
similarity index 100%
rename from modules/angular2/test/common/directives/non_bindable_spec.ts
rename to modules/@angular/common/test/directives/non_bindable_spec.ts
diff --git a/modules/angular2/test/common/directives/observable_list_diff_spec.dart b/modules/@angular/common/test/directives/observable_list_diff_spec.dart
similarity index 100%
rename from modules/angular2/test/common/directives/observable_list_diff_spec.dart
rename to modules/@angular/common/test/directives/observable_list_diff_spec.dart
diff --git a/modules/angular2/test/common/forms/directives_spec.ts b/modules/@angular/common/test/forms/directives_spec.ts
similarity index 100%
rename from modules/angular2/test/common/forms/directives_spec.ts
rename to modules/@angular/common/test/forms/directives_spec.ts
diff --git a/modules/angular2/test/common/forms/form_builder_spec.ts b/modules/@angular/common/test/forms/form_builder_spec.ts
similarity index 100%
rename from modules/angular2/test/common/forms/form_builder_spec.ts
rename to modules/@angular/common/test/forms/form_builder_spec.ts
diff --git a/modules/angular2/test/common/forms/integration_spec.ts b/modules/@angular/common/test/forms/integration_spec.ts
similarity index 100%
rename from modules/angular2/test/common/forms/integration_spec.ts
rename to modules/@angular/common/test/forms/integration_spec.ts
diff --git a/modules/angular2/test/common/forms/model_spec.ts b/modules/@angular/common/test/forms/model_spec.ts
similarity index 100%
rename from modules/angular2/test/common/forms/model_spec.ts
rename to modules/@angular/common/test/forms/model_spec.ts
diff --git a/modules/angular2/test/common/forms/validators_spec.ts b/modules/@angular/common/test/forms/validators_spec.ts
similarity index 100%
rename from modules/angular2/test/common/forms/validators_spec.ts
rename to modules/@angular/common/test/forms/validators_spec.ts
diff --git a/modules/angular2/test/common/pipes/async_pipe_spec.ts b/modules/@angular/common/test/pipes/async_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/common/pipes/async_pipe_spec.ts
rename to modules/@angular/common/test/pipes/async_pipe_spec.ts
diff --git a/modules/angular2/test/common/pipes/date_pipe_spec.ts b/modules/@angular/common/test/pipes/date_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/common/pipes/date_pipe_spec.ts
rename to modules/@angular/common/test/pipes/date_pipe_spec.ts
diff --git a/modules/angular2/test/common/pipes/i18n_plural_pipe_spec.ts b/modules/@angular/common/test/pipes/i18n_plural_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/common/pipes/i18n_plural_pipe_spec.ts
rename to modules/@angular/common/test/pipes/i18n_plural_pipe_spec.ts
diff --git a/modules/angular2/test/common/pipes/i18n_select_pipe_spec.ts b/modules/@angular/common/test/pipes/i18n_select_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/common/pipes/i18n_select_pipe_spec.ts
rename to modules/@angular/common/test/pipes/i18n_select_pipe_spec.ts
diff --git a/modules/angular2/test/common/pipes/json_pipe_spec.ts b/modules/@angular/common/test/pipes/json_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/common/pipes/json_pipe_spec.ts
rename to modules/@angular/common/test/pipes/json_pipe_spec.ts
diff --git a/modules/angular2/test/common/pipes/lowercase_pipe_spec.ts b/modules/@angular/common/test/pipes/lowercase_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/common/pipes/lowercase_pipe_spec.ts
rename to modules/@angular/common/test/pipes/lowercase_pipe_spec.ts
diff --git a/modules/angular2/test/common/pipes/number_pipe_spec.ts b/modules/@angular/common/test/pipes/number_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/common/pipes/number_pipe_spec.ts
rename to modules/@angular/common/test/pipes/number_pipe_spec.ts
diff --git a/modules/angular2/test/common/pipes/replace_pipe_spec.ts b/modules/@angular/common/test/pipes/replace_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/common/pipes/replace_pipe_spec.ts
rename to modules/@angular/common/test/pipes/replace_pipe_spec.ts
diff --git a/modules/angular2/test/common/pipes/slice_pipe_spec.ts b/modules/@angular/common/test/pipes/slice_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/common/pipes/slice_pipe_spec.ts
rename to modules/@angular/common/test/pipes/slice_pipe_spec.ts
diff --git a/modules/angular2/test/common/pipes/uppercase_pipe_spec.ts b/modules/@angular/common/test/pipes/uppercase_pipe_spec.ts
similarity index 100%
rename from modules/angular2/test/common/pipes/uppercase_pipe_spec.ts
rename to modules/@angular/common/test/pipes/uppercase_pipe_spec.ts
diff --git a/modules/angular2/test/common/spies.dart b/modules/@angular/common/test/spies.dart
similarity index 100%
rename from modules/angular2/test/common/spies.dart
rename to modules/@angular/common/test/spies.dart
diff --git a/modules/angular2/test/common/spies.ts b/modules/@angular/common/test/spies.ts
similarity index 100%
rename from modules/angular2/test/common/spies.ts
rename to modules/@angular/common/test/spies.ts
diff --git a/modules/angular2/src/mock/location_mock.ts b/modules/@angular/common/testing/location_mock.ts
similarity index 100%
rename from modules/angular2/src/mock/location_mock.ts
rename to modules/@angular/common/testing/location_mock.ts
diff --git a/modules/angular2/src/mock/mock_location_strategy.ts b/modules/@angular/common/testing/mock_location_strategy.ts
similarity index 100%
rename from modules/angular2/src/mock/mock_location_strategy.ts
rename to modules/@angular/common/testing/mock_location_strategy.ts
diff --git a/modules/angular2/compiler.ts b/modules/@angular/compiler/compiler.ts
similarity index 100%
rename from modules/angular2/compiler.ts
rename to modules/@angular/compiler/compiler.ts
diff --git a/modules/angular2/src/compiler/assertions.dart b/modules/@angular/compiler/src/assertions.dart
similarity index 100%
rename from modules/angular2/src/compiler/assertions.dart
rename to modules/@angular/compiler/src/assertions.dart
diff --git a/modules/angular2/src/compiler/assertions.ts b/modules/@angular/compiler/src/assertions.ts
similarity index 100%
rename from modules/angular2/src/compiler/assertions.ts
rename to modules/@angular/compiler/src/assertions.ts
diff --git a/modules/angular2/src/compiler/chars.ts b/modules/@angular/compiler/src/chars.ts
similarity index 100%
rename from modules/angular2/src/compiler/chars.ts
rename to modules/@angular/compiler/src/chars.ts
diff --git a/modules/angular2/src/compiler/compile_metadata.ts b/modules/@angular/compiler/src/compile_metadata.ts
similarity index 100%
rename from modules/angular2/src/compiler/compile_metadata.ts
rename to modules/@angular/compiler/src/compile_metadata.ts
diff --git a/modules/angular2/src/compiler/compiler.ts b/modules/@angular/compiler/src/compiler.ts
similarity index 100%
rename from modules/angular2/src/compiler/compiler.ts
rename to modules/@angular/compiler/src/compiler.ts
diff --git a/modules/angular2/src/compiler/config.ts b/modules/@angular/compiler/src/config.ts
similarity index 100%
rename from modules/angular2/src/compiler/config.ts
rename to modules/@angular/compiler/src/config.ts
diff --git a/modules/angular2/src/compiler/css/lexer.ts b/modules/@angular/compiler/src/css/lexer.ts
similarity index 100%
rename from modules/angular2/src/compiler/css/lexer.ts
rename to modules/@angular/compiler/src/css/lexer.ts
diff --git a/modules/angular2/src/compiler/css/parser.ts b/modules/@angular/compiler/src/css/parser.ts
similarity index 100%
rename from modules/angular2/src/compiler/css/parser.ts
rename to modules/@angular/compiler/src/css/parser.ts
diff --git a/modules/angular2/src/compiler/directive_lifecycle_reflector.dart b/modules/@angular/compiler/src/directive_lifecycle_reflector.dart
similarity index 100%
rename from modules/angular2/src/compiler/directive_lifecycle_reflector.dart
rename to modules/@angular/compiler/src/directive_lifecycle_reflector.dart
diff --git a/modules/angular2/src/compiler/directive_lifecycle_reflector.ts b/modules/@angular/compiler/src/directive_lifecycle_reflector.ts
similarity index 100%
rename from modules/angular2/src/compiler/directive_lifecycle_reflector.ts
rename to modules/@angular/compiler/src/directive_lifecycle_reflector.ts
diff --git a/modules/angular2/src/compiler/directive_normalizer.ts b/modules/@angular/compiler/src/directive_normalizer.ts
similarity index 100%
rename from modules/angular2/src/compiler/directive_normalizer.ts
rename to modules/@angular/compiler/src/directive_normalizer.ts
diff --git a/modules/angular2/src/compiler/directive_resolver.ts b/modules/@angular/compiler/src/directive_resolver.ts
similarity index 100%
rename from modules/angular2/src/compiler/directive_resolver.ts
rename to modules/@angular/compiler/src/directive_resolver.ts
diff --git a/modules/angular2/src/compiler/expression_parser/ast.ts b/modules/@angular/compiler/src/expression_parser/ast.ts
similarity index 100%
rename from modules/angular2/src/compiler/expression_parser/ast.ts
rename to modules/@angular/compiler/src/expression_parser/ast.ts
diff --git a/modules/angular2/src/compiler/expression_parser/lexer.ts b/modules/@angular/compiler/src/expression_parser/lexer.ts
similarity index 100%
rename from modules/angular2/src/compiler/expression_parser/lexer.ts
rename to modules/@angular/compiler/src/expression_parser/lexer.ts
diff --git a/modules/angular2/src/compiler/expression_parser/parser.ts b/modules/@angular/compiler/src/expression_parser/parser.ts
similarity index 100%
rename from modules/angular2/src/compiler/expression_parser/parser.ts
rename to modules/@angular/compiler/src/expression_parser/parser.ts
diff --git a/modules/angular2/src/compiler/html_ast.ts b/modules/@angular/compiler/src/html_ast.ts
similarity index 100%
rename from modules/angular2/src/compiler/html_ast.ts
rename to modules/@angular/compiler/src/html_ast.ts
diff --git a/modules/angular2/src/compiler/html_lexer.ts b/modules/@angular/compiler/src/html_lexer.ts
similarity index 100%
rename from modules/angular2/src/compiler/html_lexer.ts
rename to modules/@angular/compiler/src/html_lexer.ts
diff --git a/modules/angular2/src/compiler/html_parser.ts b/modules/@angular/compiler/src/html_parser.ts
similarity index 100%
rename from modules/angular2/src/compiler/html_parser.ts
rename to modules/@angular/compiler/src/html_parser.ts
diff --git a/modules/angular2/src/compiler/html_tags.ts b/modules/@angular/compiler/src/html_tags.ts
similarity index 100%
rename from modules/angular2/src/compiler/html_tags.ts
rename to modules/@angular/compiler/src/html_tags.ts
diff --git a/modules/angular2/src/i18n/expander.ts b/modules/@angular/compiler/src/i18n/expander.ts
similarity index 100%
rename from modules/angular2/src/i18n/expander.ts
rename to modules/@angular/compiler/src/i18n/expander.ts
diff --git a/modules/angular2/src/i18n/i18n_html_parser.ts b/modules/@angular/compiler/src/i18n/i18n_html_parser.ts
similarity index 100%
rename from modules/angular2/src/i18n/i18n_html_parser.ts
rename to modules/@angular/compiler/src/i18n/i18n_html_parser.ts
diff --git a/modules/angular2/src/i18n/message.ts b/modules/@angular/compiler/src/i18n/message.ts
similarity index 100%
rename from modules/angular2/src/i18n/message.ts
rename to modules/@angular/compiler/src/i18n/message.ts
diff --git a/modules/angular2/src/i18n/message_extractor.ts b/modules/@angular/compiler/src/i18n/message_extractor.ts
similarity index 100%
rename from modules/angular2/src/i18n/message_extractor.ts
rename to modules/@angular/compiler/src/i18n/message_extractor.ts
diff --git a/modules/angular2/src/i18n/shared.ts b/modules/@angular/compiler/src/i18n/shared.ts
similarity index 100%
rename from modules/angular2/src/i18n/shared.ts
rename to modules/@angular/compiler/src/i18n/shared.ts
diff --git a/modules/angular2/src/i18n/xmb_serializer.ts b/modules/@angular/compiler/src/i18n/xmb_serializer.ts
similarity index 100%
rename from modules/angular2/src/i18n/xmb_serializer.ts
rename to modules/@angular/compiler/src/i18n/xmb_serializer.ts
diff --git a/modules/angular2/src/compiler/identifiers.ts b/modules/@angular/compiler/src/identifiers.ts
similarity index 100%
rename from modules/angular2/src/compiler/identifiers.ts
rename to modules/@angular/compiler/src/identifiers.ts
diff --git a/modules/angular2/src/compiler/legacy_template.ts b/modules/@angular/compiler/src/legacy_template.ts
similarity index 100%
rename from modules/angular2/src/compiler/legacy_template.ts
rename to modules/@angular/compiler/src/legacy_template.ts
diff --git a/modules/angular2/src/compiler/metadata_resolver.ts b/modules/@angular/compiler/src/metadata_resolver.ts
similarity index 100%
rename from modules/angular2/src/compiler/metadata_resolver.ts
rename to modules/@angular/compiler/src/metadata_resolver.ts
diff --git a/modules/angular2/src/compiler/offline_compiler.ts b/modules/@angular/compiler/src/offline_compiler.ts
similarity index 100%
rename from modules/angular2/src/compiler/offline_compiler.ts
rename to modules/@angular/compiler/src/offline_compiler.ts
diff --git a/modules/angular2/src/compiler/output/abstract_emitter.ts b/modules/@angular/compiler/src/output/abstract_emitter.ts
similarity index 100%
rename from modules/angular2/src/compiler/output/abstract_emitter.ts
rename to modules/@angular/compiler/src/output/abstract_emitter.ts
diff --git a/modules/angular2/src/compiler/output/abstract_js_emitter.ts b/modules/@angular/compiler/src/output/abstract_js_emitter.ts
similarity index 100%
rename from modules/angular2/src/compiler/output/abstract_js_emitter.ts
rename to modules/@angular/compiler/src/output/abstract_js_emitter.ts
diff --git a/modules/angular2/src/compiler/output/dart_emitter.ts b/modules/@angular/compiler/src/output/dart_emitter.ts
similarity index 100%
rename from modules/angular2/src/compiler/output/dart_emitter.ts
rename to modules/@angular/compiler/src/output/dart_emitter.ts
diff --git a/modules/angular2/src/compiler/output/interpretive_view.ts b/modules/@angular/compiler/src/output/interpretive_view.ts
similarity index 100%
rename from modules/angular2/src/compiler/output/interpretive_view.ts
rename to modules/@angular/compiler/src/output/interpretive_view.ts
diff --git a/modules/angular2/src/compiler/output/js_emitter.ts b/modules/@angular/compiler/src/output/js_emitter.ts
similarity index 100%
rename from modules/angular2/src/compiler/output/js_emitter.ts
rename to modules/@angular/compiler/src/output/js_emitter.ts
diff --git a/modules/angular2/src/compiler/output/output_ast.ts b/modules/@angular/compiler/src/output/output_ast.ts
similarity index 100%
rename from modules/angular2/src/compiler/output/output_ast.ts
rename to modules/@angular/compiler/src/output/output_ast.ts
diff --git a/modules/angular2/src/compiler/output/output_interpreter.ts b/modules/@angular/compiler/src/output/output_interpreter.ts
similarity index 100%
rename from modules/angular2/src/compiler/output/output_interpreter.ts
rename to modules/@angular/compiler/src/output/output_interpreter.ts
diff --git a/modules/angular2/src/compiler/output/output_jit.ts b/modules/@angular/compiler/src/output/output_jit.ts
similarity index 100%
rename from modules/angular2/src/compiler/output/output_jit.ts
rename to modules/@angular/compiler/src/output/output_jit.ts
diff --git a/modules/angular2/src/compiler/output/path_util.ts b/modules/@angular/compiler/src/output/path_util.ts
similarity index 100%
rename from modules/angular2/src/compiler/output/path_util.ts
rename to modules/@angular/compiler/src/output/path_util.ts
diff --git a/modules/angular2/src/compiler/output/ts_emitter.ts b/modules/@angular/compiler/src/output/ts_emitter.ts
similarity index 100%
rename from modules/angular2/src/compiler/output/ts_emitter.ts
rename to modules/@angular/compiler/src/output/ts_emitter.ts
diff --git a/modules/angular2/src/compiler/parse_util.ts b/modules/@angular/compiler/src/parse_util.ts
similarity index 100%
rename from modules/angular2/src/compiler/parse_util.ts
rename to modules/@angular/compiler/src/parse_util.ts
diff --git a/modules/angular2/src/compiler/pipe_resolver.ts b/modules/@angular/compiler/src/pipe_resolver.ts
similarity index 100%
rename from modules/angular2/src/compiler/pipe_resolver.ts
rename to modules/@angular/compiler/src/pipe_resolver.ts
diff --git a/modules/angular2/src/compiler/provider_parser.ts b/modules/@angular/compiler/src/provider_parser.ts
similarity index 100%
rename from modules/angular2/src/compiler/provider_parser.ts
rename to modules/@angular/compiler/src/provider_parser.ts
diff --git a/modules/angular2/src/compiler/runtime_compiler.ts b/modules/@angular/compiler/src/runtime_compiler.ts
similarity index 100%
rename from modules/angular2/src/compiler/runtime_compiler.ts
rename to modules/@angular/compiler/src/runtime_compiler.ts
diff --git a/modules/angular2/src/compiler/schema/dom_element_schema_registry.ts b/modules/@angular/compiler/src/schema/dom_element_schema_registry.ts
similarity index 100%
rename from modules/angular2/src/compiler/schema/dom_element_schema_registry.ts
rename to modules/@angular/compiler/src/schema/dom_element_schema_registry.ts
diff --git a/modules/angular2/src/compiler/schema/element_schema_registry.ts b/modules/@angular/compiler/src/schema/element_schema_registry.ts
similarity index 100%
rename from modules/angular2/src/compiler/schema/element_schema_registry.ts
rename to modules/@angular/compiler/src/schema/element_schema_registry.ts
diff --git a/modules/angular2/src/compiler/selector.ts b/modules/@angular/compiler/src/selector.ts
similarity index 100%
rename from modules/angular2/src/compiler/selector.ts
rename to modules/@angular/compiler/src/selector.ts
diff --git a/modules/angular2/src/compiler/shadow_css.ts b/modules/@angular/compiler/src/shadow_css.ts
similarity index 100%
rename from modules/angular2/src/compiler/shadow_css.ts
rename to modules/@angular/compiler/src/shadow_css.ts
diff --git a/modules/angular2/src/compiler/style_compiler.ts b/modules/@angular/compiler/src/style_compiler.ts
similarity index 100%
rename from modules/angular2/src/compiler/style_compiler.ts
rename to modules/@angular/compiler/src/style_compiler.ts
diff --git a/modules/angular2/src/compiler/style_url_resolver.ts b/modules/@angular/compiler/src/style_url_resolver.ts
similarity index 100%
rename from modules/angular2/src/compiler/style_url_resolver.ts
rename to modules/@angular/compiler/src/style_url_resolver.ts
diff --git a/modules/angular2/src/compiler/template_ast.ts b/modules/@angular/compiler/src/template_ast.ts
similarity index 100%
rename from modules/angular2/src/compiler/template_ast.ts
rename to modules/@angular/compiler/src/template_ast.ts
diff --git a/modules/angular2/src/compiler/template_parser.ts b/modules/@angular/compiler/src/template_parser.ts
similarity index 100%
rename from modules/angular2/src/compiler/template_parser.ts
rename to modules/@angular/compiler/src/template_parser.ts
diff --git a/modules/angular2/src/compiler/template_preparser.ts b/modules/@angular/compiler/src/template_preparser.ts
similarity index 100%
rename from modules/angular2/src/compiler/template_preparser.ts
rename to modules/@angular/compiler/src/template_preparser.ts
diff --git a/modules/angular2/src/compiler/url_resolver.dart b/modules/@angular/compiler/src/url_resolver.dart
similarity index 100%
rename from modules/angular2/src/compiler/url_resolver.dart
rename to modules/@angular/compiler/src/url_resolver.dart
diff --git a/modules/angular2/src/compiler/url_resolver.ts b/modules/@angular/compiler/src/url_resolver.ts
similarity index 100%
rename from modules/angular2/src/compiler/url_resolver.ts
rename to modules/@angular/compiler/src/url_resolver.ts
diff --git a/modules/angular2/src/compiler/util.ts b/modules/@angular/compiler/src/util.ts
similarity index 100%
rename from modules/angular2/src/compiler/util.ts
rename to modules/@angular/compiler/src/util.ts
diff --git a/modules/angular2/src/compiler/view_compiler/compile_binding.ts b/modules/@angular/compiler/src/view_compiler/compile_binding.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/compile_binding.ts
rename to modules/@angular/compiler/src/view_compiler/compile_binding.ts
diff --git a/modules/angular2/src/compiler/view_compiler/compile_element.ts b/modules/@angular/compiler/src/view_compiler/compile_element.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/compile_element.ts
rename to modules/@angular/compiler/src/view_compiler/compile_element.ts
diff --git a/modules/angular2/src/compiler/view_compiler/compile_method.ts b/modules/@angular/compiler/src/view_compiler/compile_method.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/compile_method.ts
rename to modules/@angular/compiler/src/view_compiler/compile_method.ts
diff --git a/modules/angular2/src/compiler/view_compiler/compile_pipe.ts b/modules/@angular/compiler/src/view_compiler/compile_pipe.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/compile_pipe.ts
rename to modules/@angular/compiler/src/view_compiler/compile_pipe.ts
diff --git a/modules/angular2/src/compiler/view_compiler/compile_query.ts b/modules/@angular/compiler/src/view_compiler/compile_query.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/compile_query.ts
rename to modules/@angular/compiler/src/view_compiler/compile_query.ts
diff --git a/modules/angular2/src/compiler/view_compiler/compile_view.ts b/modules/@angular/compiler/src/view_compiler/compile_view.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/compile_view.ts
rename to modules/@angular/compiler/src/view_compiler/compile_view.ts
diff --git a/modules/angular2/src/compiler/view_compiler/constants.ts b/modules/@angular/compiler/src/view_compiler/constants.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/constants.ts
rename to modules/@angular/compiler/src/view_compiler/constants.ts
diff --git a/modules/angular2/src/compiler/view_compiler/event_binder.ts b/modules/@angular/compiler/src/view_compiler/event_binder.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/event_binder.ts
rename to modules/@angular/compiler/src/view_compiler/event_binder.ts
diff --git a/modules/angular2/src/compiler/view_compiler/expression_converter.ts b/modules/@angular/compiler/src/view_compiler/expression_converter.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/expression_converter.ts
rename to modules/@angular/compiler/src/view_compiler/expression_converter.ts
diff --git a/modules/angular2/src/compiler/view_compiler/lifecycle_binder.ts b/modules/@angular/compiler/src/view_compiler/lifecycle_binder.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/lifecycle_binder.ts
rename to modules/@angular/compiler/src/view_compiler/lifecycle_binder.ts
diff --git a/modules/angular2/src/compiler/view_compiler/property_binder.ts b/modules/@angular/compiler/src/view_compiler/property_binder.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/property_binder.ts
rename to modules/@angular/compiler/src/view_compiler/property_binder.ts
diff --git a/modules/angular2/src/compiler/view_compiler/util.ts b/modules/@angular/compiler/src/view_compiler/util.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/util.ts
rename to modules/@angular/compiler/src/view_compiler/util.ts
diff --git a/modules/angular2/src/compiler/view_compiler/view_binder.ts b/modules/@angular/compiler/src/view_compiler/view_binder.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/view_binder.ts
rename to modules/@angular/compiler/src/view_compiler/view_binder.ts
diff --git a/modules/angular2/src/compiler/view_compiler/view_builder.ts b/modules/@angular/compiler/src/view_compiler/view_builder.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/view_builder.ts
rename to modules/@angular/compiler/src/view_compiler/view_builder.ts
diff --git a/modules/angular2/src/compiler/view_compiler/view_compiler.ts b/modules/@angular/compiler/src/view_compiler/view_compiler.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_compiler/view_compiler.ts
rename to modules/@angular/compiler/src/view_compiler/view_compiler.ts
diff --git a/modules/angular2/src/compiler/view_resolver.ts b/modules/@angular/compiler/src/view_resolver.ts
similarity index 100%
rename from modules/angular2/src/compiler/view_resolver.ts
rename to modules/@angular/compiler/src/view_resolver.ts
diff --git a/modules/angular2/src/compiler/xhr.ts b/modules/@angular/compiler/src/xhr.ts
similarity index 100%
rename from modules/angular2/src/compiler/xhr.ts
rename to modules/@angular/compiler/src/xhr.ts
diff --git a/modules/angular2/test/compiler/compile_metadata_spec.ts b/modules/@angular/compiler/test/compile_metadata_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/compile_metadata_spec.ts
rename to modules/@angular/compiler/test/compile_metadata_spec.ts
diff --git a/modules/angular2/test/compiler/css/lexer_spec.ts b/modules/@angular/compiler/test/css/lexer_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/css/lexer_spec.ts
rename to modules/@angular/compiler/test/css/lexer_spec.ts
diff --git a/modules/angular2/test/compiler/css/parser_spec.ts b/modules/@angular/compiler/test/css/parser_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/css/parser_spec.ts
rename to modules/@angular/compiler/test/css/parser_spec.ts
diff --git a/modules/angular2/test/compiler/css/visitor_spec.ts b/modules/@angular/compiler/test/css/visitor_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/css/visitor_spec.ts
rename to modules/@angular/compiler/test/css/visitor_spec.ts
diff --git a/modules/angular2/test/compiler/directive_lifecycle_spec.dart b/modules/@angular/compiler/test/directive_lifecycle_spec.dart
similarity index 100%
rename from modules/angular2/test/compiler/directive_lifecycle_spec.dart
rename to modules/@angular/compiler/test/directive_lifecycle_spec.dart
diff --git a/modules/angular2/test/compiler/directive_lifecycle_spec.ts b/modules/@angular/compiler/test/directive_lifecycle_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/directive_lifecycle_spec.ts
rename to modules/@angular/compiler/test/directive_lifecycle_spec.ts
diff --git a/modules/angular2/test/compiler/directive_normalizer_spec.ts b/modules/@angular/compiler/test/directive_normalizer_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/directive_normalizer_spec.ts
rename to modules/@angular/compiler/test/directive_normalizer_spec.ts
diff --git a/modules/angular2/test/compiler/directive_resolver_spec.ts b/modules/@angular/compiler/test/directive_resolver_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/directive_resolver_spec.ts
rename to modules/@angular/compiler/test/directive_resolver_spec.ts
diff --git a/modules/angular2/test/compiler/expression_parser/lexer_spec.ts b/modules/@angular/compiler/test/expression_parser/lexer_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/expression_parser/lexer_spec.ts
rename to modules/@angular/compiler/test/expression_parser/lexer_spec.ts
diff --git a/modules/angular2/test/compiler/expression_parser/parser_spec.ts b/modules/@angular/compiler/test/expression_parser/parser_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/expression_parser/parser_spec.ts
rename to modules/@angular/compiler/test/expression_parser/parser_spec.ts
diff --git a/modules/angular2/test/compiler/expression_parser/unparser.ts b/modules/@angular/compiler/test/expression_parser/unparser.ts
similarity index 100%
rename from modules/angular2/test/compiler/expression_parser/unparser.ts
rename to modules/@angular/compiler/test/expression_parser/unparser.ts
diff --git a/modules/angular2/test/compiler/html_ast_spec_utils.ts b/modules/@angular/compiler/test/html_ast_spec_utils.ts
similarity index 100%
rename from modules/angular2/test/compiler/html_ast_spec_utils.ts
rename to modules/@angular/compiler/test/html_ast_spec_utils.ts
diff --git a/modules/angular2/test/compiler/html_lexer_spec.ts b/modules/@angular/compiler/test/html_lexer_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/html_lexer_spec.ts
rename to modules/@angular/compiler/test/html_lexer_spec.ts
diff --git a/modules/angular2/test/compiler/html_parser_spec.ts b/modules/@angular/compiler/test/html_parser_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/html_parser_spec.ts
rename to modules/@angular/compiler/test/html_parser_spec.ts
diff --git a/modules/angular2/test/i18n/i18n_html_parser_spec.ts b/modules/@angular/compiler/test/i18n/i18n_html_parser_spec.ts
similarity index 100%
rename from modules/angular2/test/i18n/i18n_html_parser_spec.ts
rename to modules/@angular/compiler/test/i18n/i18n_html_parser_spec.ts
diff --git a/modules/angular2/test/i18n/message_extractor_spec.ts b/modules/@angular/compiler/test/i18n/message_extractor_spec.ts
similarity index 100%
rename from modules/angular2/test/i18n/message_extractor_spec.ts
rename to modules/@angular/compiler/test/i18n/message_extractor_spec.ts
diff --git a/modules/angular2/test/i18n/message_spec.ts b/modules/@angular/compiler/test/i18n/message_spec.ts
similarity index 100%
rename from modules/angular2/test/i18n/message_spec.ts
rename to modules/@angular/compiler/test/i18n/message_spec.ts
diff --git a/modules/angular2/test/i18n/xmb_serializer_spec.ts b/modules/@angular/compiler/test/i18n/xmb_serializer_spec.ts
similarity index 100%
rename from modules/angular2/test/i18n/xmb_serializer_spec.ts
rename to modules/@angular/compiler/test/i18n/xmb_serializer_spec.ts
diff --git a/modules/angular2/test/compiler/legacy_template_spec.ts b/modules/@angular/compiler/test/legacy_template_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/legacy_template_spec.ts
rename to modules/@angular/compiler/test/legacy_template_spec.ts
diff --git a/modules/angular2/test/compiler/metadata_resolver_fixture.dart b/modules/@angular/compiler/test/metadata_resolver_fixture.dart
similarity index 100%
rename from modules/angular2/test/compiler/metadata_resolver_fixture.dart
rename to modules/@angular/compiler/test/metadata_resolver_fixture.dart
diff --git a/modules/angular2/test/compiler/metadata_resolver_fixture.ts b/modules/@angular/compiler/test/metadata_resolver_fixture.ts
similarity index 100%
rename from modules/angular2/test/compiler/metadata_resolver_fixture.ts
rename to modules/@angular/compiler/test/metadata_resolver_fixture.ts
diff --git a/modules/angular2/test/compiler/metadata_resolver_spec.ts b/modules/@angular/compiler/test/metadata_resolver_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/metadata_resolver_spec.ts
rename to modules/@angular/compiler/test/metadata_resolver_spec.ts
diff --git a/modules/angular2/test/compiler/offline_compiler_codegen_typed.ts b/modules/@angular/compiler/test/offline_compiler_codegen_typed.ts
similarity index 100%
rename from modules/angular2/test/compiler/offline_compiler_codegen_typed.ts
rename to modules/@angular/compiler/test/offline_compiler_codegen_typed.ts
diff --git a/modules/angular2/test/compiler/offline_compiler_codegen_untyped.ts b/modules/@angular/compiler/test/offline_compiler_codegen_untyped.ts
similarity index 100%
rename from modules/angular2/test/compiler/offline_compiler_codegen_untyped.ts
rename to modules/@angular/compiler/test/offline_compiler_codegen_untyped.ts
diff --git a/modules/angular2/test/compiler/offline_compiler_compa.css.shim.ts b/modules/@angular/compiler/test/offline_compiler_compa.css.shim.ts
similarity index 100%
rename from modules/angular2/test/compiler/offline_compiler_compa.css.shim.ts
rename to modules/@angular/compiler/test/offline_compiler_compa.css.shim.ts
diff --git a/modules/angular2/test/compiler/offline_compiler_spec.ts b/modules/@angular/compiler/test/offline_compiler_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/offline_compiler_spec.ts
rename to modules/@angular/compiler/test/offline_compiler_spec.ts
diff --git a/modules/angular2/test/compiler/offline_compiler_util.ts b/modules/@angular/compiler/test/offline_compiler_util.ts
similarity index 100%
rename from modules/angular2/test/compiler/offline_compiler_util.ts
rename to modules/@angular/compiler/test/offline_compiler_util.ts
diff --git a/modules/angular2/test/compiler/output/abstract_emitter_spec.ts b/modules/@angular/compiler/test/output/abstract_emitter_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/output/abstract_emitter_spec.ts
rename to modules/@angular/compiler/test/output/abstract_emitter_spec.ts
diff --git a/modules/angular2/test/compiler/output/dart_emitter_spec.ts b/modules/@angular/compiler/test/output/dart_emitter_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/output/dart_emitter_spec.ts
rename to modules/@angular/compiler/test/output/dart_emitter_spec.ts
diff --git a/modules/angular2/test/compiler/output/js_emitter_spec.ts b/modules/@angular/compiler/test/output/js_emitter_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/output/js_emitter_spec.ts
rename to modules/@angular/compiler/test/output/js_emitter_spec.ts
diff --git a/modules/angular2/test/compiler/output/output_emitter_codegen_typed.ts b/modules/@angular/compiler/test/output/output_emitter_codegen_typed.ts
similarity index 100%
rename from modules/angular2/test/compiler/output/output_emitter_codegen_typed.ts
rename to modules/@angular/compiler/test/output/output_emitter_codegen_typed.ts
diff --git a/modules/angular2/test/compiler/output/output_emitter_codegen_untyped.ts b/modules/@angular/compiler/test/output/output_emitter_codegen_untyped.ts
similarity index 100%
rename from modules/angular2/test/compiler/output/output_emitter_codegen_untyped.ts
rename to modules/@angular/compiler/test/output/output_emitter_codegen_untyped.ts
diff --git a/modules/angular2/test/compiler/output/output_emitter_spec.ts b/modules/@angular/compiler/test/output/output_emitter_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/output/output_emitter_spec.ts
rename to modules/@angular/compiler/test/output/output_emitter_spec.ts
diff --git a/modules/angular2/test/compiler/output/output_emitter_util.ts b/modules/@angular/compiler/test/output/output_emitter_util.ts
similarity index 100%
rename from modules/angular2/test/compiler/output/output_emitter_util.ts
rename to modules/@angular/compiler/test/output/output_emitter_util.ts
diff --git a/modules/angular2/test/compiler/output/path_util_spec.ts b/modules/@angular/compiler/test/output/path_util_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/output/path_util_spec.ts
rename to modules/@angular/compiler/test/output/path_util_spec.ts
diff --git a/modules/angular2/test/compiler/output/ts_emitter_spec.ts b/modules/@angular/compiler/test/output/ts_emitter_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/output/ts_emitter_spec.ts
rename to modules/@angular/compiler/test/output/ts_emitter_spec.ts
diff --git a/modules/angular2/test/compiler/schema/dom_element_schema_registry_spec.ts b/modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/schema/dom_element_schema_registry_spec.ts
rename to modules/@angular/compiler/test/schema/dom_element_schema_registry_spec.ts
diff --git a/modules/angular2/test/compiler/selector_spec.ts b/modules/@angular/compiler/test/selector_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/selector_spec.ts
rename to modules/@angular/compiler/test/selector_spec.ts
diff --git a/modules/angular2/test/compiler/shadow_css_spec.ts b/modules/@angular/compiler/test/shadow_css_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/shadow_css_spec.ts
rename to modules/@angular/compiler/test/shadow_css_spec.ts
diff --git a/modules/angular2/test/compiler/spies.dart b/modules/@angular/compiler/test/spies.dart
similarity index 100%
rename from modules/angular2/test/compiler/spies.dart
rename to modules/@angular/compiler/test/spies.dart
diff --git a/modules/angular2/test/compiler/spies.ts b/modules/@angular/compiler/test/spies.ts
similarity index 100%
rename from modules/angular2/test/compiler/spies.ts
rename to modules/@angular/compiler/test/spies.ts
diff --git a/modules/angular2/test/compiler/style_url_resolver_spec.ts b/modules/@angular/compiler/test/style_url_resolver_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/style_url_resolver_spec.ts
rename to modules/@angular/compiler/test/style_url_resolver_spec.ts
diff --git a/modules/angular2/test/compiler/template_parser_spec.ts b/modules/@angular/compiler/test/template_parser_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/template_parser_spec.ts
rename to modules/@angular/compiler/test/template_parser_spec.ts
diff --git a/modules/angular2/test/compiler/template_preparser_spec.ts b/modules/@angular/compiler/test/template_preparser_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/template_preparser_spec.ts
rename to modules/@angular/compiler/test/template_preparser_spec.ts
diff --git a/modules/angular2/test/compiler/test_bindings.ts b/modules/@angular/compiler/test/test_bindings.ts
similarity index 100%
rename from modules/angular2/test/compiler/test_bindings.ts
rename to modules/@angular/compiler/test/test_bindings.ts
diff --git a/modules/angular2/test/testing/test_component_builder_spec.ts b/modules/@angular/compiler/test/test_component_builder_spec.ts
similarity index 100%
rename from modules/angular2/test/testing/test_component_builder_spec.ts
rename to modules/@angular/compiler/test/test_component_builder_spec.ts
diff --git a/modules/angular2/test/compiler/url_resolver_spec.ts b/modules/@angular/compiler/test/url_resolver_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/url_resolver_spec.ts
rename to modules/@angular/compiler/test/url_resolver_spec.ts
diff --git a/modules/angular2/test/mock/view_resolver_mock_spec.ts b/modules/@angular/compiler/test/view_resolver_mock_spec.ts
similarity index 100%
rename from modules/angular2/test/mock/view_resolver_mock_spec.ts
rename to modules/@angular/compiler/test/view_resolver_mock_spec.ts
diff --git a/modules/angular2/test/compiler/view_resolver_spec.ts b/modules/@angular/compiler/test/view_resolver_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/view_resolver_spec.ts
rename to modules/@angular/compiler/test/view_resolver_spec.ts
diff --git a/modules/angular2/test/compiler/xhr_mock_spec.ts b/modules/@angular/compiler/test/xhr_mock_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/xhr_mock_spec.ts
rename to modules/@angular/compiler/test/xhr_mock_spec.ts
diff --git a/modules/angular2/src/mock/directive_resolver_mock.ts b/modules/@angular/compiler/testing/directive_resolver_mock.ts
similarity index 100%
rename from modules/angular2/src/mock/directive_resolver_mock.ts
rename to modules/@angular/compiler/testing/directive_resolver_mock.ts
diff --git a/modules/angular2/test/compiler/schema_registry_mock.ts b/modules/@angular/compiler/testing/schema_registry_mock.ts
similarity index 100%
rename from modules/angular2/test/compiler/schema_registry_mock.ts
rename to modules/@angular/compiler/testing/schema_registry_mock.ts
diff --git a/modules/angular2/src/testing/test_component_builder.ts b/modules/@angular/compiler/testing/test_component_builder.ts
similarity index 100%
rename from modules/angular2/src/testing/test_component_builder.ts
rename to modules/@angular/compiler/testing/test_component_builder.ts
diff --git a/modules/angular2/src/mock/view_resolver_mock.ts b/modules/@angular/compiler/testing/view_resolver_mock.ts
similarity index 100%
rename from modules/angular2/src/mock/view_resolver_mock.ts
rename to modules/@angular/compiler/testing/view_resolver_mock.ts
diff --git a/modules/angular2/src/compiler/xhr_mock.ts b/modules/@angular/compiler/testing/xhr_mock.ts
similarity index 100%
rename from modules/angular2/src/compiler/xhr_mock.ts
rename to modules/@angular/compiler/testing/xhr_mock.ts
diff --git a/modules/angular2/core.dart b/modules/@angular/core/core.dart
similarity index 100%
rename from modules/angular2/core.dart
rename to modules/@angular/core/core.dart
diff --git a/modules/angular2/core.ts b/modules/@angular/core/core.ts
similarity index 100%
rename from modules/angular2/core.ts
rename to modules/@angular/core/core.ts
diff --git a/modules/angular2/src/core/angular_entrypoint.dart b/modules/@angular/core/src/angular_entrypoint.dart
similarity index 100%
rename from modules/angular2/src/core/angular_entrypoint.dart
rename to modules/@angular/core/src/angular_entrypoint.dart
diff --git a/modules/angular2/src/core/angular_entrypoint.ts b/modules/@angular/core/src/angular_entrypoint.ts
similarity index 100%
rename from modules/angular2/src/core/angular_entrypoint.ts
rename to modules/@angular/core/src/angular_entrypoint.ts
diff --git a/modules/angular2/src/core/application_common_providers.ts b/modules/@angular/core/src/application_common_providers.ts
similarity index 100%
rename from modules/angular2/src/core/application_common_providers.ts
rename to modules/@angular/core/src/application_common_providers.ts
diff --git a/modules/angular2/src/core/application_ref.ts b/modules/@angular/core/src/application_ref.ts
similarity index 100%
rename from modules/angular2/src/core/application_ref.ts
rename to modules/@angular/core/src/application_ref.ts
diff --git a/modules/angular2/src/core/application_tokens.ts b/modules/@angular/core/src/application_tokens.ts
similarity index 100%
rename from modules/angular2/src/core/application_tokens.ts
rename to modules/@angular/core/src/application_tokens.ts
diff --git a/modules/angular2/src/core/change_detection.ts b/modules/@angular/core/src/change_detection.ts
similarity index 100%
rename from modules/angular2/src/core/change_detection.ts
rename to modules/@angular/core/src/change_detection.ts
diff --git a/modules/angular2/src/core/change_detection/change_detection.ts b/modules/@angular/core/src/change_detection/change_detection.ts
similarity index 100%
rename from modules/angular2/src/core/change_detection/change_detection.ts
rename to modules/@angular/core/src/change_detection/change_detection.ts
diff --git a/modules/angular2/src/core/change_detection/change_detection_util.ts b/modules/@angular/core/src/change_detection/change_detection_util.ts
similarity index 100%
rename from modules/angular2/src/core/change_detection/change_detection_util.ts
rename to modules/@angular/core/src/change_detection/change_detection_util.ts
diff --git a/modules/angular2/src/core/change_detection/change_detector_ref.ts b/modules/@angular/core/src/change_detection/change_detector_ref.ts
similarity index 100%
rename from modules/angular2/src/core/change_detection/change_detector_ref.ts
rename to modules/@angular/core/src/change_detection/change_detector_ref.ts
diff --git a/modules/angular2/src/core/change_detection/constants.ts b/modules/@angular/core/src/change_detection/constants.ts
similarity index 100%
rename from modules/angular2/src/core/change_detection/constants.ts
rename to modules/@angular/core/src/change_detection/constants.ts
diff --git a/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts b/modules/@angular/core/src/change_detection/differs/default_iterable_differ.ts
similarity index 100%
rename from modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts
rename to modules/@angular/core/src/change_detection/differs/default_iterable_differ.ts
diff --git a/modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts b/modules/@angular/core/src/change_detection/differs/default_keyvalue_differ.ts
similarity index 100%
rename from modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts
rename to modules/@angular/core/src/change_detection/differs/default_keyvalue_differ.ts
diff --git a/modules/angular2/src/core/change_detection/differs/iterable_differs.ts b/modules/@angular/core/src/change_detection/differs/iterable_differs.ts
similarity index 100%
rename from modules/angular2/src/core/change_detection/differs/iterable_differs.ts
rename to modules/@angular/core/src/change_detection/differs/iterable_differs.ts
diff --git a/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts b/modules/@angular/core/src/change_detection/differs/keyvalue_differs.ts
similarity index 100%
rename from modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts
rename to modules/@angular/core/src/change_detection/differs/keyvalue_differs.ts
diff --git a/modules/angular2/src/core/change_detection/pipe_transform.dart b/modules/@angular/core/src/change_detection/pipe_transform.dart
similarity index 100%
rename from modules/angular2/src/core/change_detection/pipe_transform.dart
rename to modules/@angular/core/src/change_detection/pipe_transform.dart
diff --git a/modules/angular2/src/core/change_detection/pipe_transform.ts b/modules/@angular/core/src/change_detection/pipe_transform.ts
similarity index 100%
rename from modules/angular2/src/core/change_detection/pipe_transform.ts
rename to modules/@angular/core/src/change_detection/pipe_transform.ts
diff --git a/modules/angular2/src/core/console.ts b/modules/@angular/core/src/console.ts
similarity index 100%
rename from modules/angular2/src/core/console.ts
rename to modules/@angular/core/src/console.ts
diff --git a/modules/angular2/src/core/debug/debug_node.ts b/modules/@angular/core/src/debug/debug_node.ts
similarity index 100%
rename from modules/angular2/src/core/debug/debug_node.ts
rename to modules/@angular/core/src/debug/debug_node.ts
diff --git a/modules/angular2/src/core/debug/debug_renderer.ts b/modules/@angular/core/src/debug/debug_renderer.ts
similarity index 100%
rename from modules/angular2/src/core/debug/debug_renderer.ts
rename to modules/@angular/core/src/debug/debug_renderer.ts
diff --git a/modules/angular2/src/core/di.ts b/modules/@angular/core/src/di.ts
similarity index 100%
rename from modules/angular2/src/core/di.ts
rename to modules/@angular/core/src/di.ts
diff --git a/modules/angular2/src/core/di/decorators.dart b/modules/@angular/core/src/di/decorators.dart
similarity index 100%
rename from modules/angular2/src/core/di/decorators.dart
rename to modules/@angular/core/src/di/decorators.dart
diff --git a/modules/angular2/src/core/di/decorators.ts b/modules/@angular/core/src/di/decorators.ts
similarity index 100%
rename from modules/angular2/src/core/di/decorators.ts
rename to modules/@angular/core/src/di/decorators.ts
diff --git a/modules/angular2/src/core/di/forward_ref.dart b/modules/@angular/core/src/di/forward_ref.dart
similarity index 100%
rename from modules/angular2/src/core/di/forward_ref.dart
rename to modules/@angular/core/src/di/forward_ref.dart
diff --git a/modules/angular2/src/core/di/forward_ref.ts b/modules/@angular/core/src/di/forward_ref.ts
similarity index 100%
rename from modules/angular2/src/core/di/forward_ref.ts
rename to modules/@angular/core/src/di/forward_ref.ts
diff --git a/modules/angular2/src/core/di/injector.ts b/modules/@angular/core/src/di/injector.ts
similarity index 100%
rename from modules/angular2/src/core/di/injector.ts
rename to modules/@angular/core/src/di/injector.ts
diff --git a/modules/angular2/src/core/di/metadata.ts b/modules/@angular/core/src/di/metadata.ts
similarity index 100%
rename from modules/angular2/src/core/di/metadata.ts
rename to modules/@angular/core/src/di/metadata.ts
diff --git a/modules/angular2/src/core/di/opaque_token.ts b/modules/@angular/core/src/di/opaque_token.ts
similarity index 100%
rename from modules/angular2/src/core/di/opaque_token.ts
rename to modules/@angular/core/src/di/opaque_token.ts
diff --git a/modules/angular2/src/core/di/provider.ts b/modules/@angular/core/src/di/provider.ts
similarity index 100%
rename from modules/angular2/src/core/di/provider.ts
rename to modules/@angular/core/src/di/provider.ts
diff --git a/modules/angular2/src/core/di/reflective_exceptions.ts b/modules/@angular/core/src/di/reflective_exceptions.ts
similarity index 100%
rename from modules/angular2/src/core/di/reflective_exceptions.ts
rename to modules/@angular/core/src/di/reflective_exceptions.ts
diff --git a/modules/angular2/src/core/di/reflective_injector.ts b/modules/@angular/core/src/di/reflective_injector.ts
similarity index 100%
rename from modules/angular2/src/core/di/reflective_injector.ts
rename to modules/@angular/core/src/di/reflective_injector.ts
diff --git a/modules/angular2/src/core/di/reflective_key.ts b/modules/@angular/core/src/di/reflective_key.ts
similarity index 100%
rename from modules/angular2/src/core/di/reflective_key.ts
rename to modules/@angular/core/src/di/reflective_key.ts
diff --git a/modules/angular2/src/core/di/reflective_provider.ts b/modules/@angular/core/src/di/reflective_provider.ts
similarity index 100%
rename from modules/angular2/src/core/di/reflective_provider.ts
rename to modules/@angular/core/src/di/reflective_provider.ts
diff --git a/modules/angular2/src/core/linker.ts b/modules/@angular/core/src/linker.ts
similarity index 100%
rename from modules/angular2/src/core/linker.ts
rename to modules/@angular/core/src/linker.ts
diff --git a/modules/angular2/src/core/linker/component_factory.ts b/modules/@angular/core/src/linker/component_factory.ts
similarity index 100%
rename from modules/angular2/src/core/linker/component_factory.ts
rename to modules/@angular/core/src/linker/component_factory.ts
diff --git a/modules/angular2/src/core/linker/component_resolver.ts b/modules/@angular/core/src/linker/component_resolver.ts
similarity index 100%
rename from modules/angular2/src/core/linker/component_resolver.ts
rename to modules/@angular/core/src/linker/component_resolver.ts
diff --git a/modules/angular2/src/core/linker/debug_context.ts b/modules/@angular/core/src/linker/debug_context.ts
similarity index 100%
rename from modules/angular2/src/core/linker/debug_context.ts
rename to modules/@angular/core/src/linker/debug_context.ts
diff --git a/modules/angular2/src/core/linker/dynamic_component_loader.ts b/modules/@angular/core/src/linker/dynamic_component_loader.ts
similarity index 100%
rename from modules/angular2/src/core/linker/dynamic_component_loader.ts
rename to modules/@angular/core/src/linker/dynamic_component_loader.ts
diff --git a/modules/angular2/src/core/linker/element.ts b/modules/@angular/core/src/linker/element.ts
similarity index 100%
rename from modules/angular2/src/core/linker/element.ts
rename to modules/@angular/core/src/linker/element.ts
diff --git a/modules/angular2/src/core/linker/element_injector.ts b/modules/@angular/core/src/linker/element_injector.ts
similarity index 100%
rename from modules/angular2/src/core/linker/element_injector.ts
rename to modules/@angular/core/src/linker/element_injector.ts
diff --git a/modules/angular2/src/core/linker/element_ref.ts b/modules/@angular/core/src/linker/element_ref.ts
similarity index 100%
rename from modules/angular2/src/core/linker/element_ref.ts
rename to modules/@angular/core/src/linker/element_ref.ts
diff --git a/modules/angular2/src/core/linker/exceptions.ts b/modules/@angular/core/src/linker/exceptions.ts
similarity index 100%
rename from modules/angular2/src/core/linker/exceptions.ts
rename to modules/@angular/core/src/linker/exceptions.ts
diff --git a/modules/angular2/src/core/linker/query_list.dart b/modules/@angular/core/src/linker/query_list.dart
similarity index 100%
rename from modules/angular2/src/core/linker/query_list.dart
rename to modules/@angular/core/src/linker/query_list.dart
diff --git a/modules/angular2/src/core/linker/query_list.ts b/modules/@angular/core/src/linker/query_list.ts
similarity index 100%
rename from modules/angular2/src/core/linker/query_list.ts
rename to modules/@angular/core/src/linker/query_list.ts
diff --git a/modules/angular2/src/core/linker/template_ref.ts b/modules/@angular/core/src/linker/template_ref.ts
similarity index 100%
rename from modules/angular2/src/core/linker/template_ref.ts
rename to modules/@angular/core/src/linker/template_ref.ts
diff --git a/modules/angular2/src/core/linker/view.ts b/modules/@angular/core/src/linker/view.ts
similarity index 100%
rename from modules/angular2/src/core/linker/view.ts
rename to modules/@angular/core/src/linker/view.ts
diff --git a/modules/angular2/src/core/linker/view_container_ref.ts b/modules/@angular/core/src/linker/view_container_ref.ts
similarity index 100%
rename from modules/angular2/src/core/linker/view_container_ref.ts
rename to modules/@angular/core/src/linker/view_container_ref.ts
diff --git a/modules/angular2/src/core/linker/view_ref.ts b/modules/@angular/core/src/linker/view_ref.ts
similarity index 100%
rename from modules/angular2/src/core/linker/view_ref.ts
rename to modules/@angular/core/src/linker/view_ref.ts
diff --git a/modules/angular2/src/core/linker/view_type.ts b/modules/@angular/core/src/linker/view_type.ts
similarity index 100%
rename from modules/angular2/src/core/linker/view_type.ts
rename to modules/@angular/core/src/linker/view_type.ts
diff --git a/modules/angular2/src/core/linker/view_utils.ts b/modules/@angular/core/src/linker/view_utils.ts
similarity index 100%
rename from modules/angular2/src/core/linker/view_utils.ts
rename to modules/@angular/core/src/linker/view_utils.ts
diff --git a/modules/angular2/src/core/metadata.dart b/modules/@angular/core/src/metadata.dart
similarity index 100%
rename from modules/angular2/src/core/metadata.dart
rename to modules/@angular/core/src/metadata.dart
diff --git a/modules/angular2/src/core/metadata.ts b/modules/@angular/core/src/metadata.ts
similarity index 100%
rename from modules/angular2/src/core/metadata.ts
rename to modules/@angular/core/src/metadata.ts
diff --git a/modules/angular2/src/core/metadata/di.ts b/modules/@angular/core/src/metadata/di.ts
similarity index 100%
rename from modules/angular2/src/core/metadata/di.ts
rename to modules/@angular/core/src/metadata/di.ts
diff --git a/modules/angular2/src/core/metadata/directives.ts b/modules/@angular/core/src/metadata/directives.ts
similarity index 100%
rename from modules/angular2/src/core/metadata/directives.ts
rename to modules/@angular/core/src/metadata/directives.ts
diff --git a/modules/angular2/src/core/metadata/lifecycle_hooks.ts b/modules/@angular/core/src/metadata/lifecycle_hooks.ts
similarity index 100%
rename from modules/angular2/src/core/metadata/lifecycle_hooks.ts
rename to modules/@angular/core/src/metadata/lifecycle_hooks.ts
diff --git a/modules/angular2/src/core/metadata/view.ts b/modules/@angular/core/src/metadata/view.ts
similarity index 100%
rename from modules/angular2/src/core/metadata/view.ts
rename to modules/@angular/core/src/metadata/view.ts
diff --git a/modules/angular2/src/core/platform_common_providers.ts b/modules/@angular/core/src/platform_common_providers.ts
similarity index 100%
rename from modules/angular2/src/core/platform_common_providers.ts
rename to modules/@angular/core/src/platform_common_providers.ts
diff --git a/modules/angular2/src/core/platform_directives_and_pipes.ts b/modules/@angular/core/src/platform_directives_and_pipes.ts
similarity index 100%
rename from modules/angular2/src/core/platform_directives_and_pipes.ts
rename to modules/@angular/core/src/platform_directives_and_pipes.ts
diff --git a/modules/angular2/src/core/prod_mode.ts b/modules/@angular/core/src/prod_mode.ts
similarity index 100%
rename from modules/angular2/src/core/prod_mode.ts
rename to modules/@angular/core/src/prod_mode.ts
diff --git a/modules/angular2/src/core/profile/profile.ts b/modules/@angular/core/src/profile/profile.ts
similarity index 100%
rename from modules/angular2/src/core/profile/profile.ts
rename to modules/@angular/core/src/profile/profile.ts
diff --git a/modules/angular2/src/core/profile/wtf_impl.dart b/modules/@angular/core/src/profile/wtf_impl.dart
similarity index 100%
rename from modules/angular2/src/core/profile/wtf_impl.dart
rename to modules/@angular/core/src/profile/wtf_impl.dart
diff --git a/modules/angular2/src/core/profile/wtf_impl.ts b/modules/@angular/core/src/profile/wtf_impl.ts
similarity index 100%
rename from modules/angular2/src/core/profile/wtf_impl.ts
rename to modules/@angular/core/src/profile/wtf_impl.ts
diff --git a/modules/angular2/src/core/profile/wtf_init.dart b/modules/@angular/core/src/profile/wtf_init.dart
similarity index 100%
rename from modules/angular2/src/core/profile/wtf_init.dart
rename to modules/@angular/core/src/profile/wtf_init.dart
diff --git a/modules/angular2/src/core/profile/wtf_init.ts b/modules/@angular/core/src/profile/wtf_init.ts
similarity index 100%
rename from modules/angular2/src/core/profile/wtf_init.ts
rename to modules/@angular/core/src/profile/wtf_init.ts
diff --git a/modules/angular2/src/core/reflection/debug_reflection_capabilities.dart b/modules/@angular/core/src/reflection/debug_reflection_capabilities.dart
similarity index 100%
rename from modules/angular2/src/core/reflection/debug_reflection_capabilities.dart
rename to modules/@angular/core/src/reflection/debug_reflection_capabilities.dart
diff --git a/modules/angular2/src/core/reflection/platform_reflection_capabilities.ts b/modules/@angular/core/src/reflection/platform_reflection_capabilities.ts
similarity index 100%
rename from modules/angular2/src/core/reflection/platform_reflection_capabilities.ts
rename to modules/@angular/core/src/reflection/platform_reflection_capabilities.ts
diff --git a/modules/angular2/src/core/reflection/reflection.dart b/modules/@angular/core/src/reflection/reflection.dart
similarity index 100%
rename from modules/angular2/src/core/reflection/reflection.dart
rename to modules/@angular/core/src/reflection/reflection.dart
diff --git a/modules/angular2/src/core/reflection/reflection.ts b/modules/@angular/core/src/reflection/reflection.ts
similarity index 100%
rename from modules/angular2/src/core/reflection/reflection.ts
rename to modules/@angular/core/src/reflection/reflection.ts
diff --git a/modules/angular2/src/core/reflection/reflection_capabilities.dart b/modules/@angular/core/src/reflection/reflection_capabilities.dart
similarity index 100%
rename from modules/angular2/src/core/reflection/reflection_capabilities.dart
rename to modules/@angular/core/src/reflection/reflection_capabilities.dart
diff --git a/modules/angular2/src/core/reflection/reflection_capabilities.ts b/modules/@angular/core/src/reflection/reflection_capabilities.ts
similarity index 100%
rename from modules/angular2/src/core/reflection/reflection_capabilities.ts
rename to modules/@angular/core/src/reflection/reflection_capabilities.ts
diff --git a/modules/angular2/src/core/reflection/reflector.ts b/modules/@angular/core/src/reflection/reflector.ts
similarity index 100%
rename from modules/angular2/src/core/reflection/reflector.ts
rename to modules/@angular/core/src/reflection/reflector.ts
diff --git a/modules/angular2/src/core/reflection/reflector_reader.ts b/modules/@angular/core/src/reflection/reflector_reader.ts
similarity index 100%
rename from modules/angular2/src/core/reflection/reflector_reader.ts
rename to modules/@angular/core/src/reflection/reflector_reader.ts
diff --git a/modules/angular2/src/core/reflection/types.dart b/modules/@angular/core/src/reflection/types.dart
similarity index 100%
rename from modules/angular2/src/core/reflection/types.dart
rename to modules/@angular/core/src/reflection/types.dart
diff --git a/modules/angular2/src/core/reflection/types.ts b/modules/@angular/core/src/reflection/types.ts
similarity index 100%
rename from modules/angular2/src/core/reflection/types.ts
rename to modules/@angular/core/src/reflection/types.ts
diff --git a/modules/angular2/src/core/render.ts b/modules/@angular/core/src/render.ts
similarity index 100%
rename from modules/angular2/src/core/render.ts
rename to modules/@angular/core/src/render.ts
diff --git a/modules/angular2/src/core/render/api.ts b/modules/@angular/core/src/render/api.ts
similarity index 100%
rename from modules/angular2/src/core/render/api.ts
rename to modules/@angular/core/src/render/api.ts
diff --git a/modules/angular2/src/core/testability/testability.ts b/modules/@angular/core/src/testability/testability.ts
similarity index 100%
rename from modules/angular2/src/core/testability/testability.ts
rename to modules/@angular/core/src/testability/testability.ts
diff --git a/modules/angular2/src/core/util.dart b/modules/@angular/core/src/util.dart
similarity index 100%
rename from modules/angular2/src/core/util.dart
rename to modules/@angular/core/src/util.dart
diff --git a/modules/angular2/src/core/util.ts b/modules/@angular/core/src/util.ts
similarity index 100%
rename from modules/angular2/src/core/util.ts
rename to modules/@angular/core/src/util.ts
diff --git a/modules/angular2/src/core/util/decorators.dart b/modules/@angular/core/src/util/decorators.dart
similarity index 100%
rename from modules/angular2/src/core/util/decorators.dart
rename to modules/@angular/core/src/util/decorators.dart
diff --git a/modules/angular2/src/core/util/decorators.ts b/modules/@angular/core/src/util/decorators.ts
similarity index 100%
rename from modules/angular2/src/core/util/decorators.ts
rename to modules/@angular/core/src/util/decorators.ts
diff --git a/modules/angular2/src/core/zone.ts b/modules/@angular/core/src/zone.ts
similarity index 100%
rename from modules/angular2/src/core/zone.ts
rename to modules/@angular/core/src/zone.ts
diff --git a/modules/angular2/src/core/zone/ng_zone.ts b/modules/@angular/core/src/zone/ng_zone.ts
similarity index 100%
rename from modules/angular2/src/core/zone/ng_zone.ts
rename to modules/@angular/core/src/zone/ng_zone.ts
diff --git a/modules/angular2/src/core/zone/ng_zone_impl.dart b/modules/@angular/core/src/zone/ng_zone_impl.dart
similarity index 100%
rename from modules/angular2/src/core/zone/ng_zone_impl.dart
rename to modules/@angular/core/src/zone/ng_zone_impl.dart
diff --git a/modules/angular2/src/core/zone/ng_zone_impl.ts b/modules/@angular/core/src/zone/ng_zone_impl.ts
similarity index 100%
rename from modules/angular2/src/core/zone/ng_zone_impl.ts
rename to modules/@angular/core/src/zone/ng_zone_impl.ts
diff --git a/modules/angular2/test/core/application_ref_spec.ts b/modules/@angular/core/test/application_ref_spec.ts
similarity index 100%
rename from modules/angular2/test/core/application_ref_spec.ts
rename to modules/@angular/core/test/application_ref_spec.ts
diff --git a/modules/angular2/test/core/change_detection/change_detector_util_spec.ts b/modules/@angular/core/test/change_detection/change_detector_util_spec.ts
similarity index 100%
rename from modules/angular2/test/core/change_detection/change_detector_util_spec.ts
rename to modules/@angular/core/test/change_detection/change_detector_util_spec.ts
diff --git a/modules/angular2/test/core/change_detection/differs/default_iterable_differ_spec.ts b/modules/@angular/core/test/change_detection/differs/default_iterable_differ_spec.ts
similarity index 100%
rename from modules/angular2/test/core/change_detection/differs/default_iterable_differ_spec.ts
rename to modules/@angular/core/test/change_detection/differs/default_iterable_differ_spec.ts
diff --git a/modules/angular2/test/core/change_detection/differs/default_keyvalue_differ_spec.ts b/modules/@angular/core/test/change_detection/differs/default_keyvalue_differ_spec.ts
similarity index 100%
rename from modules/angular2/test/core/change_detection/differs/default_keyvalue_differ_spec.ts
rename to modules/@angular/core/test/change_detection/differs/default_keyvalue_differ_spec.ts
diff --git a/modules/angular2/test/core/change_detection/differs/iterable_differs_spec.ts b/modules/@angular/core/test/change_detection/differs/iterable_differs_spec.ts
similarity index 100%
rename from modules/angular2/test/core/change_detection/differs/iterable_differs_spec.ts
rename to modules/@angular/core/test/change_detection/differs/iterable_differs_spec.ts
diff --git a/modules/angular2/test/core/change_detection/iterable.dart b/modules/@angular/core/test/change_detection/iterable.dart
similarity index 100%
rename from modules/angular2/test/core/change_detection/iterable.dart
rename to modules/@angular/core/test/change_detection/iterable.dart
diff --git a/modules/angular2/test/core/change_detection/iterable.ts b/modules/@angular/core/test/change_detection/iterable.ts
similarity index 100%
rename from modules/angular2/test/core/change_detection/iterable.ts
rename to modules/@angular/core/test/change_detection/iterable.ts
diff --git a/modules/angular2/test/core/change_detection/util.ts b/modules/@angular/core/test/change_detection/util.ts
similarity index 100%
rename from modules/angular2/test/core/change_detection/util.ts
rename to modules/@angular/core/test/change_detection/util.ts
diff --git a/modules/angular2/test/core/debug/debug_node_spec.ts b/modules/@angular/core/test/debug/debug_node_spec.ts
similarity index 100%
rename from modules/angular2/test/core/debug/debug_node_spec.ts
rename to modules/@angular/core/test/debug/debug_node_spec.ts
diff --git a/modules/angular2/test/dev_mode_spec.ts b/modules/@angular/core/test/dev_mode_spec.ts
similarity index 100%
rename from modules/angular2/test/dev_mode_spec.ts
rename to modules/@angular/core/test/dev_mode_spec.ts
diff --git a/modules/angular2/test/core/di/binding_spec.dart b/modules/@angular/core/test/di/binding_spec.dart
similarity index 100%
rename from modules/angular2/test/core/di/binding_spec.dart
rename to modules/@angular/core/test/di/binding_spec.dart
diff --git a/modules/angular2/test/core/di/binding_spec.ts b/modules/@angular/core/test/di/binding_spec.ts
similarity index 100%
rename from modules/angular2/test/core/di/binding_spec.ts
rename to modules/@angular/core/test/di/binding_spec.ts
diff --git a/modules/angular2/test/core/di/forward_ref_spec.ts b/modules/@angular/core/test/di/forward_ref_spec.ts
similarity index 100%
rename from modules/angular2/test/core/di/forward_ref_spec.ts
rename to modules/@angular/core/test/di/forward_ref_spec.ts
diff --git a/modules/angular2/test/core/di/reflective_injector_spec.ts b/modules/@angular/core/test/di/reflective_injector_spec.ts
similarity index 100%
rename from modules/angular2/test/core/di/reflective_injector_spec.ts
rename to modules/@angular/core/test/di/reflective_injector_spec.ts
diff --git a/modules/angular2/test/core/di/reflective_key_spec.ts b/modules/@angular/core/test/di/reflective_key_spec.ts
similarity index 100%
rename from modules/angular2/test/core/di/reflective_key_spec.ts
rename to modules/@angular/core/test/di/reflective_key_spec.ts
diff --git a/modules/angular2/test/core/directive_lifecycle_integration_spec.ts b/modules/@angular/core/test/directive_lifecycle_integration_spec.ts
similarity index 100%
rename from modules/angular2/test/core/directive_lifecycle_integration_spec.ts
rename to modules/@angular/core/test/directive_lifecycle_integration_spec.ts
diff --git a/modules/angular2/test/core/dom/dom_adapter_spec.ts b/modules/@angular/core/test/dom/dom_adapter_spec.ts
similarity index 100%
rename from modules/angular2/test/core/dom/dom_adapter_spec.ts
rename to modules/@angular/core/test/dom/dom_adapter_spec.ts
diff --git a/modules/angular2/test/core/dom/html5lib_adapter.server.spec.dart b/modules/@angular/core/test/dom/html5lib_adapter.server.spec.dart
similarity index 100%
rename from modules/angular2/test/core/dom/html5lib_adapter.server.spec.dart
rename to modules/@angular/core/test/dom/html5lib_adapter.server.spec.dart
diff --git a/modules/angular2/test/core/dom/shim_spec.dart b/modules/@angular/core/test/dom/shim_spec.dart
similarity index 100%
rename from modules/angular2/test/core/dom/shim_spec.dart
rename to modules/@angular/core/test/dom/shim_spec.dart
diff --git a/modules/angular2/test/core/dom/shim_spec.ts b/modules/@angular/core/test/dom/shim_spec.ts
similarity index 100%
rename from modules/angular2/test/core/dom/shim_spec.ts
rename to modules/@angular/core/test/dom/shim_spec.ts
diff --git a/modules/angular2/test/core/facade/observable_spec.dart b/modules/@angular/core/test/facade/observable_spec.dart
similarity index 100%
rename from modules/angular2/test/core/facade/observable_spec.dart
rename to modules/@angular/core/test/facade/observable_spec.dart
diff --git a/modules/angular2/test/core/facade/observable_spec.ts b/modules/@angular/core/test/facade/observable_spec.ts
similarity index 100%
rename from modules/angular2/test/core/facade/observable_spec.ts
rename to modules/@angular/core/test/facade/observable_spec.ts
diff --git a/modules/angular2/test/testing/fake_async_spec.ts b/modules/@angular/core/test/fake_async_spec.ts
similarity index 100%
rename from modules/angular2/test/testing/fake_async_spec.ts
rename to modules/@angular/core/test/fake_async_spec.ts
diff --git a/modules/angular2/test/core/forward_ref_integration_spec.dart b/modules/@angular/core/test/forward_ref_integration_spec.dart
similarity index 100%
rename from modules/angular2/test/core/forward_ref_integration_spec.dart
rename to modules/@angular/core/test/forward_ref_integration_spec.dart
diff --git a/modules/angular2/test/core/forward_ref_integration_spec.ts b/modules/@angular/core/test/forward_ref_integration_spec.ts
similarity index 100%
rename from modules/angular2/test/core/forward_ref_integration_spec.ts
rename to modules/@angular/core/test/forward_ref_integration_spec.ts
diff --git a/modules/angular2/test/core/linker/change_detection_integration_spec.ts b/modules/@angular/core/test/linker/change_detection_integration_spec.ts
similarity index 100%
rename from modules/angular2/test/core/linker/change_detection_integration_spec.ts
rename to modules/@angular/core/test/linker/change_detection_integration_spec.ts
diff --git a/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts b/modules/@angular/core/test/linker/dynamic_component_loader_spec.ts
similarity index 100%
rename from modules/angular2/test/core/linker/dynamic_component_loader_spec.ts
rename to modules/@angular/core/test/linker/dynamic_component_loader_spec.ts
diff --git a/modules/angular2/test/core/linker/integration_dart_spec.dart b/modules/@angular/core/test/linker/integration_dart_spec.dart
similarity index 100%
rename from modules/angular2/test/core/linker/integration_dart_spec.dart
rename to modules/@angular/core/test/linker/integration_dart_spec.dart
diff --git a/modules/angular2/test/core/linker/integration_spec.ts b/modules/@angular/core/test/linker/integration_spec.ts
similarity index 100%
rename from modules/angular2/test/core/linker/integration_spec.ts
rename to modules/@angular/core/test/linker/integration_spec.ts
diff --git a/modules/angular2/test/core/linker/projection_integration_spec.ts b/modules/@angular/core/test/linker/projection_integration_spec.ts
similarity index 100%
rename from modules/angular2/test/core/linker/projection_integration_spec.ts
rename to modules/@angular/core/test/linker/projection_integration_spec.ts
diff --git a/modules/angular2/test/core/linker/query_integration_spec.ts b/modules/@angular/core/test/linker/query_integration_spec.ts
similarity index 100%
rename from modules/angular2/test/core/linker/query_integration_spec.ts
rename to modules/@angular/core/test/linker/query_integration_spec.ts
diff --git a/modules/angular2/test/core/linker/query_list_spec.ts b/modules/@angular/core/test/linker/query_list_spec.ts
similarity index 100%
rename from modules/angular2/test/core/linker/query_list_spec.ts
rename to modules/@angular/core/test/linker/query_list_spec.ts
diff --git a/modules/angular2/test/core/linker/reflector_component_resolver_spec.ts b/modules/@angular/core/test/linker/reflector_component_resolver_spec.ts
similarity index 100%
rename from modules/angular2/test/core/linker/reflector_component_resolver_spec.ts
rename to modules/@angular/core/test/linker/reflector_component_resolver_spec.ts
diff --git a/modules/angular2/test/core/linker/regression_integration_spec.ts b/modules/@angular/core/test/linker/regression_integration_spec.ts
similarity index 100%
rename from modules/angular2/test/core/linker/regression_integration_spec.ts
rename to modules/@angular/core/test/linker/regression_integration_spec.ts
diff --git a/modules/angular2/test/core/linker/view_injector_integration_spec.ts b/modules/@angular/core/test/linker/view_injector_integration_spec.ts
similarity index 100%
rename from modules/angular2/test/core/linker/view_injector_integration_spec.ts
rename to modules/@angular/core/test/linker/view_injector_integration_spec.ts
diff --git a/modules/angular2/test/core/metadata/decorators_spec.dart b/modules/@angular/core/test/metadata/decorators_spec.dart
similarity index 100%
rename from modules/angular2/test/core/metadata/decorators_spec.dart
rename to modules/@angular/core/test/metadata/decorators_spec.dart
diff --git a/modules/angular2/test/core/metadata/decorators_spec.ts b/modules/@angular/core/test/metadata/decorators_spec.ts
similarity index 100%
rename from modules/angular2/test/core/metadata/decorators_spec.ts
rename to modules/@angular/core/test/metadata/decorators_spec.ts
diff --git a/modules/angular2/test/core/profile/wtf_impl_spec.dart b/modules/@angular/core/test/profile/wtf_impl_spec.dart
similarity index 100%
rename from modules/angular2/test/core/profile/wtf_impl_spec.dart
rename to modules/@angular/core/test/profile/wtf_impl_spec.dart
diff --git a/modules/angular2/test/core/reflection/reflector_common.dart b/modules/@angular/core/test/reflection/reflector_common.dart
similarity index 100%
rename from modules/angular2/test/core/reflection/reflector_common.dart
rename to modules/@angular/core/test/reflection/reflector_common.dart
diff --git a/modules/angular2/test/core/reflection/reflector_common.ts b/modules/@angular/core/test/reflection/reflector_common.ts
similarity index 100%
rename from modules/angular2/test/core/reflection/reflector_common.ts
rename to modules/@angular/core/test/reflection/reflector_common.ts
diff --git a/modules/angular2/test/core/reflection/reflector_spec.ts b/modules/@angular/core/test/reflection/reflector_spec.ts
similarity index 100%
rename from modules/angular2/test/core/reflection/reflector_spec.ts
rename to modules/@angular/core/test/reflection/reflector_spec.ts
diff --git a/modules/angular2/test/core/spies.dart b/modules/@angular/core/test/spies.dart
similarity index 100%
rename from modules/angular2/test/core/spies.dart
rename to modules/@angular/core/test/spies.dart
diff --git a/modules/angular2/test/core/spies.ts b/modules/@angular/core/test/spies.ts
similarity index 100%
rename from modules/angular2/test/core/spies.ts
rename to modules/@angular/core/test/spies.ts
diff --git a/modules/angular2/test/core/testability/testability_spec.ts b/modules/@angular/core/test/testability/testability_spec.ts
similarity index 100%
rename from modules/angular2/test/core/testability/testability_spec.ts
rename to modules/@angular/core/test/testability/testability_spec.ts
diff --git a/modules/angular2/test/testing/testing_internal_spec.ts b/modules/@angular/core/test/testing_internal_spec.ts
similarity index 100%
rename from modules/angular2/test/testing/testing_internal_spec.ts
rename to modules/@angular/core/test/testing_internal_spec.ts
diff --git a/modules/angular2/test/core/util/decorators_spec.dart b/modules/@angular/core/test/util/decorators_spec.dart
similarity index 100%
rename from modules/angular2/test/core/util/decorators_spec.dart
rename to modules/@angular/core/test/util/decorators_spec.dart
diff --git a/modules/angular2/test/core/util/decorators_spec.ts b/modules/@angular/core/test/util/decorators_spec.ts
similarity index 100%
rename from modules/angular2/test/core/util/decorators_spec.ts
rename to modules/@angular/core/test/util/decorators_spec.ts
diff --git a/modules/angular2/test/core/zone/ng_zone_spec.ts b/modules/@angular/core/test/zone/ng_zone_spec.ts
similarity index 100%
rename from modules/angular2/test/core/zone/ng_zone_spec.ts
rename to modules/@angular/core/test/zone/ng_zone_spec.ts
diff --git a/modules/angular2/src/testing/async.dart b/modules/@angular/core/testing/async.dart
similarity index 100%
rename from modules/angular2/src/testing/async.dart
rename to modules/@angular/core/testing/async.dart
diff --git a/modules/angular2/src/testing/async.ts b/modules/@angular/core/testing/async.ts
similarity index 100%
rename from modules/angular2/src/testing/async.ts
rename to modules/@angular/core/testing/async.ts
diff --git a/modules/angular2/src/testing/async_test_completer.ts b/modules/@angular/core/testing/async_test_completer.ts
similarity index 100%
rename from modules/angular2/src/testing/async_test_completer.ts
rename to modules/@angular/core/testing/async_test_completer.ts
diff --git a/modules/angular2/src/testing/fake_async.dart b/modules/@angular/core/testing/fake_async.dart
similarity index 100%
rename from modules/angular2/src/testing/fake_async.dart
rename to modules/@angular/core/testing/fake_async.dart
diff --git a/modules/angular2/src/testing/fake_async.ts b/modules/@angular/core/testing/fake_async.ts
similarity index 100%
rename from modules/angular2/src/testing/fake_async.ts
rename to modules/@angular/core/testing/fake_async.ts
diff --git a/modules/angular2/src/testing/lang_utils.dart b/modules/@angular/core/testing/lang_utils.dart
similarity index 100%
rename from modules/angular2/src/testing/lang_utils.dart
rename to modules/@angular/core/testing/lang_utils.dart
diff --git a/modules/angular2/src/testing/lang_utils.ts b/modules/@angular/core/testing/lang_utils.ts
similarity index 100%
rename from modules/angular2/src/testing/lang_utils.ts
rename to modules/@angular/core/testing/lang_utils.ts
diff --git a/modules/angular2/src/mock/mock_application_ref.ts b/modules/@angular/core/testing/mock_application_ref.ts
similarity index 100%
rename from modules/angular2/src/mock/mock_application_ref.ts
rename to modules/@angular/core/testing/mock_application_ref.ts
diff --git a/modules/angular2/src/mock/ng_zone_mock.ts b/modules/@angular/core/testing/ng_zone_mock.ts
similarity index 100%
rename from modules/angular2/src/mock/ng_zone_mock.ts
rename to modules/@angular/core/testing/ng_zone_mock.ts
diff --git a/modules/angular2/src/testing/test_injector.ts b/modules/@angular/core/testing/test_injector.ts
similarity index 100%
rename from modules/angular2/src/testing/test_injector.ts
rename to modules/@angular/core/testing/test_injector.ts
diff --git a/modules/angular2/src/testing/testing.dart b/modules/@angular/core/testing/testing.dart
similarity index 100%
rename from modules/angular2/src/testing/testing.dart
rename to modules/@angular/core/testing/testing.dart
diff --git a/modules/angular2/src/testing/testing.ts b/modules/@angular/core/testing/testing.ts
similarity index 100%
rename from modules/angular2/src/testing/testing.ts
rename to modules/@angular/core/testing/testing.ts
diff --git a/modules/angular2/src/testing/testing_internal.dart b/modules/@angular/core/testing/testing_internal.dart
similarity index 100%
rename from modules/angular2/src/testing/testing_internal.dart
rename to modules/@angular/core/testing/testing_internal.dart
diff --git a/modules/angular2/src/testing/testing_internal.ts b/modules/@angular/core/testing/testing_internal.ts
similarity index 100%
rename from modules/angular2/src/testing/testing_internal.ts
rename to modules/@angular/core/testing/testing_internal.ts
diff --git a/modules/angular2/docs/bundles/overview.md b/modules/@angular/docs/bundles/overview.md
similarity index 100%
rename from modules/angular2/docs/bundles/overview.md
rename to modules/@angular/docs/bundles/overview.md
diff --git a/modules/angular2/docs/change_detection/change_detection.md b/modules/@angular/docs/change_detection/change_detection.md
similarity index 100%
rename from modules/angular2/docs/change_detection/change_detection.md
rename to modules/@angular/docs/change_detection/change_detection.md
diff --git a/modules/angular2/docs/change_detection/expressions.md b/modules/@angular/docs/change_detection/expressions.md
similarity index 100%
rename from modules/angular2/docs/change_detection/expressions.md
rename to modules/@angular/docs/change_detection/expressions.md
diff --git a/modules/angular2/docs/change_detection/record.md b/modules/@angular/docs/change_detection/record.md
similarity index 100%
rename from modules/angular2/docs/change_detection/record.md
rename to modules/@angular/docs/change_detection/record.md
diff --git a/modules/angular2/docs/cheatsheet/bootstrapping.md b/modules/@angular/docs/cheatsheet/bootstrapping.md
similarity index 100%
rename from modules/angular2/docs/cheatsheet/bootstrapping.md
rename to modules/@angular/docs/cheatsheet/bootstrapping.md
diff --git a/modules/angular2/docs/cheatsheet/built-in-directives.md b/modules/@angular/docs/cheatsheet/built-in-directives.md
similarity index 100%
rename from modules/angular2/docs/cheatsheet/built-in-directives.md
rename to modules/@angular/docs/cheatsheet/built-in-directives.md
diff --git a/modules/angular2/docs/cheatsheet/class-decorators.md b/modules/@angular/docs/cheatsheet/class-decorators.md
similarity index 100%
rename from modules/angular2/docs/cheatsheet/class-decorators.md
rename to modules/@angular/docs/cheatsheet/class-decorators.md
diff --git a/modules/angular2/docs/cheatsheet/component-configuration.md b/modules/@angular/docs/cheatsheet/component-configuration.md
similarity index 100%
rename from modules/angular2/docs/cheatsheet/component-configuration.md
rename to modules/@angular/docs/cheatsheet/component-configuration.md
diff --git a/modules/angular2/docs/cheatsheet/dependency-injection.md b/modules/@angular/docs/cheatsheet/dependency-injection.md
similarity index 100%
rename from modules/angular2/docs/cheatsheet/dependency-injection.md
rename to modules/@angular/docs/cheatsheet/dependency-injection.md
diff --git a/modules/angular2/docs/cheatsheet/directive-and-component-decorators.md b/modules/@angular/docs/cheatsheet/directive-and-component-decorators.md
similarity index 100%
rename from modules/angular2/docs/cheatsheet/directive-and-component-decorators.md
rename to modules/@angular/docs/cheatsheet/directive-and-component-decorators.md
diff --git a/modules/angular2/docs/cheatsheet/directive-configuration.md b/modules/@angular/docs/cheatsheet/directive-configuration.md
similarity index 100%
rename from modules/angular2/docs/cheatsheet/directive-configuration.md
rename to modules/@angular/docs/cheatsheet/directive-configuration.md
diff --git a/modules/angular2/docs/cheatsheet/forms.md b/modules/@angular/docs/cheatsheet/forms.md
similarity index 100%
rename from modules/angular2/docs/cheatsheet/forms.md
rename to modules/@angular/docs/cheatsheet/forms.md
diff --git a/modules/angular2/docs/cheatsheet/lifecycle hooks.md b/modules/@angular/docs/cheatsheet/lifecycle hooks.md
similarity index 100%
rename from modules/angular2/docs/cheatsheet/lifecycle hooks.md
rename to modules/@angular/docs/cheatsheet/lifecycle hooks.md
diff --git a/modules/angular2/docs/cheatsheet/routing.md b/modules/@angular/docs/cheatsheet/routing.md
similarity index 100%
rename from modules/angular2/docs/cheatsheet/routing.md
rename to modules/@angular/docs/cheatsheet/routing.md
diff --git a/modules/angular2/docs/cheatsheet/template-syntax.md b/modules/@angular/docs/cheatsheet/template-syntax.md
similarity index 100%
rename from modules/angular2/docs/cheatsheet/template-syntax.md
rename to modules/@angular/docs/cheatsheet/template-syntax.md
diff --git a/modules/angular2/docs/core/00_index.md b/modules/@angular/docs/core/00_index.md
similarity index 100%
rename from modules/angular2/docs/core/00_index.md
rename to modules/@angular/docs/core/00_index.md
diff --git a/modules/angular2/docs/core/01_templates.md b/modules/@angular/docs/core/01_templates.md
similarity index 100%
rename from modules/angular2/docs/core/01_templates.md
rename to modules/@angular/docs/core/01_templates.md
diff --git a/modules/angular2/docs/core/02_directives.md b/modules/@angular/docs/core/02_directives.md
similarity index 100%
rename from modules/angular2/docs/core/02_directives.md
rename to modules/@angular/docs/core/02_directives.md
diff --git a/modules/angular2/docs/core/03_pipes.md b/modules/@angular/docs/core/03_pipes.md
similarity index 100%
rename from modules/angular2/docs/core/03_pipes.md
rename to modules/@angular/docs/core/03_pipes.md
diff --git a/modules/angular2/docs/core/04_decorator_directive.md b/modules/@angular/docs/core/04_decorator_directive.md
similarity index 100%
rename from modules/angular2/docs/core/04_decorator_directive.md
rename to modules/@angular/docs/core/04_decorator_directive.md
diff --git a/modules/angular2/docs/core/05_component_directive.md b/modules/@angular/docs/core/05_component_directive.md
similarity index 100%
rename from modules/angular2/docs/core/05_component_directive.md
rename to modules/@angular/docs/core/05_component_directive.md
diff --git a/modules/angular2/docs/core/06_viewport_directive.md b/modules/@angular/docs/core/06_viewport_directive.md
similarity index 100%
rename from modules/angular2/docs/core/06_viewport_directive.md
rename to modules/@angular/docs/core/06_viewport_directive.md
diff --git a/modules/angular2/docs/core/07_services.md b/modules/@angular/docs/core/07_services.md
similarity index 100%
rename from modules/angular2/docs/core/07_services.md
rename to modules/@angular/docs/core/07_services.md
diff --git a/modules/angular2/docs/core/08_lifecycle.md b/modules/@angular/docs/core/08_lifecycle.md
similarity index 100%
rename from modules/angular2/docs/core/08_lifecycle.md
rename to modules/@angular/docs/core/08_lifecycle.md
diff --git a/modules/angular2/docs/core/09_compilation.md b/modules/@angular/docs/core/09_compilation.md
similarity index 100%
rename from modules/angular2/docs/core/09_compilation.md
rename to modules/@angular/docs/core/09_compilation.md
diff --git a/modules/angular2/docs/core/10_view.md b/modules/@angular/docs/core/10_view.md
similarity index 100%
rename from modules/angular2/docs/core/10_view.md
rename to modules/@angular/docs/core/10_view.md
diff --git a/modules/angular2/docs/core/11_shadow_dom.md b/modules/@angular/docs/core/11_shadow_dom.md
similarity index 100%
rename from modules/angular2/docs/core/11_shadow_dom.md
rename to modules/@angular/docs/core/11_shadow_dom.md
diff --git a/modules/angular2/docs/core/12_zones.md b/modules/@angular/docs/core/12_zones.md
similarity index 100%
rename from modules/angular2/docs/core/12_zones.md
rename to modules/@angular/docs/core/12_zones.md
diff --git a/modules/angular2/docs/di/di.md b/modules/@angular/docs/di/di.md
similarity index 100%
rename from modules/angular2/docs/di/di.md
rename to modules/@angular/docs/di/di.md
diff --git a/modules/angular2/docs/di/di_advanced.md b/modules/@angular/docs/di/di_advanced.md
similarity index 100%
rename from modules/angular2/docs/di/di_advanced.md
rename to modules/@angular/docs/di/di_advanced.md
diff --git a/modules/angular2/docs/migration/kebab-case.md b/modules/@angular/docs/migration/kebab-case.md
similarity index 100%
rename from modules/angular2/docs/migration/kebab-case.md
rename to modules/@angular/docs/migration/kebab-case.md
diff --git a/modules/angular2/docs/web_workers/web_workers.md b/modules/@angular/docs/web_workers/web_workers.md
similarity index 100%
rename from modules/angular2/docs/web_workers/web_workers.md
rename to modules/@angular/docs/web_workers/web_workers.md
diff --git a/modules/angular2/examples/README.md b/modules/@angular/examples/README.md
similarity index 100%
rename from modules/angular2/examples/README.md
rename to modules/@angular/examples/README.md
diff --git a/modules/angular2/examples/animate/ts/.gitkeep b/modules/@angular/examples/animate/ts/.gitkeep
similarity index 100%
rename from modules/angular2/examples/animate/ts/.gitkeep
rename to modules/@angular/examples/animate/ts/.gitkeep
diff --git a/modules/angular2/examples/common/forms/ts/validators/validators.ts b/modules/@angular/examples/common/forms/ts/validators/validators.ts
similarity index 100%
rename from modules/angular2/examples/common/forms/ts/validators/validators.ts
rename to modules/@angular/examples/common/forms/ts/validators/validators.ts
diff --git a/modules/angular2/examples/compiler/ts/url_resolver/url_resolver.ts b/modules/@angular/examples/compiler/ts/url_resolver/url_resolver.ts
similarity index 100%
rename from modules/angular2/examples/compiler/ts/url_resolver/url_resolver.ts
rename to modules/@angular/examples/compiler/ts/url_resolver/url_resolver.ts
diff --git a/modules/angular2/examples/core/debug/ts/debug_element/debug_element.ts b/modules/@angular/examples/core/debug/ts/debug_element/debug_element.ts
similarity index 100%
rename from modules/angular2/examples/core/debug/ts/debug_element/debug_element.ts
rename to modules/@angular/examples/core/debug/ts/debug_element/debug_element.ts
diff --git a/modules/angular2/examples/core/di/ts/forward_ref/forward_ref.ts b/modules/@angular/examples/core/di/ts/forward_ref/forward_ref.ts
similarity index 100%
rename from modules/angular2/examples/core/di/ts/forward_ref/forward_ref.ts
rename to modules/@angular/examples/core/di/ts/forward_ref/forward_ref.ts
diff --git a/modules/angular2/examples/core/forms/ts/ng_validators/ng_validators.ts b/modules/@angular/examples/core/forms/ts/ng_validators/ng_validators.ts
similarity index 100%
rename from modules/angular2/examples/core/forms/ts/ng_validators/ng_validators.ts
rename to modules/@angular/examples/core/forms/ts/ng_validators/ng_validators.ts
diff --git a/modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.dart b/modules/@angular/examples/core/pipes/ts/async_pipe/async_pipe_example.dart
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.dart
rename to modules/@angular/examples/core/pipes/ts/async_pipe/async_pipe_example.dart
diff --git a/modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.ts b/modules/@angular/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
rename to modules/@angular/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
diff --git a/modules/angular2/examples/core/pipes/ts/async_pipe/index.html b/modules/@angular/examples/core/pipes/ts/async_pipe/index.html
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/async_pipe/index.html
rename to modules/@angular/examples/core/pipes/ts/async_pipe/index.html
diff --git a/modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.dart b/modules/@angular/examples/core/pipes/ts/date_pipe/date_pipe_example.dart
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.dart
rename to modules/@angular/examples/core/pipes/ts/date_pipe/date_pipe_example.dart
diff --git a/modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.ts b/modules/@angular/examples/core/pipes/ts/date_pipe/date_pipe_example.ts
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.ts
rename to modules/@angular/examples/core/pipes/ts/date_pipe/date_pipe_example.ts
diff --git a/modules/angular2/examples/core/pipes/ts/date_pipe/index.html b/modules/@angular/examples/core/pipes/ts/date_pipe/index.html
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/date_pipe/index.html
rename to modules/@angular/examples/core/pipes/ts/date_pipe/index.html
diff --git a/modules/angular2/examples/core/pipes/ts/json_pipe/index.html b/modules/@angular/examples/core/pipes/ts/json_pipe/index.html
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/json_pipe/index.html
rename to modules/@angular/examples/core/pipes/ts/json_pipe/index.html
diff --git a/modules/angular2/examples/core/pipes/ts/json_pipe/json_pipe_example.ts b/modules/@angular/examples/core/pipes/ts/json_pipe/json_pipe_example.ts
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/json_pipe/json_pipe_example.ts
rename to modules/@angular/examples/core/pipes/ts/json_pipe/json_pipe_example.ts
diff --git a/modules/angular2/examples/core/pipes/ts/lowerupper_pipe/index.html b/modules/@angular/examples/core/pipes/ts/lowerupper_pipe/index.html
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/lowerupper_pipe/index.html
rename to modules/@angular/examples/core/pipes/ts/lowerupper_pipe/index.html
diff --git a/modules/angular2/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts b/modules/@angular/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts
rename to modules/@angular/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts
diff --git a/modules/angular2/examples/core/pipes/ts/number_pipe/index.html b/modules/@angular/examples/core/pipes/ts/number_pipe/index.html
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/number_pipe/index.html
rename to modules/@angular/examples/core/pipes/ts/number_pipe/index.html
diff --git a/modules/angular2/examples/core/pipes/ts/number_pipe/number_pipe_example.ts b/modules/@angular/examples/core/pipes/ts/number_pipe/number_pipe_example.ts
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/number_pipe/number_pipe_example.ts
rename to modules/@angular/examples/core/pipes/ts/number_pipe/number_pipe_example.ts
diff --git a/modules/angular2/examples/core/pipes/ts/slice_pipe/index.html b/modules/@angular/examples/core/pipes/ts/slice_pipe/index.html
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/slice_pipe/index.html
rename to modules/@angular/examples/core/pipes/ts/slice_pipe/index.html
diff --git a/modules/angular2/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts b/modules/@angular/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts
similarity index 100%
rename from modules/angular2/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts
rename to modules/@angular/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts
diff --git a/modules/angular2/examples/core/ts/.gitkeep b/modules/@angular/examples/core/ts/.gitkeep
similarity index 100%
rename from modules/angular2/examples/core/ts/.gitkeep
rename to modules/@angular/examples/core/ts/.gitkeep
diff --git a/modules/angular2/examples/core/ts/bootstrap/bootstrap.ts b/modules/@angular/examples/core/ts/bootstrap/bootstrap.ts
similarity index 100%
rename from modules/angular2/examples/core/ts/bootstrap/bootstrap.ts
rename to modules/@angular/examples/core/ts/bootstrap/bootstrap.ts
diff --git a/modules/angular2/examples/core/ts/metadata/metadata.ts b/modules/@angular/examples/core/ts/metadata/metadata.ts
similarity index 100%
rename from modules/angular2/examples/core/ts/metadata/metadata.ts
rename to modules/@angular/examples/core/ts/metadata/metadata.ts
diff --git a/modules/angular2/examples/core/ts/platform/platform.ts b/modules/@angular/examples/core/ts/platform/platform.ts
similarity index 100%
rename from modules/angular2/examples/core/ts/platform/platform.ts
rename to modules/@angular/examples/core/ts/platform/platform.ts
diff --git a/modules/angular2/examples/core/ts/prod_mode/my_component.ts b/modules/@angular/examples/core/ts/prod_mode/my_component.ts
similarity index 100%
rename from modules/angular2/examples/core/ts/prod_mode/my_component.ts
rename to modules/@angular/examples/core/ts/prod_mode/my_component.ts
diff --git a/modules/angular2/examples/core/ts/prod_mode/prod_mode_example.ts b/modules/@angular/examples/core/ts/prod_mode/prod_mode_example.ts
similarity index 100%
rename from modules/angular2/examples/core/ts/prod_mode/prod_mode_example.ts
rename to modules/@angular/examples/core/ts/prod_mode/prod_mode_example.ts
diff --git a/modules/angular2/examples/facade/ts/async/observable.ts b/modules/@angular/examples/facade/ts/async/observable.ts
similarity index 100%
rename from modules/angular2/examples/facade/ts/async/observable.ts
rename to modules/@angular/examples/facade/ts/async/observable.ts
diff --git a/modules/angular2/examples/facade/ts/async/observable_all.ts b/modules/@angular/examples/facade/ts/async/observable_all.ts
similarity index 100%
rename from modules/angular2/examples/facade/ts/async/observable_all.ts
rename to modules/@angular/examples/facade/ts/async/observable_all.ts
diff --git a/modules/angular2/examples/facade/ts/async/observable_patched.ts b/modules/@angular/examples/facade/ts/async/observable_patched.ts
similarity index 100%
rename from modules/angular2/examples/facade/ts/async/observable_patched.ts
rename to modules/@angular/examples/facade/ts/async/observable_patched.ts
diff --git a/modules/angular2/examples/facade/ts/async/observable_pure.ts b/modules/@angular/examples/facade/ts/async/observable_pure.ts
similarity index 100%
rename from modules/angular2/examples/facade/ts/async/observable_pure.ts
rename to modules/@angular/examples/facade/ts/async/observable_pure.ts
diff --git a/modules/angular2/examples/http/ts/.gitkeep b/modules/@angular/examples/http/ts/.gitkeep
similarity index 100%
rename from modules/angular2/examples/http/ts/.gitkeep
rename to modules/@angular/examples/http/ts/.gitkeep
diff --git a/modules/angular2/examples/platform/dom/debug/ts/by/by.ts b/modules/@angular/examples/platform-browser/dom/debug/ts/by/by.ts
similarity index 100%
rename from modules/angular2/examples/platform/dom/debug/ts/by/by.ts
rename to modules/@angular/examples/platform-browser/dom/debug/ts/by/by.ts
diff --git a/modules/angular2/examples/platform/dom/debug/ts/debug_element_view_listener/providers.ts b/modules/@angular/examples/platform-browser/dom/debug/ts/debug_element_view_listener/providers.ts
similarity index 100%
rename from modules/angular2/examples/platform/dom/debug/ts/debug_element_view_listener/providers.ts
rename to modules/@angular/examples/platform-browser/dom/debug/ts/debug_element_view_listener/providers.ts
diff --git a/modules/angular2/examples/router/ts/.gitkeep b/modules/@angular/examples/router/ts/.gitkeep
similarity index 100%
rename from modules/angular2/examples/router/ts/.gitkeep
rename to modules/@angular/examples/router/ts/.gitkeep
diff --git a/modules/angular2/examples/router/ts/can_activate/can_activate_example.ts b/modules/@angular/examples/router/ts/can_activate/can_activate_example.ts
similarity index 100%
rename from modules/angular2/examples/router/ts/can_activate/can_activate_example.ts
rename to modules/@angular/examples/router/ts/can_activate/can_activate_example.ts
diff --git a/modules/angular2/examples/router/ts/can_activate/can_activate_spec.ts b/modules/@angular/examples/router/ts/can_activate/can_activate_spec.ts
similarity index 100%
rename from modules/angular2/examples/router/ts/can_activate/can_activate_spec.ts
rename to modules/@angular/examples/router/ts/can_activate/can_activate_spec.ts
diff --git a/modules/angular2/examples/router/ts/can_activate/index.html b/modules/@angular/examples/router/ts/can_activate/index.html
similarity index 100%
rename from modules/angular2/examples/router/ts/can_activate/index.html
rename to modules/@angular/examples/router/ts/can_activate/index.html
diff --git a/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_example.ts b/modules/@angular/examples/router/ts/can_deactivate/can_deactivate_example.ts
similarity index 100%
rename from modules/angular2/examples/router/ts/can_deactivate/can_deactivate_example.ts
rename to modules/@angular/examples/router/ts/can_deactivate/can_deactivate_example.ts
diff --git a/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_spec.ts b/modules/@angular/examples/router/ts/can_deactivate/can_deactivate_spec.ts
similarity index 100%
rename from modules/angular2/examples/router/ts/can_deactivate/can_deactivate_spec.ts
rename to modules/@angular/examples/router/ts/can_deactivate/can_deactivate_spec.ts
diff --git a/modules/angular2/examples/router/ts/can_deactivate/index.html b/modules/@angular/examples/router/ts/can_deactivate/index.html
similarity index 100%
rename from modules/angular2/examples/router/ts/can_deactivate/index.html
rename to modules/@angular/examples/router/ts/can_deactivate/index.html
diff --git a/modules/angular2/examples/router/ts/on_activate/on_activate_example.ts b/modules/@angular/examples/router/ts/on_activate/on_activate_example.ts
similarity index 100%
rename from modules/angular2/examples/router/ts/on_activate/on_activate_example.ts
rename to modules/@angular/examples/router/ts/on_activate/on_activate_example.ts
diff --git a/modules/angular2/examples/router/ts/on_deactivate/index.html b/modules/@angular/examples/router/ts/on_deactivate/index.html
similarity index 100%
rename from modules/angular2/examples/router/ts/on_deactivate/index.html
rename to modules/@angular/examples/router/ts/on_deactivate/index.html
diff --git a/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_example.ts b/modules/@angular/examples/router/ts/on_deactivate/on_deactivate_example.ts
similarity index 100%
rename from modules/angular2/examples/router/ts/on_deactivate/on_deactivate_example.ts
rename to modules/@angular/examples/router/ts/on_deactivate/on_deactivate_example.ts
diff --git a/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_spec.ts b/modules/@angular/examples/router/ts/on_deactivate/on_deactivate_spec.ts
similarity index 100%
rename from modules/angular2/examples/router/ts/on_deactivate/on_deactivate_spec.ts
rename to modules/@angular/examples/router/ts/on_deactivate/on_deactivate_spec.ts
diff --git a/modules/angular2/examples/router/ts/reuse/index.html b/modules/@angular/examples/router/ts/reuse/index.html
similarity index 100%
rename from modules/angular2/examples/router/ts/reuse/index.html
rename to modules/@angular/examples/router/ts/reuse/index.html
diff --git a/modules/angular2/examples/router/ts/reuse/reuse_example.ts b/modules/@angular/examples/router/ts/reuse/reuse_example.ts
similarity index 100%
rename from modules/angular2/examples/router/ts/reuse/reuse_example.ts
rename to modules/@angular/examples/router/ts/reuse/reuse_example.ts
diff --git a/modules/angular2/examples/router/ts/reuse/reuse_spec.ts b/modules/@angular/examples/router/ts/reuse/reuse_spec.ts
similarity index 100%
rename from modules/angular2/examples/router/ts/reuse/reuse_spec.ts
rename to modules/@angular/examples/router/ts/reuse/reuse_spec.ts
diff --git a/modules/angular2/examples/testing/ts/fake_async.ts b/modules/@angular/examples/testing/ts/fake_async.ts
similarity index 100%
rename from modules/angular2/examples/testing/ts/fake_async.ts
rename to modules/@angular/examples/testing/ts/fake_async.ts
diff --git a/modules/angular2/examples/testing/ts/matchers.ts b/modules/@angular/examples/testing/ts/matchers.ts
similarity index 100%
rename from modules/angular2/examples/testing/ts/matchers.ts
rename to modules/@angular/examples/testing/ts/matchers.ts
diff --git a/modules/angular2/examples/testing/ts/testing.ts b/modules/@angular/examples/testing/ts/testing.ts
similarity index 100%
rename from modules/angular2/examples/testing/ts/testing.ts
rename to modules/@angular/examples/testing/ts/testing.ts
diff --git a/modules/angular2/examples/web_workers/ts/.gitkeep b/modules/@angular/examples/web_workers/ts/.gitkeep
similarity index 100%
rename from modules/angular2/examples/web_workers/ts/.gitkeep
rename to modules/@angular/examples/web_workers/ts/.gitkeep
diff --git a/modules/angular2/src/facade/async.dart b/modules/@angular/facade/src/async.dart
similarity index 100%
rename from modules/angular2/src/facade/async.dart
rename to modules/@angular/facade/src/async.dart
diff --git a/modules/angular2/src/facade/async.ts b/modules/@angular/facade/src/async.ts
similarity index 100%
rename from modules/angular2/src/facade/async.ts
rename to modules/@angular/facade/src/async.ts
diff --git a/modules/angular2/src/facade/base_wrapped_exception.dart b/modules/@angular/facade/src/base_wrapped_exception.dart
similarity index 100%
rename from modules/angular2/src/facade/base_wrapped_exception.dart
rename to modules/@angular/facade/src/base_wrapped_exception.dart
diff --git a/modules/angular2/src/facade/base_wrapped_exception.ts b/modules/@angular/facade/src/base_wrapped_exception.ts
similarity index 100%
rename from modules/angular2/src/facade/base_wrapped_exception.ts
rename to modules/@angular/facade/src/base_wrapped_exception.ts
diff --git a/modules/angular2/src/facade/browser.dart b/modules/@angular/facade/src/browser.dart
similarity index 100%
rename from modules/angular2/src/facade/browser.dart
rename to modules/@angular/facade/src/browser.dart
diff --git a/modules/angular2/src/facade/browser.ts b/modules/@angular/facade/src/browser.ts
similarity index 100%
rename from modules/angular2/src/facade/browser.ts
rename to modules/@angular/facade/src/browser.ts
diff --git a/modules/angular2/src/facade/collection.dart b/modules/@angular/facade/src/collection.dart
similarity index 100%
rename from modules/angular2/src/facade/collection.dart
rename to modules/@angular/facade/src/collection.dart
diff --git a/modules/angular2/src/facade/collection.ts b/modules/@angular/facade/src/collection.ts
similarity index 100%
rename from modules/angular2/src/facade/collection.ts
rename to modules/@angular/facade/src/collection.ts
diff --git a/modules/angular2/src/facade/exception_handler.ts b/modules/@angular/facade/src/exception_handler.ts
similarity index 100%
rename from modules/angular2/src/facade/exception_handler.ts
rename to modules/@angular/facade/src/exception_handler.ts
diff --git a/modules/angular2/src/facade/exceptions.dart b/modules/@angular/facade/src/exceptions.dart
similarity index 100%
rename from modules/angular2/src/facade/exceptions.dart
rename to modules/@angular/facade/src/exceptions.dart
diff --git a/modules/angular2/src/facade/exceptions.ts b/modules/@angular/facade/src/exceptions.ts
similarity index 100%
rename from modules/angular2/src/facade/exceptions.ts
rename to modules/@angular/facade/src/exceptions.ts
diff --git a/modules/angular2/src/facade/facade.dart b/modules/@angular/facade/src/facade.dart
similarity index 100%
rename from modules/angular2/src/facade/facade.dart
rename to modules/@angular/facade/src/facade.dart
diff --git a/modules/angular2/src/facade/facade.ts b/modules/@angular/facade/src/facade.ts
similarity index 100%
rename from modules/angular2/src/facade/facade.ts
rename to modules/@angular/facade/src/facade.ts
diff --git a/modules/angular2/src/facade/intl.dart b/modules/@angular/facade/src/intl.dart
similarity index 100%
rename from modules/angular2/src/facade/intl.dart
rename to modules/@angular/facade/src/intl.dart
diff --git a/modules/angular2/src/facade/intl.ts b/modules/@angular/facade/src/intl.ts
similarity index 100%
rename from modules/angular2/src/facade/intl.ts
rename to modules/@angular/facade/src/intl.ts
diff --git a/modules/angular2/src/facade/lang.dart b/modules/@angular/facade/src/lang.dart
similarity index 100%
rename from modules/angular2/src/facade/lang.dart
rename to modules/@angular/facade/src/lang.dart
diff --git a/modules/angular2/src/facade/lang.ts b/modules/@angular/facade/src/lang.ts
similarity index 100%
rename from modules/angular2/src/facade/lang.ts
rename to modules/@angular/facade/src/lang.ts
diff --git a/modules/angular2/src/facade/math.dart b/modules/@angular/facade/src/math.dart
similarity index 100%
rename from modules/angular2/src/facade/math.dart
rename to modules/@angular/facade/src/math.dart
diff --git a/modules/angular2/src/facade/math.ts b/modules/@angular/facade/src/math.ts
similarity index 100%
rename from modules/angular2/src/facade/math.ts
rename to modules/@angular/facade/src/math.ts
diff --git a/modules/angular2/src/facade/promise.dart b/modules/@angular/facade/src/promise.dart
similarity index 100%
rename from modules/angular2/src/facade/promise.dart
rename to modules/@angular/facade/src/promise.dart
diff --git a/modules/angular2/src/facade/promise.ts b/modules/@angular/facade/src/promise.ts
similarity index 100%
rename from modules/angular2/src/facade/promise.ts
rename to modules/@angular/facade/src/promise.ts
diff --git a/modules/angular2/test/facade/async_dart_spec.dart b/modules/@angular/facade/test/async_dart_spec.dart
similarity index 100%
rename from modules/angular2/test/facade/async_dart_spec.dart
rename to modules/@angular/facade/test/async_dart_spec.dart
diff --git a/modules/angular2/test/facade/async_spec.ts b/modules/@angular/facade/test/async_spec.ts
similarity index 100%
rename from modules/angular2/test/facade/async_spec.ts
rename to modules/@angular/facade/test/async_spec.ts
diff --git a/modules/angular2/test/facade/collection_spec.ts b/modules/@angular/facade/test/collection_spec.ts
similarity index 100%
rename from modules/angular2/test/facade/collection_spec.ts
rename to modules/@angular/facade/test/collection_spec.ts
diff --git a/modules/angular2/test/facade/exception_handler_spec.ts b/modules/@angular/facade/test/exception_handler_spec.ts
similarity index 100%
rename from modules/angular2/test/facade/exception_handler_spec.ts
rename to modules/@angular/facade/test/exception_handler_spec.ts
diff --git a/modules/angular2/test/facade/lang_spec.ts b/modules/@angular/facade/test/lang_spec.ts
similarity index 100%
rename from modules/angular2/test/facade/lang_spec.ts
rename to modules/@angular/facade/test/lang_spec.ts
diff --git a/modules/angular2/http.ts b/modules/@angular/http/http.ts
similarity index 100%
rename from modules/angular2/http.ts
rename to modules/@angular/http/http.ts
diff --git a/modules/angular2/src/http/backends/browser_jsonp.ts b/modules/@angular/http/src/backends/browser_jsonp.ts
similarity index 100%
rename from modules/angular2/src/http/backends/browser_jsonp.ts
rename to modules/@angular/http/src/backends/browser_jsonp.ts
diff --git a/modules/angular2/src/http/backends/browser_xhr.ts b/modules/@angular/http/src/backends/browser_xhr.ts
similarity index 100%
rename from modules/angular2/src/http/backends/browser_xhr.ts
rename to modules/@angular/http/src/backends/browser_xhr.ts
diff --git a/modules/angular2/src/http/backends/jsonp_backend.ts b/modules/@angular/http/src/backends/jsonp_backend.ts
similarity index 100%
rename from modules/angular2/src/http/backends/jsonp_backend.ts
rename to modules/@angular/http/src/backends/jsonp_backend.ts
diff --git a/modules/angular2/src/http/backends/xhr_backend.ts b/modules/@angular/http/src/backends/xhr_backend.ts
similarity index 100%
rename from modules/angular2/src/http/backends/xhr_backend.ts
rename to modules/@angular/http/src/backends/xhr_backend.ts
diff --git a/modules/angular2/src/http/base_request_options.ts b/modules/@angular/http/src/base_request_options.ts
similarity index 100%
rename from modules/angular2/src/http/base_request_options.ts
rename to modules/@angular/http/src/base_request_options.ts
diff --git a/modules/angular2/src/http/base_response_options.ts b/modules/@angular/http/src/base_response_options.ts
similarity index 100%
rename from modules/angular2/src/http/base_response_options.ts
rename to modules/@angular/http/src/base_response_options.ts
diff --git a/modules/angular2/src/http/enums.ts b/modules/@angular/http/src/enums.ts
similarity index 100%
rename from modules/angular2/src/http/enums.ts
rename to modules/@angular/http/src/enums.ts
diff --git a/modules/angular2/src/http/headers.ts b/modules/@angular/http/src/headers.ts
similarity index 100%
rename from modules/angular2/src/http/headers.ts
rename to modules/@angular/http/src/headers.ts
diff --git a/modules/angular2/src/http/http.ts b/modules/@angular/http/src/http.ts
similarity index 100%
rename from modules/angular2/src/http/http.ts
rename to modules/@angular/http/src/http.ts
diff --git a/modules/angular2/src/http/http_utils.ts b/modules/@angular/http/src/http_utils.ts
similarity index 100%
rename from modules/angular2/src/http/http_utils.ts
rename to modules/@angular/http/src/http_utils.ts
diff --git a/modules/angular2/src/http/index.ts b/modules/@angular/http/src/index.ts
similarity index 100%
rename from modules/angular2/src/http/index.ts
rename to modules/@angular/http/src/index.ts
diff --git a/modules/angular2/src/http/interfaces.ts b/modules/@angular/http/src/interfaces.ts
similarity index 100%
rename from modules/angular2/src/http/interfaces.ts
rename to modules/@angular/http/src/interfaces.ts
diff --git a/modules/angular2/src/http/package.json b/modules/@angular/http/src/package.json
similarity index 100%
rename from modules/angular2/src/http/package.json
rename to modules/@angular/http/src/package.json
diff --git a/modules/angular2/src/http/static_request.ts b/modules/@angular/http/src/static_request.ts
similarity index 100%
rename from modules/angular2/src/http/static_request.ts
rename to modules/@angular/http/src/static_request.ts
diff --git a/modules/angular2/src/http/static_response.ts b/modules/@angular/http/src/static_response.ts
similarity index 100%
rename from modules/angular2/src/http/static_response.ts
rename to modules/@angular/http/src/static_response.ts
diff --git a/modules/angular2/src/http/url_search_params.ts b/modules/@angular/http/src/url_search_params.ts
similarity index 100%
rename from modules/angular2/src/http/url_search_params.ts
rename to modules/@angular/http/src/url_search_params.ts
diff --git a/modules/angular2/test/http/backends/jsonp_backend_spec.ts b/modules/@angular/http/test/backends/jsonp_backend_spec.ts
similarity index 100%
rename from modules/angular2/test/http/backends/jsonp_backend_spec.ts
rename to modules/@angular/http/test/backends/jsonp_backend_spec.ts
diff --git a/modules/angular2/test/http/backends/mock_backend_spec.ts b/modules/@angular/http/test/backends/mock_backend_spec.ts
similarity index 100%
rename from modules/angular2/test/http/backends/mock_backend_spec.ts
rename to modules/@angular/http/test/backends/mock_backend_spec.ts
diff --git a/modules/angular2/test/http/backends/xhr_backend_spec.ts b/modules/@angular/http/test/backends/xhr_backend_spec.ts
similarity index 100%
rename from modules/angular2/test/http/backends/xhr_backend_spec.ts
rename to modules/@angular/http/test/backends/xhr_backend_spec.ts
diff --git a/modules/angular2/test/http/base_request_options_spec.ts b/modules/@angular/http/test/base_request_options_spec.ts
similarity index 100%
rename from modules/angular2/test/http/base_request_options_spec.ts
rename to modules/@angular/http/test/base_request_options_spec.ts
diff --git a/modules/angular2/test/http/headers_spec.ts b/modules/@angular/http/test/headers_spec.ts
similarity index 100%
rename from modules/angular2/test/http/headers_spec.ts
rename to modules/@angular/http/test/headers_spec.ts
diff --git a/modules/angular2/test/http/http_spec.ts b/modules/@angular/http/test/http_spec.ts
similarity index 100%
rename from modules/angular2/test/http/http_spec.ts
rename to modules/@angular/http/test/http_spec.ts
diff --git a/modules/angular2/test/http/static_response_spec.ts b/modules/@angular/http/test/static_response_spec.ts
similarity index 100%
rename from modules/angular2/test/http/static_response_spec.ts
rename to modules/@angular/http/test/static_response_spec.ts
diff --git a/modules/angular2/test/http/url_search_params_spec.ts b/modules/@angular/http/test/url_search_params_spec.ts
similarity index 100%
rename from modules/angular2/test/http/url_search_params_spec.ts
rename to modules/@angular/http/test/url_search_params_spec.ts
diff --git a/modules/angular2/http/testing.ts b/modules/@angular/http/testing.ts
similarity index 100%
rename from modules/angular2/http/testing.ts
rename to modules/@angular/http/testing.ts
diff --git a/modules/angular2/src/http/backends/mock_backend.ts b/modules/@angular/http/testing/mock_backend.ts
similarity index 100%
rename from modules/angular2/src/http/backends/mock_backend.ts
rename to modules/@angular/http/testing/mock_backend.ts
diff --git a/modules/angular2/test/public_api_spec.ts b/modules/@angular/integration_test/public_api_spec.ts
similarity index 100%
rename from modules/angular2/test/public_api_spec.ts
rename to modules/@angular/integration_test/public_api_spec.ts
diff --git a/modules/angular2/test/symbol_inspector/simple_library.ts b/modules/@angular/integration_test/symbol_inspector/simple_library.ts
similarity index 100%
rename from modules/angular2/test/symbol_inspector/simple_library.ts
rename to modules/@angular/integration_test/symbol_inspector/simple_library.ts
diff --git a/modules/angular2/test/symbol_inspector/symbol_inspector.dart b/modules/@angular/integration_test/symbol_inspector/symbol_inspector.dart
similarity index 100%
rename from modules/angular2/test/symbol_inspector/symbol_inspector.dart
rename to modules/@angular/integration_test/symbol_inspector/symbol_inspector.dart
diff --git a/modules/angular2/test/symbol_inspector/symbol_inspector.ts b/modules/@angular/integration_test/symbol_inspector/symbol_inspector.ts
similarity index 100%
rename from modules/angular2/test/symbol_inspector/symbol_inspector.ts
rename to modules/@angular/integration_test/symbol_inspector/symbol_inspector.ts
diff --git a/modules/angular2/test/symbol_inspector/symbol_inspector_spec.ts b/modules/@angular/integration_test/symbol_inspector/symbol_inspector_spec.ts
similarity index 100%
rename from modules/angular2/test/symbol_inspector/symbol_inspector_spec.ts
rename to modules/@angular/integration_test/symbol_inspector/symbol_inspector_spec.ts
diff --git a/modules/angular2/manual_typings/globals.d.ts b/modules/@angular/manual_typings/globals.d.ts
similarity index 100%
rename from modules/angular2/manual_typings/globals.d.ts
rename to modules/@angular/manual_typings/globals.d.ts
diff --git a/modules/angular2/package.json b/modules/@angular/package.json
similarity index 100%
rename from modules/angular2/package.json
rename to modules/@angular/package.json
diff --git a/modules/angular2/src/platform/browser/xhr_cache.dart b/modules/@angular/platform-browser-dynamic/src/xhr/xhr_cache.dart
similarity index 100%
rename from modules/angular2/src/platform/browser/xhr_cache.dart
rename to modules/@angular/platform-browser-dynamic/src/xhr/xhr_cache.dart
diff --git a/modules/angular2/src/platform/browser/xhr_cache.ts b/modules/@angular/platform-browser-dynamic/src/xhr/xhr_cache.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/xhr_cache.ts
rename to modules/@angular/platform-browser-dynamic/src/xhr/xhr_cache.ts
diff --git a/modules/angular2/src/platform/browser/xhr_impl.dart b/modules/@angular/platform-browser-dynamic/src/xhr/xhr_impl.dart
similarity index 100%
rename from modules/angular2/src/platform/browser/xhr_impl.dart
rename to modules/@angular/platform-browser-dynamic/src/xhr/xhr_impl.dart
diff --git a/modules/angular2/src/platform/browser/xhr_impl.ts b/modules/@angular/platform-browser-dynamic/src/xhr/xhr_impl.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/xhr_impl.ts
rename to modules/@angular/platform-browser-dynamic/src/xhr/xhr_impl.ts
diff --git a/modules/angular2/test/platform/browser/static_assets/200.html b/modules/@angular/platform-browser-dynamic/test/browser/static_assets/200.html
similarity index 100%
rename from modules/angular2/test/platform/browser/static_assets/200.html
rename to modules/@angular/platform-browser-dynamic/test/browser/static_assets/200.html
diff --git a/modules/angular2/test/platform/browser/xhr_cache_setter.dart b/modules/@angular/platform-browser-dynamic/test/xhr/xhr_cache_setter.dart
similarity index 100%
rename from modules/angular2/test/platform/browser/xhr_cache_setter.dart
rename to modules/@angular/platform-browser-dynamic/test/xhr/xhr_cache_setter.dart
diff --git a/modules/angular2/test/platform/browser/xhr_cache_setter.ts b/modules/@angular/platform-browser-dynamic/test/xhr/xhr_cache_setter.ts
similarity index 100%
rename from modules/angular2/test/platform/browser/xhr_cache_setter.ts
rename to modules/@angular/platform-browser-dynamic/test/xhr/xhr_cache_setter.ts
diff --git a/modules/angular2/test/platform/browser/xhr_cache_spec.ts b/modules/@angular/platform-browser-dynamic/test/xhr/xhr_cache_spec.ts
similarity index 100%
rename from modules/angular2/test/platform/browser/xhr_cache_spec.ts
rename to modules/@angular/platform-browser-dynamic/test/xhr/xhr_cache_spec.ts
diff --git a/modules/angular2/test/platform/browser/xhr_impl_spec.ts b/modules/@angular/platform-browser-dynamic/test/xhr/xhr_impl_spec.ts
similarity index 100%
rename from modules/angular2/test/platform/browser/xhr_impl_spec.ts
rename to modules/@angular/platform-browser-dynamic/test/xhr/xhr_impl_spec.ts
diff --git a/modules/angular2/src/animate/animation.ts b/modules/@angular/platform-browser/src/animate/animation.ts
similarity index 100%
rename from modules/angular2/src/animate/animation.ts
rename to modules/@angular/platform-browser/src/animate/animation.ts
diff --git a/modules/angular2/src/animate/animation_builder.ts b/modules/@angular/platform-browser/src/animate/animation_builder.ts
similarity index 100%
rename from modules/angular2/src/animate/animation_builder.ts
rename to modules/@angular/platform-browser/src/animate/animation_builder.ts
diff --git a/modules/angular2/src/animate/browser_details.ts b/modules/@angular/platform-browser/src/animate/browser_details.ts
similarity index 100%
rename from modules/angular2/src/animate/browser_details.ts
rename to modules/@angular/platform-browser/src/animate/browser_details.ts
diff --git a/modules/angular2/src/animate/css_animation_builder.ts b/modules/@angular/platform-browser/src/animate/css_animation_builder.ts
similarity index 100%
rename from modules/angular2/src/animate/css_animation_builder.ts
rename to modules/@angular/platform-browser/src/animate/css_animation_builder.ts
diff --git a/modules/angular2/src/animate/css_animation_options.ts b/modules/@angular/platform-browser/src/animate/css_animation_options.ts
similarity index 100%
rename from modules/angular2/src/animate/css_animation_options.ts
rename to modules/@angular/platform-browser/src/animate/css_animation_options.ts
diff --git a/modules/angular2/src/platform/browser/browser_adapter.dart b/modules/@angular/platform-browser/src/browser/browser_adapter.dart
similarity index 100%
rename from modules/angular2/src/platform/browser/browser_adapter.dart
rename to modules/@angular/platform-browser/src/browser/browser_adapter.dart
diff --git a/modules/angular2/src/platform/browser/browser_adapter.ts b/modules/@angular/platform-browser/src/browser/browser_adapter.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/browser_adapter.ts
rename to modules/@angular/platform-browser/src/browser/browser_adapter.ts
diff --git a/modules/angular2/src/platform/browser/generic_browser_adapter.ts b/modules/@angular/platform-browser/src/browser/generic_browser_adapter.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/generic_browser_adapter.ts
rename to modules/@angular/platform-browser/src/browser/generic_browser_adapter.ts
diff --git a/modules/angular2/src/platform/browser/location/browser_platform_location.ts b/modules/@angular/platform-browser/src/browser/location/browser_platform_location.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/location/browser_platform_location.ts
rename to modules/@angular/platform-browser/src/browser/location/browser_platform_location.ts
diff --git a/modules/angular2/src/platform/browser/ruler.ts b/modules/@angular/platform-browser/src/browser/ruler.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/ruler.ts
rename to modules/@angular/platform-browser/src/browser/ruler.ts
diff --git a/modules/angular2/src/platform/browser/testability.dart b/modules/@angular/platform-browser/src/browser/testability.dart
similarity index 100%
rename from modules/angular2/src/platform/browser/testability.dart
rename to modules/@angular/platform-browser/src/browser/testability.dart
diff --git a/modules/angular2/src/platform/browser/testability.ts b/modules/@angular/platform-browser/src/browser/testability.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/testability.ts
rename to modules/@angular/platform-browser/src/browser/testability.ts
diff --git a/modules/angular2/src/platform/browser/title.ts b/modules/@angular/platform-browser/src/browser/title.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/title.ts
rename to modules/@angular/platform-browser/src/browser/title.ts
diff --git a/modules/angular2/src/platform/browser/tools/common_tools.ts b/modules/@angular/platform-browser/src/browser/tools/common_tools.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/tools/common_tools.ts
rename to modules/@angular/platform-browser/src/browser/tools/common_tools.ts
diff --git a/modules/angular2/src/platform/browser/tools/tools.dart b/modules/@angular/platform-browser/src/browser/tools/tools.dart
similarity index 100%
rename from modules/angular2/src/platform/browser/tools/tools.dart
rename to modules/@angular/platform-browser/src/browser/tools/tools.dart
diff --git a/modules/angular2/src/platform/browser/tools/tools.ts b/modules/@angular/platform-browser/src/browser/tools/tools.ts
similarity index 100%
rename from modules/angular2/src/platform/browser/tools/tools.ts
rename to modules/@angular/platform-browser/src/browser/tools/tools.ts
diff --git a/modules/angular2/src/platform/browser_common.ts b/modules/@angular/platform-browser/src/browser_common.ts
similarity index 100%
rename from modules/angular2/src/platform/browser_common.ts
rename to modules/@angular/platform-browser/src/browser_common.ts
diff --git a/modules/angular2/src/platform/dom/debug/by.ts b/modules/@angular/platform-browser/src/dom/debug/by.ts
similarity index 100%
rename from modules/angular2/src/platform/dom/debug/by.ts
rename to modules/@angular/platform-browser/src/dom/debug/by.ts
diff --git a/modules/angular2/src/platform/dom/debug/ng_probe.ts b/modules/@angular/platform-browser/src/dom/debug/ng_probe.ts
similarity index 100%
rename from modules/angular2/src/platform/dom/debug/ng_probe.ts
rename to modules/@angular/platform-browser/src/dom/debug/ng_probe.ts
diff --git a/modules/angular2/src/platform/dom/dom_adapter.ts b/modules/@angular/platform-browser/src/dom/dom_adapter.ts
similarity index 100%
rename from modules/angular2/src/platform/dom/dom_adapter.ts
rename to modules/@angular/platform-browser/src/dom/dom_adapter.ts
diff --git a/modules/angular2/src/platform/dom/dom_renderer.ts b/modules/@angular/platform-browser/src/dom/dom_renderer.ts
similarity index 100%
rename from modules/angular2/src/platform/dom/dom_renderer.ts
rename to modules/@angular/platform-browser/src/dom/dom_renderer.ts
diff --git a/modules/angular2/src/platform/dom/dom_tokens.ts b/modules/@angular/platform-browser/src/dom/dom_tokens.ts
similarity index 100%
rename from modules/angular2/src/platform/dom/dom_tokens.ts
rename to modules/@angular/platform-browser/src/dom/dom_tokens.ts
diff --git a/modules/angular2/src/platform/dom/events/dom_events.ts b/modules/@angular/platform-browser/src/dom/events/dom_events.ts
similarity index 100%
rename from modules/angular2/src/platform/dom/events/dom_events.ts
rename to modules/@angular/platform-browser/src/dom/events/dom_events.ts
diff --git a/modules/angular2/src/platform/dom/events/event_manager.ts b/modules/@angular/platform-browser/src/dom/events/event_manager.ts
similarity index 100%
rename from modules/angular2/src/platform/dom/events/event_manager.ts
rename to modules/@angular/platform-browser/src/dom/events/event_manager.ts
diff --git a/modules/angular2/src/platform/dom/events/hammer_common.ts b/modules/@angular/platform-browser/src/dom/events/hammer_common.ts
similarity index 100%
rename from modules/angular2/src/platform/dom/events/hammer_common.ts
rename to modules/@angular/platform-browser/src/dom/events/hammer_common.ts
diff --git a/modules/angular2/src/platform/dom/events/hammer_gestures.dart b/modules/@angular/platform-browser/src/dom/events/hammer_gestures.dart
similarity index 100%
rename from modules/angular2/src/platform/dom/events/hammer_gestures.dart
rename to modules/@angular/platform-browser/src/dom/events/hammer_gestures.dart
diff --git a/modules/angular2/src/platform/dom/events/hammer_gestures.ts b/modules/@angular/platform-browser/src/dom/events/hammer_gestures.ts
similarity index 100%
rename from modules/angular2/src/platform/dom/events/hammer_gestures.ts
rename to modules/@angular/platform-browser/src/dom/events/hammer_gestures.ts
diff --git a/modules/angular2/src/platform/dom/events/key_events.ts b/modules/@angular/platform-browser/src/dom/events/key_events.ts
similarity index 100%
rename from modules/angular2/src/platform/dom/events/key_events.ts
rename to modules/@angular/platform-browser/src/dom/events/key_events.ts
diff --git a/modules/angular2/src/platform/dom/shared_styles_host.ts b/modules/@angular/platform-browser/src/dom/shared_styles_host.ts
similarity index 100%
rename from modules/angular2/src/platform/dom/shared_styles_host.ts
rename to modules/@angular/platform-browser/src/dom/shared_styles_host.ts
diff --git a/modules/angular2/src/platform/dom/util.ts b/modules/@angular/platform-browser/src/dom/util.ts
similarity index 100%
rename from modules/angular2/src/platform/dom/util.ts
rename to modules/@angular/platform-browser/src/dom/util.ts
diff --git a/modules/angular2/platform/browser.ts b/modules/@angular/platform-browser/src/platform_browser.ts
similarity index 100%
rename from modules/angular2/platform/browser.ts
rename to modules/@angular/platform-browser/src/platform_browser.ts
diff --git a/modules/angular2/platform/browser_static.ts b/modules/@angular/platform-browser/src/platform_browser_static.ts
similarity index 100%
rename from modules/angular2/platform/browser_static.ts
rename to modules/@angular/platform-browser/src/platform_browser_static.ts
diff --git a/modules/angular2/src/web_workers/debug_tools/multi_client_server_message_bus.dart b/modules/@angular/platform-browser/src/web_workers/debug_tools/multi_client_server_message_bus.dart
similarity index 100%
rename from modules/angular2/src/web_workers/debug_tools/multi_client_server_message_bus.dart
rename to modules/@angular/platform-browser/src/web_workers/debug_tools/multi_client_server_message_bus.dart
diff --git a/modules/angular2/src/web_workers/debug_tools/single_client_server_message_bus.dart b/modules/@angular/platform-browser/src/web_workers/debug_tools/single_client_server_message_bus.dart
similarity index 100%
rename from modules/angular2/src/web_workers/debug_tools/single_client_server_message_bus.dart
rename to modules/@angular/platform-browser/src/web_workers/debug_tools/single_client_server_message_bus.dart
diff --git a/modules/angular2/src/web_workers/debug_tools/web_socket_message_bus.dart b/modules/@angular/platform-browser/src/web_workers/debug_tools/web_socket_message_bus.dart
similarity index 100%
rename from modules/angular2/src/web_workers/debug_tools/web_socket_message_bus.dart
rename to modules/@angular/platform-browser/src/web_workers/debug_tools/web_socket_message_bus.dart
diff --git a/modules/angular2/src/web_workers/shared/api.ts b/modules/@angular/platform-browser/src/web_workers/shared/api.ts
similarity index 100%
rename from modules/angular2/src/web_workers/shared/api.ts
rename to modules/@angular/platform-browser/src/web_workers/shared/api.ts
diff --git a/modules/angular2/src/web_workers/shared/client_message_broker.ts b/modules/@angular/platform-browser/src/web_workers/shared/client_message_broker.ts
similarity index 100%
rename from modules/angular2/src/web_workers/shared/client_message_broker.ts
rename to modules/@angular/platform-browser/src/web_workers/shared/client_message_broker.ts
diff --git a/modules/angular2/src/web_workers/shared/generic_message_bus.dart b/modules/@angular/platform-browser/src/web_workers/shared/generic_message_bus.dart
similarity index 100%
rename from modules/angular2/src/web_workers/shared/generic_message_bus.dart
rename to modules/@angular/platform-browser/src/web_workers/shared/generic_message_bus.dart
diff --git a/modules/angular2/src/web_workers/shared/isolate_message_bus.dart b/modules/@angular/platform-browser/src/web_workers/shared/isolate_message_bus.dart
similarity index 100%
rename from modules/angular2/src/web_workers/shared/isolate_message_bus.dart
rename to modules/@angular/platform-browser/src/web_workers/shared/isolate_message_bus.dart
diff --git a/modules/angular2/src/web_workers/shared/message_bus.ts b/modules/@angular/platform-browser/src/web_workers/shared/message_bus.ts
similarity index 100%
rename from modules/angular2/src/web_workers/shared/message_bus.ts
rename to modules/@angular/platform-browser/src/web_workers/shared/message_bus.ts
diff --git a/modules/angular2/src/web_workers/shared/messaging_api.ts b/modules/@angular/platform-browser/src/web_workers/shared/messaging_api.ts
similarity index 100%
rename from modules/angular2/src/web_workers/shared/messaging_api.ts
rename to modules/@angular/platform-browser/src/web_workers/shared/messaging_api.ts
diff --git a/modules/angular2/src/web_workers/shared/post_message_bus.dart b/modules/@angular/platform-browser/src/web_workers/shared/post_message_bus.dart
similarity index 100%
rename from modules/angular2/src/web_workers/shared/post_message_bus.dart
rename to modules/@angular/platform-browser/src/web_workers/shared/post_message_bus.dart
diff --git a/modules/angular2/src/web_workers/shared/post_message_bus.ts b/modules/@angular/platform-browser/src/web_workers/shared/post_message_bus.ts
similarity index 100%
rename from modules/angular2/src/web_workers/shared/post_message_bus.ts
rename to modules/@angular/platform-browser/src/web_workers/shared/post_message_bus.ts
diff --git a/modules/angular2/src/web_workers/shared/render_store.ts b/modules/@angular/platform-browser/src/web_workers/shared/render_store.ts
similarity index 100%
rename from modules/angular2/src/web_workers/shared/render_store.ts
rename to modules/@angular/platform-browser/src/web_workers/shared/render_store.ts
diff --git a/modules/angular2/src/web_workers/shared/serialized_types.ts b/modules/@angular/platform-browser/src/web_workers/shared/serialized_types.ts
similarity index 100%
rename from modules/angular2/src/web_workers/shared/serialized_types.ts
rename to modules/@angular/platform-browser/src/web_workers/shared/serialized_types.ts
diff --git a/modules/angular2/src/web_workers/shared/serializer.ts b/modules/@angular/platform-browser/src/web_workers/shared/serializer.ts
similarity index 100%
rename from modules/angular2/src/web_workers/shared/serializer.ts
rename to modules/@angular/platform-browser/src/web_workers/shared/serializer.ts
diff --git a/modules/angular2/src/web_workers/shared/service_message_broker.ts b/modules/@angular/platform-browser/src/web_workers/shared/service_message_broker.ts
similarity index 100%
rename from modules/angular2/src/web_workers/shared/service_message_broker.ts
rename to modules/@angular/platform-browser/src/web_workers/shared/service_message_broker.ts
diff --git a/modules/angular2/src/web_workers/ui/bind.dart b/modules/@angular/platform-browser/src/web_workers/ui/bind.dart
similarity index 100%
rename from modules/angular2/src/web_workers/ui/bind.dart
rename to modules/@angular/platform-browser/src/web_workers/ui/bind.dart
diff --git a/modules/angular2/src/web_workers/ui/bind.ts b/modules/@angular/platform-browser/src/web_workers/ui/bind.ts
similarity index 100%
rename from modules/angular2/src/web_workers/ui/bind.ts
rename to modules/@angular/platform-browser/src/web_workers/ui/bind.ts
diff --git a/modules/angular2/src/web_workers/ui/event_dispatcher.ts b/modules/@angular/platform-browser/src/web_workers/ui/event_dispatcher.ts
similarity index 100%
rename from modules/angular2/src/web_workers/ui/event_dispatcher.ts
rename to modules/@angular/platform-browser/src/web_workers/ui/event_dispatcher.ts
diff --git a/modules/angular2/src/web_workers/ui/event_serializer.dart b/modules/@angular/platform-browser/src/web_workers/ui/event_serializer.dart
similarity index 100%
rename from modules/angular2/src/web_workers/ui/event_serializer.dart
rename to modules/@angular/platform-browser/src/web_workers/ui/event_serializer.dart
diff --git a/modules/angular2/src/web_workers/ui/event_serializer.ts b/modules/@angular/platform-browser/src/web_workers/ui/event_serializer.ts
similarity index 100%
rename from modules/angular2/src/web_workers/ui/event_serializer.ts
rename to modules/@angular/platform-browser/src/web_workers/ui/event_serializer.ts
diff --git a/modules/angular2/src/web_workers/ui/platform_location.ts b/modules/@angular/platform-browser/src/web_workers/ui/platform_location.ts
similarity index 100%
rename from modules/angular2/src/web_workers/ui/platform_location.ts
rename to modules/@angular/platform-browser/src/web_workers/ui/platform_location.ts
diff --git a/modules/angular2/src/web_workers/ui/renderer.ts b/modules/@angular/platform-browser/src/web_workers/ui/renderer.ts
similarity index 100%
rename from modules/angular2/src/web_workers/ui/renderer.ts
rename to modules/@angular/platform-browser/src/web_workers/ui/renderer.ts
diff --git a/modules/angular2/src/web_workers/ui/router_providers.ts b/modules/@angular/platform-browser/src/web_workers/ui/router_providers.ts
similarity index 100%
rename from modules/angular2/src/web_workers/ui/router_providers.ts
rename to modules/@angular/platform-browser/src/web_workers/ui/router_providers.ts
diff --git a/modules/angular2/src/web_workers/ui/xhr_impl.ts b/modules/@angular/platform-browser/src/web_workers/ui/xhr_impl.ts
similarity index 100%
rename from modules/angular2/src/web_workers/ui/xhr_impl.ts
rename to modules/@angular/platform-browser/src/web_workers/ui/xhr_impl.ts
diff --git a/modules/angular2/src/web_workers/worker/event_deserializer.dart b/modules/@angular/platform-browser/src/web_workers/worker/event_deserializer.dart
similarity index 100%
rename from modules/angular2/src/web_workers/worker/event_deserializer.dart
rename to modules/@angular/platform-browser/src/web_workers/worker/event_deserializer.dart
diff --git a/modules/angular2/src/web_workers/worker/event_deserializer.ts b/modules/@angular/platform-browser/src/web_workers/worker/event_deserializer.ts
similarity index 100%
rename from modules/angular2/src/web_workers/worker/event_deserializer.ts
rename to modules/@angular/platform-browser/src/web_workers/worker/event_deserializer.ts
diff --git a/modules/angular2/src/web_workers/worker/platform_location.ts b/modules/@angular/platform-browser/src/web_workers/worker/platform_location.ts
similarity index 100%
rename from modules/angular2/src/web_workers/worker/platform_location.ts
rename to modules/@angular/platform-browser/src/web_workers/worker/platform_location.ts
diff --git a/modules/angular2/src/web_workers/worker/renderer.ts b/modules/@angular/platform-browser/src/web_workers/worker/renderer.ts
similarity index 100%
rename from modules/angular2/src/web_workers/worker/renderer.ts
rename to modules/@angular/platform-browser/src/web_workers/worker/renderer.ts
diff --git a/modules/angular2/src/web_workers/worker/router_providers.ts b/modules/@angular/platform-browser/src/web_workers/worker/router_providers.ts
similarity index 100%
rename from modules/angular2/src/web_workers/worker/router_providers.ts
rename to modules/@angular/platform-browser/src/web_workers/worker/router_providers.ts
diff --git a/modules/angular2/src/web_workers/worker/xhr_impl.ts b/modules/@angular/platform-browser/src/web_workers/worker/xhr_impl.ts
similarity index 100%
rename from modules/angular2/src/web_workers/worker/xhr_impl.ts
rename to modules/@angular/platform-browser/src/web_workers/worker/xhr_impl.ts
diff --git a/modules/angular2/src/platform/worker_app.dart b/modules/@angular/platform-browser/src/webworker/worker_app.dart
similarity index 100%
rename from modules/angular2/src/platform/worker_app.dart
rename to modules/@angular/platform-browser/src/webworker/worker_app.dart
diff --git a/modules/angular2/src/platform/worker_app.ts b/modules/@angular/platform-browser/src/webworker/worker_app.ts
similarity index 100%
rename from modules/angular2/src/platform/worker_app.ts
rename to modules/@angular/platform-browser/src/webworker/worker_app.ts
diff --git a/modules/angular2/src/platform/worker_app_common.ts b/modules/@angular/platform-browser/src/webworker/worker_app_common.ts
similarity index 100%
rename from modules/angular2/src/platform/worker_app_common.ts
rename to modules/@angular/platform-browser/src/webworker/worker_app_common.ts
diff --git a/modules/angular2/src/platform/worker_render.dart b/modules/@angular/platform-browser/src/webworker/worker_render.dart
similarity index 100%
rename from modules/angular2/src/platform/worker_render.dart
rename to modules/@angular/platform-browser/src/webworker/worker_render.dart
diff --git a/modules/angular2/src/platform/worker_render.ts b/modules/@angular/platform-browser/src/webworker/worker_render.ts
similarity index 100%
rename from modules/angular2/src/platform/worker_render.ts
rename to modules/@angular/platform-browser/src/webworker/worker_render.ts
diff --git a/modules/angular2/src/platform/worker_render_common.ts b/modules/@angular/platform-browser/src/webworker/worker_render_common.ts
similarity index 100%
rename from modules/angular2/src/platform/worker_render_common.ts
rename to modules/@angular/platform-browser/src/webworker/worker_render_common.ts
diff --git a/modules/angular2/platform/worker_app.dart b/modules/@angular/platform-browser/src/worker_app.dart
similarity index 100%
rename from modules/angular2/platform/worker_app.dart
rename to modules/@angular/platform-browser/src/worker_app.dart
diff --git a/modules/angular2/platform/worker_app.ts b/modules/@angular/platform-browser/src/worker_app.ts
similarity index 100%
rename from modules/angular2/platform/worker_app.ts
rename to modules/@angular/platform-browser/src/worker_app.ts
diff --git a/modules/angular2/platform/worker_render.dart b/modules/@angular/platform-browser/src/worker_render.dart
similarity index 100%
rename from modules/angular2/platform/worker_render.dart
rename to modules/@angular/platform-browser/src/worker_render.dart
diff --git a/modules/angular2/platform/worker_render.ts b/modules/@angular/platform-browser/src/worker_render.ts
similarity index 100%
rename from modules/angular2/platform/worker_render.ts
rename to modules/@angular/platform-browser/src/worker_render.ts
diff --git a/modules/angular2/test/animate/animation_builder_spec.ts b/modules/@angular/platform-browser/test/animate/animation_builder_spec.ts
similarity index 100%
rename from modules/angular2/test/animate/animation_builder_spec.ts
rename to modules/@angular/platform-browser/test/animate/animation_builder_spec.ts
diff --git a/modules/angular2/test/platform/browser/bootstrap_spec.ts b/modules/@angular/platform-browser/test/browser/bootstrap_spec.ts
similarity index 100%
rename from modules/angular2/test/platform/browser/bootstrap_spec.ts
rename to modules/@angular/platform-browser/test/browser/bootstrap_spec.ts
diff --git a/modules/angular2/test/platform/browser/rectangle_mock.dart b/modules/@angular/platform-browser/test/browser/rectangle_mock.dart
similarity index 100%
rename from modules/angular2/test/platform/browser/rectangle_mock.dart
rename to modules/@angular/platform-browser/test/browser/rectangle_mock.dart
diff --git a/modules/angular2/test/platform/browser/rectangle_mock.ts b/modules/@angular/platform-browser/test/browser/rectangle_mock.ts
similarity index 100%
rename from modules/angular2/test/platform/browser/rectangle_mock.ts
rename to modules/@angular/platform-browser/test/browser/rectangle_mock.ts
diff --git a/modules/angular2/test/platform/browser/ruler_spec.ts b/modules/@angular/platform-browser/test/browser/ruler_spec.ts
similarity index 100%
rename from modules/angular2/test/platform/browser/ruler_spec.ts
rename to modules/@angular/platform-browser/test/browser/ruler_spec.ts
diff --git a/modules/angular2/test/platform/browser/title_spec.ts b/modules/@angular/platform-browser/test/browser/title_spec.ts
similarity index 100%
rename from modules/angular2/test/platform/browser/title_spec.ts
rename to modules/@angular/platform-browser/test/browser/title_spec.ts
diff --git a/modules/angular2/test/platform/browser/tools/spies.dart b/modules/@angular/platform-browser/test/browser/tools/spies.dart
similarity index 100%
rename from modules/angular2/test/platform/browser/tools/spies.dart
rename to modules/@angular/platform-browser/test/browser/tools/spies.dart
diff --git a/modules/angular2/test/platform/browser/tools/spies.ts b/modules/@angular/platform-browser/test/browser/tools/spies.ts
similarity index 100%
rename from modules/angular2/test/platform/browser/tools/spies.ts
rename to modules/@angular/platform-browser/test/browser/tools/spies.ts
diff --git a/modules/angular2/test/platform/browser/tools/tools_spec.ts b/modules/@angular/platform-browser/test/browser/tools/tools_spec.ts
similarity index 100%
rename from modules/angular2/test/platform/browser/tools/tools_spec.ts
rename to modules/@angular/platform-browser/test/browser/tools/tools_spec.ts
diff --git a/modules/angular2/test/testing/utils_spec.ts b/modules/@angular/platform-browser/test/browser_util_spec.ts
similarity index 100%
rename from modules/angular2/test/testing/utils_spec.ts
rename to modules/@angular/platform-browser/test/browser_util_spec.ts
diff --git a/modules/angular2/test/platform/dom/dom_renderer_integration_spec.ts b/modules/@angular/platform-browser/test/dom/dom_renderer_integration_spec.ts
similarity index 100%
rename from modules/angular2/test/platform/dom/dom_renderer_integration_spec.ts
rename to modules/@angular/platform-browser/test/dom/dom_renderer_integration_spec.ts
diff --git a/modules/angular2/test/platform/dom/events/event_manager_spec.ts b/modules/@angular/platform-browser/test/dom/events/event_manager_spec.ts
similarity index 100%
rename from modules/angular2/test/platform/dom/events/event_manager_spec.ts
rename to modules/@angular/platform-browser/test/dom/events/event_manager_spec.ts
diff --git a/modules/angular2/test/platform/dom/events/key_events_spec.ts b/modules/@angular/platform-browser/test/dom/events/key_events_spec.ts
similarity index 100%
rename from modules/angular2/test/platform/dom/events/key_events_spec.ts
rename to modules/@angular/platform-browser/test/dom/events/key_events_spec.ts
diff --git a/modules/angular2/test/platform/dom/shared_styles_host_spec.ts b/modules/@angular/platform-browser/test/dom/shared_styles_host_spec.ts
similarity index 100%
rename from modules/angular2/test/platform/dom/shared_styles_host_spec.ts
rename to modules/@angular/platform-browser/test/dom/shared_styles_host_spec.ts
diff --git a/modules/angular2/test/testing/static_assets/test.html b/modules/@angular/platform-browser/test/static_assets/test.html
similarity index 100%
rename from modules/angular2/test/testing/static_assets/test.html
rename to modules/@angular/platform-browser/test/static_assets/test.html
diff --git a/modules/angular2/test/testing/testing_public_browser_spec.dart b/modules/@angular/platform-browser/test/testing_public_browser_spec.dart
similarity index 100%
rename from modules/angular2/test/testing/testing_public_browser_spec.dart
rename to modules/@angular/platform-browser/test/testing_public_browser_spec.dart
diff --git a/modules/angular2/test/testing/testing_public_browser_spec.ts b/modules/@angular/platform-browser/test/testing_public_browser_spec.ts
similarity index 100%
rename from modules/angular2/test/testing/testing_public_browser_spec.ts
rename to modules/@angular/platform-browser/test/testing_public_browser_spec.ts
diff --git a/modules/angular2/test/testing/testing_public_spec.dart b/modules/@angular/platform-browser/test/testing_public_spec.dart
similarity index 100%
rename from modules/angular2/test/testing/testing_public_spec.dart
rename to modules/@angular/platform-browser/test/testing_public_spec.dart
diff --git a/modules/angular2/test/testing/testing_public_spec.ts b/modules/@angular/platform-browser/test/testing_public_spec.ts
similarity index 100%
rename from modules/angular2/test/testing/testing_public_spec.ts
rename to modules/@angular/platform-browser/test/testing_public_spec.ts
diff --git a/modules/angular2/test/web_workers/debug_tools/bootstrap.server.spec.dart b/modules/@angular/platform-browser/test/web_workers/debug_tools/bootstrap.server.spec.dart
similarity index 100%
rename from modules/angular2/test/web_workers/debug_tools/bootstrap.server.spec.dart
rename to modules/@angular/platform-browser/test/web_workers/debug_tools/bootstrap.server.spec.dart
diff --git a/modules/angular2/test/web_workers/debug_tools/message_bus_common.dart b/modules/@angular/platform-browser/test/web_workers/debug_tools/message_bus_common.dart
similarity index 100%
rename from modules/angular2/test/web_workers/debug_tools/message_bus_common.dart
rename to modules/@angular/platform-browser/test/web_workers/debug_tools/message_bus_common.dart
diff --git a/modules/angular2/test/web_workers/debug_tools/multi_client_server_message_bus.server.spec.dart b/modules/@angular/platform-browser/test/web_workers/debug_tools/multi_client_server_message_bus.server.spec.dart
similarity index 100%
rename from modules/angular2/test/web_workers/debug_tools/multi_client_server_message_bus.server.spec.dart
rename to modules/@angular/platform-browser/test/web_workers/debug_tools/multi_client_server_message_bus.server.spec.dart
diff --git a/modules/angular2/test/web_workers/debug_tools/single_client_server_message_bus.server.spec.dart b/modules/@angular/platform-browser/test/web_workers/debug_tools/single_client_server_message_bus.server.spec.dart
similarity index 100%
rename from modules/angular2/test/web_workers/debug_tools/single_client_server_message_bus.server.spec.dart
rename to modules/@angular/platform-browser/test/web_workers/debug_tools/single_client_server_message_bus.server.spec.dart
diff --git a/modules/angular2/test/web_workers/debug_tools/spy_web_socket.dart b/modules/@angular/platform-browser/test/web_workers/debug_tools/spy_web_socket.dart
similarity index 100%
rename from modules/angular2/test/web_workers/debug_tools/spy_web_socket.dart
rename to modules/@angular/platform-browser/test/web_workers/debug_tools/spy_web_socket.dart
diff --git a/modules/angular2/test/web_workers/debug_tools/web_socket_message_bus_spec.dart b/modules/@angular/platform-browser/test/web_workers/debug_tools/web_socket_message_bus_spec.dart
similarity index 100%
rename from modules/angular2/test/web_workers/debug_tools/web_socket_message_bus_spec.dart
rename to modules/@angular/platform-browser/test/web_workers/debug_tools/web_socket_message_bus_spec.dart
diff --git a/modules/angular2/test/web_workers/shared/message_bus_spec.ts b/modules/@angular/platform-browser/test/web_workers/shared/message_bus_spec.ts
similarity index 100%
rename from modules/angular2/test/web_workers/shared/message_bus_spec.ts
rename to modules/@angular/platform-browser/test/web_workers/shared/message_bus_spec.ts
diff --git a/modules/angular2/test/web_workers/shared/message_bus_util.dart b/modules/@angular/platform-browser/test/web_workers/shared/message_bus_util.dart
similarity index 100%
rename from modules/angular2/test/web_workers/shared/message_bus_util.dart
rename to modules/@angular/platform-browser/test/web_workers/shared/message_bus_util.dart
diff --git a/modules/angular2/test/web_workers/shared/message_bus_util.ts b/modules/@angular/platform-browser/test/web_workers/shared/message_bus_util.ts
similarity index 100%
rename from modules/angular2/test/web_workers/shared/message_bus_util.ts
rename to modules/@angular/platform-browser/test/web_workers/shared/message_bus_util.ts
diff --git a/modules/angular2/test/web_workers/shared/mock_event_emitter.dart b/modules/@angular/platform-browser/test/web_workers/shared/mock_event_emitter.dart
similarity index 100%
rename from modules/angular2/test/web_workers/shared/mock_event_emitter.dart
rename to modules/@angular/platform-browser/test/web_workers/shared/mock_event_emitter.dart
diff --git a/modules/angular2/test/web_workers/shared/mock_event_emitter.ts b/modules/@angular/platform-browser/test/web_workers/shared/mock_event_emitter.ts
similarity index 100%
rename from modules/angular2/test/web_workers/shared/mock_event_emitter.ts
rename to modules/@angular/platform-browser/test/web_workers/shared/mock_event_emitter.ts
diff --git a/modules/angular2/test/web_workers/shared/render_store_spec.ts b/modules/@angular/platform-browser/test/web_workers/shared/render_store_spec.ts
similarity index 100%
rename from modules/angular2/test/web_workers/shared/render_store_spec.ts
rename to modules/@angular/platform-browser/test/web_workers/shared/render_store_spec.ts
diff --git a/modules/angular2/test/web_workers/shared/service_message_broker_spec.ts b/modules/@angular/platform-browser/test/web_workers/shared/service_message_broker_spec.ts
similarity index 100%
rename from modules/angular2/test/web_workers/shared/service_message_broker_spec.ts
rename to modules/@angular/platform-browser/test/web_workers/shared/service_message_broker_spec.ts
diff --git a/modules/angular2/test/web_workers/shared/web_worker_test_util.ts b/modules/@angular/platform-browser/test/web_workers/shared/web_worker_test_util.ts
similarity index 100%
rename from modules/angular2/test/web_workers/shared/web_worker_test_util.ts
rename to modules/@angular/platform-browser/test/web_workers/shared/web_worker_test_util.ts
diff --git a/modules/angular2/test/web_workers/worker/platform_location_spec.ts b/modules/@angular/platform-browser/test/web_workers/worker/platform_location_spec.ts
similarity index 100%
rename from modules/angular2/test/web_workers/worker/platform_location_spec.ts
rename to modules/@angular/platform-browser/test/web_workers/worker/platform_location_spec.ts
diff --git a/modules/angular2/test/web_workers/worker/renderer_integration_spec.ts b/modules/@angular/platform-browser/test/web_workers/worker/renderer_integration_spec.ts
similarity index 100%
rename from modules/angular2/test/web_workers/worker/renderer_integration_spec.ts
rename to modules/@angular/platform-browser/test/web_workers/worker/renderer_integration_spec.ts
diff --git a/modules/angular2/test/web_workers/worker/spies.dart b/modules/@angular/platform-browser/test/web_workers/worker/spies.dart
similarity index 100%
rename from modules/angular2/test/web_workers/worker/spies.dart
rename to modules/@angular/platform-browser/test/web_workers/worker/spies.dart
diff --git a/modules/angular2/test/web_workers/worker/spies.ts b/modules/@angular/platform-browser/test/web_workers/worker/spies.ts
similarity index 100%
rename from modules/angular2/test/web_workers/worker/spies.ts
rename to modules/@angular/platform-browser/test/web_workers/worker/spies.ts
diff --git a/modules/angular2/test/web_workers/worker/xhr_impl_spec.ts b/modules/@angular/platform-browser/test/web_workers/worker/xhr_impl_spec.ts
similarity index 100%
rename from modules/angular2/test/web_workers/worker/xhr_impl_spec.ts
rename to modules/@angular/platform-browser/test/web_workers/worker/xhr_impl_spec.ts
diff --git a/modules/angular2/src/mock/animation_builder_mock.ts b/modules/@angular/platform-browser/testing/animation_builder_mock.ts
similarity index 100%
rename from modules/angular2/src/mock/animation_builder_mock.ts
rename to modules/@angular/platform-browser/testing/animation_builder_mock.ts
diff --git a/modules/angular2/src/testing/benchmark_util.ts b/modules/@angular/platform-browser/testing/benchmark_util.ts
similarity index 100%
rename from modules/angular2/src/testing/benchmark_util.ts
rename to modules/@angular/platform-browser/testing/benchmark_util.ts
diff --git a/modules/angular2/platform/testing/browser.ts b/modules/@angular/platform-browser/testing/browser.ts
similarity index 100%
rename from modules/angular2/platform/testing/browser.ts
rename to modules/@angular/platform-browser/testing/browser.ts
diff --git a/modules/angular2/platform/testing/browser_static.ts b/modules/@angular/platform-browser/testing/browser_static.ts
similarity index 100%
rename from modules/angular2/platform/testing/browser_static.ts
rename to modules/@angular/platform-browser/testing/browser_static.ts
diff --git a/modules/angular2/src/testing/utils.ts b/modules/@angular/platform-browser/testing/browser_util.ts
similarity index 100%
rename from modules/angular2/src/testing/utils.ts
rename to modules/@angular/platform-browser/testing/browser_util.ts
diff --git a/modules/angular2/src/testing/e2e_util.dart b/modules/@angular/platform-browser/testing/e2e_util.dart
similarity index 100%
rename from modules/angular2/src/testing/e2e_util.dart
rename to modules/@angular/platform-browser/testing/e2e_util.dart
diff --git a/modules/angular2/src/testing/e2e_util.ts b/modules/@angular/platform-browser/testing/e2e_util.ts
similarity index 100%
rename from modules/angular2/src/testing/e2e_util.ts
rename to modules/@angular/platform-browser/testing/e2e_util.ts
diff --git a/modules/angular2/src/testing/matchers.dart b/modules/@angular/platform-browser/testing/matchers.dart
similarity index 100%
rename from modules/angular2/src/testing/matchers.dart
rename to modules/@angular/platform-browser/testing/matchers.dart
diff --git a/modules/angular2/src/testing/matchers.ts b/modules/@angular/platform-browser/testing/matchers.ts
similarity index 100%
rename from modules/angular2/src/testing/matchers.ts
rename to modules/@angular/platform-browser/testing/matchers.ts
diff --git a/modules/angular2/src/testing/perf_util.dart b/modules/@angular/platform-browser/testing/perf_util.dart
similarity index 100%
rename from modules/angular2/src/testing/perf_util.dart
rename to modules/@angular/platform-browser/testing/perf_util.dart
diff --git a/modules/angular2/src/testing/perf_util.ts b/modules/@angular/platform-browser/testing/perf_util.ts
similarity index 100%
rename from modules/angular2/src/testing/perf_util.ts
rename to modules/@angular/platform-browser/testing/perf_util.ts
diff --git a/modules/angular2/src/testing/shims_for_IE.js b/modules/@angular/platform-browser/testing/shims_for_IE.js
similarity index 100%
rename from modules/angular2/src/testing/shims_for_IE.js
rename to modules/@angular/platform-browser/testing/shims_for_IE.js
diff --git a/modules/angular2/src/testing/testing_internal_core.dart b/modules/@angular/platform-browser/testing/testing_internal_core.dart
similarity index 100%
rename from modules/angular2/src/testing/testing_internal_core.dart
rename to modules/@angular/platform-browser/testing/testing_internal_core.dart
diff --git a/modules/angular2/platform/server.dart b/modules/@angular/platform-server/platform-server.dart
similarity index 100%
rename from modules/angular2/platform/server.dart
rename to modules/@angular/platform-server/platform-server.dart
diff --git a/modules/angular2/platform/server.ts b/modules/@angular/platform-server/platform_server.ts
similarity index 100%
rename from modules/angular2/platform/server.ts
rename to modules/@angular/platform-server/platform_server.ts
diff --git a/modules/angular2/src/platform/server/abstract_html_adapter.dart b/modules/@angular/platform-server/src/abstract_html_adapter.dart
similarity index 100%
rename from modules/angular2/src/platform/server/abstract_html_adapter.dart
rename to modules/@angular/platform-server/src/abstract_html_adapter.dart
diff --git a/modules/angular2/src/platform/server/html_adapter.dart b/modules/@angular/platform-server/src/html_adapter.dart
similarity index 100%
rename from modules/angular2/src/platform/server/html_adapter.dart
rename to modules/@angular/platform-server/src/html_adapter.dart
diff --git a/modules/angular2/src/platform/server/parse5_adapter.dart b/modules/@angular/platform-server/src/parse5_adapter.dart
similarity index 100%
rename from modules/angular2/src/platform/server/parse5_adapter.dart
rename to modules/@angular/platform-server/src/parse5_adapter.dart
diff --git a/modules/angular2/src/platform/server/parse5_adapter.ts b/modules/@angular/platform-server/src/parse5_adapter.ts
similarity index 100%
rename from modules/angular2/src/platform/server/parse5_adapter.ts
rename to modules/@angular/platform-server/src/parse5_adapter.ts
diff --git a/modules/angular2/src/platform/server/webworker_adapter.dart b/modules/@angular/platform-server/src/webworker_adapter.dart
similarity index 100%
rename from modules/angular2/src/platform/server/webworker_adapter.dart
rename to modules/@angular/platform-server/src/webworker_adapter.dart
diff --git a/modules/angular2/platform/testing/server.dart b/modules/@angular/platform-server/testing/server.dart
similarity index 100%
rename from modules/angular2/platform/testing/server.dart
rename to modules/@angular/platform-server/testing/server.dart
diff --git a/modules/angular2/platform/testing/server.ts b/modules/@angular/platform-server/testing/server.ts
similarity index 100%
rename from modules/angular2/platform/testing/server.ts
rename to modules/@angular/platform-server/testing/server.ts
diff --git a/modules/angular2/platform/common.ts b/modules/@angular/platform/common.ts
similarity index 100%
rename from modules/angular2/platform/common.ts
rename to modules/@angular/platform/common.ts
diff --git a/modules/angular2/platform/common_dom.ts b/modules/@angular/platform/common_dom.ts
similarity index 100%
rename from modules/angular2/platform/common_dom.ts
rename to modules/@angular/platform/common_dom.ts
diff --git a/modules/angular2/pubspec.yaml b/modules/@angular/pubspec.yaml
similarity index 100%
rename from modules/angular2/pubspec.yaml
rename to modules/@angular/pubspec.yaml
diff --git a/modules/angular2/router.ts b/modules/@angular/router/router.ts
similarity index 100%
rename from modules/angular2/router.ts
rename to modules/@angular/router/router.ts
diff --git a/modules/angular2/router/router_link_dsl.ts b/modules/@angular/router/router_link_dsl.ts
similarity index 100%
rename from modules/angular2/router/router_link_dsl.ts
rename to modules/@angular/router/router_link_dsl.ts
diff --git a/modules/angular2/src/router/directives/router_link.ts b/modules/@angular/router/src/directives/router_link.ts
similarity index 100%
rename from modules/angular2/src/router/directives/router_link.ts
rename to modules/@angular/router/src/directives/router_link.ts
diff --git a/modules/angular2/src/router/directives/router_link_transform.ts b/modules/@angular/router/src/directives/router_link_transform.ts
similarity index 100%
rename from modules/angular2/src/router/directives/router_link_transform.ts
rename to modules/@angular/router/src/directives/router_link_transform.ts
diff --git a/modules/angular2/src/router/directives/router_outlet.ts b/modules/@angular/router/src/directives/router_outlet.ts
similarity index 100%
rename from modules/angular2/src/router/directives/router_outlet.ts
rename to modules/@angular/router/src/directives/router_outlet.ts
diff --git a/modules/angular2/src/router/instruction.ts b/modules/@angular/router/src/instruction.ts
similarity index 100%
rename from modules/angular2/src/router/instruction.ts
rename to modules/@angular/router/src/instruction.ts
diff --git a/modules/angular2/src/router/interfaces.ts b/modules/@angular/router/src/interfaces.ts
similarity index 100%
rename from modules/angular2/src/router/interfaces.ts
rename to modules/@angular/router/src/interfaces.ts
diff --git a/modules/angular2/src/router/lifecycle/lifecycle_annotations.dart b/modules/@angular/router/src/lifecycle/lifecycle_annotations.dart
similarity index 100%
rename from modules/angular2/src/router/lifecycle/lifecycle_annotations.dart
rename to modules/@angular/router/src/lifecycle/lifecycle_annotations.dart
diff --git a/modules/angular2/src/router/lifecycle/lifecycle_annotations.ts b/modules/@angular/router/src/lifecycle/lifecycle_annotations.ts
similarity index 100%
rename from modules/angular2/src/router/lifecycle/lifecycle_annotations.ts
rename to modules/@angular/router/src/lifecycle/lifecycle_annotations.ts
diff --git a/modules/angular2/src/router/lifecycle/lifecycle_annotations_impl.ts b/modules/@angular/router/src/lifecycle/lifecycle_annotations_impl.ts
similarity index 100%
rename from modules/angular2/src/router/lifecycle/lifecycle_annotations_impl.ts
rename to modules/@angular/router/src/lifecycle/lifecycle_annotations_impl.ts
diff --git a/modules/angular2/src/router/lifecycle/route_lifecycle_reflector.dart b/modules/@angular/router/src/lifecycle/route_lifecycle_reflector.dart
similarity index 100%
rename from modules/angular2/src/router/lifecycle/route_lifecycle_reflector.dart
rename to modules/@angular/router/src/lifecycle/route_lifecycle_reflector.dart
diff --git a/modules/angular2/src/router/lifecycle/route_lifecycle_reflector.ts b/modules/@angular/router/src/lifecycle/route_lifecycle_reflector.ts
similarity index 100%
rename from modules/angular2/src/router/lifecycle/route_lifecycle_reflector.ts
rename to modules/@angular/router/src/lifecycle/route_lifecycle_reflector.ts
diff --git a/modules/angular2/src/router/package.json b/modules/@angular/router/src/package.json
similarity index 100%
rename from modules/angular2/src/router/package.json
rename to modules/@angular/router/src/package.json
diff --git a/modules/angular2/src/router/route_config/route_config_decorator.dart b/modules/@angular/router/src/route_config/route_config_decorator.dart
similarity index 100%
rename from modules/angular2/src/router/route_config/route_config_decorator.dart
rename to modules/@angular/router/src/route_config/route_config_decorator.dart
diff --git a/modules/angular2/src/router/route_config/route_config_decorator.ts b/modules/@angular/router/src/route_config/route_config_decorator.ts
similarity index 100%
rename from modules/angular2/src/router/route_config/route_config_decorator.ts
rename to modules/@angular/router/src/route_config/route_config_decorator.ts
diff --git a/modules/angular2/src/router/route_config/route_config_impl.ts b/modules/@angular/router/src/route_config/route_config_impl.ts
similarity index 100%
rename from modules/angular2/src/router/route_config/route_config_impl.ts
rename to modules/@angular/router/src/route_config/route_config_impl.ts
diff --git a/modules/angular2/src/router/route_config/route_config_normalizer.dart b/modules/@angular/router/src/route_config/route_config_normalizer.dart
similarity index 100%
rename from modules/angular2/src/router/route_config/route_config_normalizer.dart
rename to modules/@angular/router/src/route_config/route_config_normalizer.dart
diff --git a/modules/angular2/src/router/route_config/route_config_normalizer.ts b/modules/@angular/router/src/route_config/route_config_normalizer.ts
similarity index 100%
rename from modules/angular2/src/router/route_config/route_config_normalizer.ts
rename to modules/@angular/router/src/route_config/route_config_normalizer.ts
diff --git a/modules/angular2/src/router/route_definition.dart b/modules/@angular/router/src/route_definition.dart
similarity index 100%
rename from modules/angular2/src/router/route_definition.dart
rename to modules/@angular/router/src/route_definition.dart
diff --git a/modules/angular2/src/router/route_definition.ts b/modules/@angular/router/src/route_definition.ts
similarity index 100%
rename from modules/angular2/src/router/route_definition.ts
rename to modules/@angular/router/src/route_definition.ts
diff --git a/modules/angular2/src/router/route_registry.ts b/modules/@angular/router/src/route_registry.ts
similarity index 100%
rename from modules/angular2/src/router/route_registry.ts
rename to modules/@angular/router/src/route_registry.ts
diff --git a/modules/angular2/src/router/router.ts b/modules/@angular/router/src/router.ts
similarity index 100%
rename from modules/angular2/src/router/router.ts
rename to modules/@angular/router/src/router.ts
diff --git a/modules/angular2/src/router/router_providers.ts b/modules/@angular/router/src/router_providers.ts
similarity index 100%
rename from modules/angular2/src/router/router_providers.ts
rename to modules/@angular/router/src/router_providers.ts
diff --git a/modules/angular2/src/router/router_providers_common.ts b/modules/@angular/router/src/router_providers_common.ts
similarity index 100%
rename from modules/angular2/src/router/router_providers_common.ts
rename to modules/@angular/router/src/router_providers_common.ts
diff --git a/modules/angular2/src/router/rules/route_handlers/async_route_handler.ts b/modules/@angular/router/src/rules/route_handlers/async_route_handler.ts
similarity index 100%
rename from modules/angular2/src/router/rules/route_handlers/async_route_handler.ts
rename to modules/@angular/router/src/rules/route_handlers/async_route_handler.ts
diff --git a/modules/angular2/src/router/rules/route_handlers/route_handler.ts b/modules/@angular/router/src/rules/route_handlers/route_handler.ts
similarity index 100%
rename from modules/angular2/src/router/rules/route_handlers/route_handler.ts
rename to modules/@angular/router/src/rules/route_handlers/route_handler.ts
diff --git a/modules/angular2/src/router/rules/route_handlers/sync_route_handler.ts b/modules/@angular/router/src/rules/route_handlers/sync_route_handler.ts
similarity index 100%
rename from modules/angular2/src/router/rules/route_handlers/sync_route_handler.ts
rename to modules/@angular/router/src/rules/route_handlers/sync_route_handler.ts
diff --git a/modules/angular2/src/router/rules/route_paths/param_route_path.ts b/modules/@angular/router/src/rules/route_paths/param_route_path.ts
similarity index 100%
rename from modules/angular2/src/router/rules/route_paths/param_route_path.ts
rename to modules/@angular/router/src/rules/route_paths/param_route_path.ts
diff --git a/modules/angular2/src/router/rules/route_paths/regex_route_path.ts b/modules/@angular/router/src/rules/route_paths/regex_route_path.ts
similarity index 100%
rename from modules/angular2/src/router/rules/route_paths/regex_route_path.ts
rename to modules/@angular/router/src/rules/route_paths/regex_route_path.ts
diff --git a/modules/angular2/src/router/rules/route_paths/route_path.ts b/modules/@angular/router/src/rules/route_paths/route_path.ts
similarity index 100%
rename from modules/angular2/src/router/rules/route_paths/route_path.ts
rename to modules/@angular/router/src/rules/route_paths/route_path.ts
diff --git a/modules/angular2/src/router/rules/rule_set.ts b/modules/@angular/router/src/rules/rule_set.ts
similarity index 100%
rename from modules/angular2/src/router/rules/rule_set.ts
rename to modules/@angular/router/src/rules/rule_set.ts
diff --git a/modules/angular2/src/router/rules/rules.ts b/modules/@angular/router/src/rules/rules.ts
similarity index 100%
rename from modules/angular2/src/router/rules/rules.ts
rename to modules/@angular/router/src/rules/rules.ts
diff --git a/modules/angular2/src/router/url_parser.ts b/modules/@angular/router/src/url_parser.ts
similarity index 100%
rename from modules/angular2/src/router/url_parser.ts
rename to modules/@angular/router/src/url_parser.ts
diff --git a/modules/angular2/src/router/utils.ts b/modules/@angular/router/src/utils.ts
similarity index 100%
rename from modules/angular2/src/router/utils.ts
rename to modules/@angular/router/src/utils.ts
diff --git a/modules/angular2/test/router/directives/router_link_spec.ts b/modules/@angular/router/test/directives/router_link_spec.ts
similarity index 100%
rename from modules/angular2/test/router/directives/router_link_spec.ts
rename to modules/@angular/router/test/directives/router_link_spec.ts
diff --git a/modules/angular2/test/router/directives/router_link_transform_spec.ts b/modules/@angular/router/test/directives/router_link_transform_spec.ts
similarity index 100%
rename from modules/angular2/test/router/directives/router_link_transform_spec.ts
rename to modules/@angular/router/test/directives/router_link_transform_spec.ts
diff --git a/modules/angular2/test/router/integration/README.md b/modules/@angular/router/test/integration/README.md
similarity index 100%
rename from modules/angular2/test/router/integration/README.md
rename to modules/@angular/router/test/integration/README.md
diff --git a/modules/angular2/test/router/integration/async_route_spec.ts b/modules/@angular/router/test/integration/async_route_spec.ts
similarity index 100%
rename from modules/angular2/test/router/integration/async_route_spec.ts
rename to modules/@angular/router/test/integration/async_route_spec.ts
diff --git a/modules/angular2/test/router/integration/auxiliary_route_spec.ts b/modules/@angular/router/test/integration/auxiliary_route_spec.ts
similarity index 100%
rename from modules/angular2/test/router/integration/auxiliary_route_spec.ts
rename to modules/@angular/router/test/integration/auxiliary_route_spec.ts
diff --git a/modules/angular2/test/router/integration/bootstrap_spec.ts b/modules/@angular/router/test/integration/bootstrap_spec.ts
similarity index 100%
rename from modules/angular2/test/router/integration/bootstrap_spec.ts
rename to modules/@angular/router/test/integration/bootstrap_spec.ts
diff --git a/modules/angular2/test/router/integration/impl/async_route_spec_impl.ts b/modules/@angular/router/test/integration/impl/async_route_spec_impl.ts
similarity index 100%
rename from modules/angular2/test/router/integration/impl/async_route_spec_impl.ts
rename to modules/@angular/router/test/integration/impl/async_route_spec_impl.ts
diff --git a/modules/angular2/test/router/integration/impl/aux_route_spec_impl.ts b/modules/@angular/router/test/integration/impl/aux_route_spec_impl.ts
similarity index 100%
rename from modules/angular2/test/router/integration/impl/aux_route_spec_impl.ts
rename to modules/@angular/router/test/integration/impl/aux_route_spec_impl.ts
diff --git a/modules/angular2/test/router/integration/impl/fixture_components.ts b/modules/@angular/router/test/integration/impl/fixture_components.ts
similarity index 100%
rename from modules/angular2/test/router/integration/impl/fixture_components.ts
rename to modules/@angular/router/test/integration/impl/fixture_components.ts
diff --git a/modules/angular2/test/router/integration/impl/sync_route_spec_impl.ts b/modules/@angular/router/test/integration/impl/sync_route_spec_impl.ts
similarity index 100%
rename from modules/angular2/test/router/integration/impl/sync_route_spec_impl.ts
rename to modules/@angular/router/test/integration/impl/sync_route_spec_impl.ts
diff --git a/modules/angular2/test/router/integration/lifecycle_hook_spec.ts b/modules/@angular/router/test/integration/lifecycle_hook_spec.ts
similarity index 100%
rename from modules/angular2/test/router/integration/lifecycle_hook_spec.ts
rename to modules/@angular/router/test/integration/lifecycle_hook_spec.ts
diff --git a/modules/angular2/test/router/integration/navigation_spec.ts b/modules/@angular/router/test/integration/navigation_spec.ts
similarity index 100%
rename from modules/angular2/test/router/integration/navigation_spec.ts
rename to modules/@angular/router/test/integration/navigation_spec.ts
diff --git a/modules/angular2/test/router/integration/redirect_route_spec.ts b/modules/@angular/router/test/integration/redirect_route_spec.ts
similarity index 100%
rename from modules/angular2/test/router/integration/redirect_route_spec.ts
rename to modules/@angular/router/test/integration/redirect_route_spec.ts
diff --git a/modules/angular2/test/router/integration/router_link_spec.ts b/modules/@angular/router/test/integration/router_link_spec.ts
similarity index 100%
rename from modules/angular2/test/router/integration/router_link_spec.ts
rename to modules/@angular/router/test/integration/router_link_spec.ts
diff --git a/modules/angular2/test/router/integration/sync_route_spec.ts b/modules/@angular/router/test/integration/sync_route_spec.ts
similarity index 100%
rename from modules/angular2/test/router/integration/sync_route_spec.ts
rename to modules/@angular/router/test/integration/sync_route_spec.ts
diff --git a/modules/angular2/test/router/integration/util.ts b/modules/@angular/router/test/integration/util.ts
similarity index 100%
rename from modules/angular2/test/router/integration/util.ts
rename to modules/@angular/router/test/integration/util.ts
diff --git a/modules/angular2/test/router/location/hash_location_strategy_spec.ts b/modules/@angular/router/test/location/hash_location_strategy_spec.ts
similarity index 100%
rename from modules/angular2/test/router/location/hash_location_strategy_spec.ts
rename to modules/@angular/router/test/location/hash_location_strategy_spec.ts
diff --git a/modules/angular2/test/router/location/location_spec.ts b/modules/@angular/router/test/location/location_spec.ts
similarity index 100%
rename from modules/angular2/test/router/location/location_spec.ts
rename to modules/@angular/router/test/location/location_spec.ts
diff --git a/modules/angular2/test/router/location/path_location_strategy_spec.ts b/modules/@angular/router/test/location/path_location_strategy_spec.ts
similarity index 100%
rename from modules/angular2/test/router/location/path_location_strategy_spec.ts
rename to modules/@angular/router/test/location/path_location_strategy_spec.ts
diff --git a/modules/angular2/test/router/route_config/route_config_spec.dart b/modules/@angular/router/test/route_config/route_config_spec.dart
similarity index 100%
rename from modules/angular2/test/router/route_config/route_config_spec.dart
rename to modules/@angular/router/test/route_config/route_config_spec.dart
diff --git a/modules/angular2/test/router/route_config/route_config_spec.ts b/modules/@angular/router/test/route_config/route_config_spec.ts
similarity index 100%
rename from modules/angular2/test/router/route_config/route_config_spec.ts
rename to modules/@angular/router/test/route_config/route_config_spec.ts
diff --git a/modules/angular2/test/router/route_registry_spec.ts b/modules/@angular/router/test/route_registry_spec.ts
similarity index 100%
rename from modules/angular2/test/router/route_registry_spec.ts
rename to modules/@angular/router/test/route_registry_spec.ts
diff --git a/modules/angular2/test/router/router_spec.ts b/modules/@angular/router/test/router_spec.ts
similarity index 100%
rename from modules/angular2/test/router/router_spec.ts
rename to modules/@angular/router/test/router_spec.ts
diff --git a/modules/angular2/test/router/rules/route_paths/param_route_path_spec.ts b/modules/@angular/router/test/rules/route_paths/param_route_path_spec.ts
similarity index 100%
rename from modules/angular2/test/router/rules/route_paths/param_route_path_spec.ts
rename to modules/@angular/router/test/rules/route_paths/param_route_path_spec.ts
diff --git a/modules/angular2/test/router/rules/route_paths/regex_route_param_spec.ts b/modules/@angular/router/test/rules/route_paths/regex_route_param_spec.ts
similarity index 100%
rename from modules/angular2/test/router/rules/route_paths/regex_route_param_spec.ts
rename to modules/@angular/router/test/rules/route_paths/regex_route_param_spec.ts
diff --git a/modules/angular2/test/router/rules/rule_set_spec.ts b/modules/@angular/router/test/rules/rule_set_spec.ts
similarity index 100%
rename from modules/angular2/test/router/rules/rule_set_spec.ts
rename to modules/@angular/router/test/rules/rule_set_spec.ts
diff --git a/modules/angular2/test/router/spies.dart b/modules/@angular/router/test/spies.dart
similarity index 100%
rename from modules/angular2/test/router/spies.dart
rename to modules/@angular/router/test/spies.dart
diff --git a/modules/angular2/test/router/spies.ts b/modules/@angular/router/test/spies.ts
similarity index 100%
rename from modules/angular2/test/router/spies.ts
rename to modules/@angular/router/test/spies.ts
diff --git a/modules/angular2/test/router/url_parser_spec.ts b/modules/@angular/router/test/url_parser_spec.ts
similarity index 100%
rename from modules/angular2/test/router/url_parser_spec.ts
rename to modules/@angular/router/test/url_parser_spec.ts
diff --git a/modules/angular2/router/testing.ts b/modules/@angular/router/testing.ts
similarity index 100%
rename from modules/angular2/router/testing.ts
rename to modules/@angular/router/testing.ts
diff --git a/modules/angular2/testing.ts b/modules/@angular/testing/testing.ts
similarity index 100%
rename from modules/angular2/testing.ts
rename to modules/@angular/testing/testing.ts
diff --git a/modules/angular2/testing_internal.ts b/modules/@angular/testing/testing_internal.ts
similarity index 100%
rename from modules/angular2/testing_internal.ts
rename to modules/@angular/testing/testing_internal.ts
diff --git a/modules/angular2/tsconfig.json b/modules/@angular/tsconfig.json
similarity index 100%
rename from modules/angular2/tsconfig.json
rename to modules/@angular/tsconfig.json
diff --git a/modules/angular2/tsd.json b/modules/@angular/tsd.json
similarity index 100%
rename from modules/angular2/tsd.json
rename to modules/@angular/tsd.json
diff --git a/modules/angular2/src/upgrade/angular_js.ts b/modules/@angular/upgrade/src/angular_js.ts
similarity index 100%
rename from modules/angular2/src/upgrade/angular_js.ts
rename to modules/@angular/upgrade/src/angular_js.ts
diff --git a/modules/angular2/src/upgrade/constants.ts b/modules/@angular/upgrade/src/constants.ts
similarity index 100%
rename from modules/angular2/src/upgrade/constants.ts
rename to modules/@angular/upgrade/src/constants.ts
diff --git a/modules/angular2/src/upgrade/downgrade_ng2_adapter.ts b/modules/@angular/upgrade/src/downgrade_ng2_adapter.ts
similarity index 100%
rename from modules/angular2/src/upgrade/downgrade_ng2_adapter.ts
rename to modules/@angular/upgrade/src/downgrade_ng2_adapter.ts
diff --git a/modules/angular2/src/upgrade/metadata.ts b/modules/@angular/upgrade/src/metadata.ts
similarity index 100%
rename from modules/angular2/src/upgrade/metadata.ts
rename to modules/@angular/upgrade/src/metadata.ts
diff --git a/modules/angular2/src/upgrade/upgrade_adapter.ts b/modules/@angular/upgrade/src/upgrade_adapter.ts
similarity index 100%
rename from modules/angular2/src/upgrade/upgrade_adapter.ts
rename to modules/@angular/upgrade/src/upgrade_adapter.ts
diff --git a/modules/angular2/src/upgrade/upgrade_ng1_adapter.ts b/modules/@angular/upgrade/src/upgrade_ng1_adapter.ts
similarity index 100%
rename from modules/angular2/src/upgrade/upgrade_ng1_adapter.ts
rename to modules/@angular/upgrade/src/upgrade_ng1_adapter.ts
diff --git a/modules/angular2/src/upgrade/util.ts b/modules/@angular/upgrade/src/util.ts
similarity index 100%
rename from modules/angular2/src/upgrade/util.ts
rename to modules/@angular/upgrade/src/util.ts
diff --git a/modules/angular2/test/upgrade/metadata_spec.ts b/modules/@angular/upgrade/test/metadata_spec.ts
similarity index 100%
rename from modules/angular2/test/upgrade/metadata_spec.ts
rename to modules/@angular/upgrade/test/metadata_spec.ts
diff --git a/modules/angular2/test/upgrade/upgrade_spec.ts b/modules/@angular/upgrade/test/upgrade_spec.ts
similarity index 100%
rename from modules/angular2/test/upgrade/upgrade_spec.ts
rename to modules/@angular/upgrade/test/upgrade_spec.ts
diff --git a/modules/angular2/upgrade.ts b/modules/@angular/upgrade/upgrade.ts
similarity index 100%
rename from modules/angular2/upgrade.ts
rename to modules/@angular/upgrade/upgrade.ts
diff --git a/modules/angular2/web_worker/ui.ts b/modules/@angular/web_worker/ui.ts
similarity index 100%
rename from modules/angular2/web_worker/ui.ts
rename to modules/@angular/web_worker/ui.ts
diff --git a/modules/angular2/web_worker/worker.ts b/modules/@angular/web_worker/worker.ts
similarity index 100%
rename from modules/angular2/web_worker/worker.ts
rename to modules/@angular/web_worker/worker.ts
diff --git a/modules/angular2/angular2.dart b/modules/angular2/angular2.dart
deleted file mode 100644
index d3bb1ab16d245..0000000000000
--- a/modules/angular2/angular2.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-library angular2;
-
-/**
- * An all-in-one place to import Angular 2 stuff.
- *
- * This library does not include `bootstrap`. Import `bootstrap.dart` instead.
- */
-export 'package:angular2/core.dart';
-export 'package:angular2/common.dart';
-export 'package:angular2/instrumentation.dart';
-export 'package:angular2/src/core/angular_entrypoint.dart' show AngularEntrypoint;
-export 'package:angular2/src/core/application_tokens.dart'
-    hide APP_ID_RANDOM_PROVIDER;
-export 'package:angular2/src/platform/dom/dom_tokens.dart';
-export 'package:angular2/src/platform/dom/dom_adapter.dart';
-export 'package:angular2/src/platform/dom/events/event_manager.dart';
-export 'package:angular2/src/compiler/compiler.dart' show UrlResolver, DirectiveResolver, ViewResolver;
-
diff --git a/modules/angular2/animate.ts b/modules/angular2/animate.ts
deleted file mode 100644
index 0fd63ccd03f2e..0000000000000
--- a/modules/angular2/animate.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export {Animation} from './src/animate/animation';
-export {AnimationBuilder} from './src/animate/animation_builder';
-export {BrowserDetails} from './src/animate/browser_details';
-export {CssAnimationBuilder} from './src/animate/css_animation_builder';
-export {CssAnimationOptions} from './src/animate/css_animation_options';
diff --git a/modules/angular2/animate/testing.ts b/modules/angular2/animate/testing.ts
deleted file mode 100644
index dfcefe3afac70..0000000000000
--- a/modules/angular2/animate/testing.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from 'angular2/src/mock/animation_builder_mock';
diff --git a/modules/angular2/common.ts b/modules/angular2/common.ts
deleted file mode 100644
index 23e730cf32f21..0000000000000
--- a/modules/angular2/common.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './src/common/pipes';
-export * from './src/common/directives';
-export * from './src/common/forms';
-export * from './src/common/common_directives';
diff --git a/modules/angular2/i18n.ts b/modules/angular2/i18n.ts
deleted file mode 100644
index a8f2239807348..0000000000000
--- a/modules/angular2/i18n.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @module
- * @description
- * Entry point to i18n
- */
-export * from './src/i18n/message';
-export * from './src/i18n/xmb_serializer';
-export * from './src/i18n/message_extractor';
-export * from './src/i18n/i18n_html_parser';
\ No newline at end of file
diff --git a/modules/angular2/instrumentation.ts b/modules/angular2/instrumentation.ts
deleted file mode 100644
index 67049babaf8e8..0000000000000
--- a/modules/angular2/instrumentation.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export {
-  wtfCreateScope,
-  wtfLeave,
-  wtfStartTimeRange,
-  wtfEndTimeRange,
-  WtfScopeFn
-} from './src/core/profile/profile';
diff --git a/modules/angular2/src/core/dom/browser_adapter.dart b/modules/angular2/src/core/dom/browser_adapter.dart
deleted file mode 100644
index ddd7f9cfd7d51..0000000000000
--- a/modules/angular2/src/core/dom/browser_adapter.dart
+++ /dev/null
@@ -1,4 +0,0 @@
-@Deprecated('import this library from "package:angular2/platform/browser_static.dart"')
-library angular2.browser_adapter_reexport;
-
-export 'package:angular2/src/platform/browser/browser_adapter.dart';
diff --git a/modules/angular2/src/core/dom/dom_adapter.dart b/modules/angular2/src/core/dom/dom_adapter.dart
deleted file mode 100644
index aae5d5b169781..0000000000000
--- a/modules/angular2/src/core/dom/dom_adapter.dart
+++ /dev/null
@@ -1,4 +0,0 @@
-@Deprecated('import this from "package:angular2/platform/common_dom.dart"')
-library angular2.dom_adapter_reexport;
-
-export 'package:angular2/src/platform/dom/dom_adapter.dart';
\ No newline at end of file