diff --git a/modules/angular2/src/compiler/change_definition_factory.ts b/modules/angular2/src/core/compiler/change_definition_factory.ts
similarity index 100%
rename from modules/angular2/src/compiler/change_definition_factory.ts
rename to modules/angular2/src/core/compiler/change_definition_factory.ts
diff --git a/modules/angular2/src/compiler/change_detector_compiler.ts b/modules/angular2/src/core/compiler/change_detector_compiler.ts
similarity index 100%
rename from modules/angular2/src/compiler/change_detector_compiler.ts
rename to modules/angular2/src/core/compiler/change_detector_compiler.ts
diff --git a/modules/angular2/src/compiler/command_compiler.ts b/modules/angular2/src/core/compiler/command_compiler.ts
similarity index 100%
rename from modules/angular2/src/compiler/command_compiler.ts
rename to modules/angular2/src/core/compiler/command_compiler.ts
diff --git a/modules/angular2/src/compiler/compiler.ts b/modules/angular2/src/core/compiler/compiler.ts
similarity index 100%
rename from modules/angular2/src/compiler/compiler.ts
rename to modules/angular2/src/core/compiler/compiler.ts
diff --git a/modules/angular2/src/compiler/directive_metadata.ts b/modules/angular2/src/core/compiler/directive_metadata.ts
similarity index 100%
rename from modules/angular2/src/compiler/directive_metadata.ts
rename to modules/angular2/src/core/compiler/directive_metadata.ts
diff --git a/modules/angular2/src/compiler/html_ast.ts b/modules/angular2/src/core/compiler/html_ast.ts
similarity index 100%
rename from modules/angular2/src/compiler/html_ast.ts
rename to modules/angular2/src/core/compiler/html_ast.ts
diff --git a/modules/angular2/src/compiler/html_parser.ts b/modules/angular2/src/core/compiler/html_parser.ts
similarity index 100%
rename from modules/angular2/src/compiler/html_parser.ts
rename to modules/angular2/src/core/compiler/html_parser.ts
diff --git a/modules/angular2/src/compiler/runtime_compiler.ts b/modules/angular2/src/core/compiler/runtime_compiler.ts
similarity index 100%
rename from modules/angular2/src/compiler/runtime_compiler.ts
rename to modules/angular2/src/core/compiler/runtime_compiler.ts
diff --git a/modules/angular2/src/compiler/runtime_metadata.ts b/modules/angular2/src/core/compiler/runtime_metadata.ts
similarity index 100%
rename from modules/angular2/src/compiler/runtime_metadata.ts
rename to modules/angular2/src/core/compiler/runtime_metadata.ts
diff --git a/modules/angular2/src/compiler/source_module.ts b/modules/angular2/src/core/compiler/source_module.ts
similarity index 100%
rename from modules/angular2/src/compiler/source_module.ts
rename to modules/angular2/src/core/compiler/source_module.ts
diff --git a/modules/angular2/src/compiler/style_compiler.ts b/modules/angular2/src/core/compiler/style_compiler.ts
similarity index 100%
rename from modules/angular2/src/compiler/style_compiler.ts
rename to modules/angular2/src/core/compiler/style_compiler.ts
diff --git a/modules/angular2/src/compiler/style_url_resolver.ts b/modules/angular2/src/core/compiler/style_url_resolver.ts
similarity index 100%
rename from modules/angular2/src/compiler/style_url_resolver.ts
rename to modules/angular2/src/core/compiler/style_url_resolver.ts
diff --git a/modules/angular2/src/compiler/template_ast.ts b/modules/angular2/src/core/compiler/template_ast.ts
similarity index 100%
rename from modules/angular2/src/compiler/template_ast.ts
rename to modules/angular2/src/core/compiler/template_ast.ts
diff --git a/modules/angular2/src/compiler/template_compiler.ts b/modules/angular2/src/core/compiler/template_compiler.ts
similarity index 100%
rename from modules/angular2/src/compiler/template_compiler.ts
rename to modules/angular2/src/core/compiler/template_compiler.ts
diff --git a/modules/angular2/src/compiler/template_normalizer.ts b/modules/angular2/src/core/compiler/template_normalizer.ts
similarity index 100%
rename from modules/angular2/src/compiler/template_normalizer.ts
rename to modules/angular2/src/core/compiler/template_normalizer.ts
diff --git a/modules/angular2/src/compiler/template_parser.ts b/modules/angular2/src/core/compiler/template_parser.ts
similarity index 100%
rename from modules/angular2/src/compiler/template_parser.ts
rename to modules/angular2/src/core/compiler/template_parser.ts
diff --git a/modules/angular2/src/compiler/template_preparser.ts b/modules/angular2/src/core/compiler/template_preparser.ts
similarity index 100%
rename from modules/angular2/src/compiler/template_preparser.ts
rename to modules/angular2/src/core/compiler/template_preparser.ts
diff --git a/modules/angular2/src/compiler/util.ts b/modules/angular2/src/core/compiler/util.ts
similarity index 100%
rename from modules/angular2/src/compiler/util.ts
rename to modules/angular2/src/core/compiler/util.ts
diff --git a/modules/angular2/test/compiler/change_definition_factory_spec.ts b/modules/angular2/test/core/compiler/change_definition_factory_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/change_definition_factory_spec.ts
rename to modules/angular2/test/core/compiler/change_definition_factory_spec.ts
diff --git a/modules/angular2/test/compiler/change_detector_compiler_spec.ts b/modules/angular2/test/core/compiler/change_detector_compiler_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/change_detector_compiler_spec.ts
rename to modules/angular2/test/core/compiler/change_detector_compiler_spec.ts
diff --git a/modules/angular2/test/compiler/change_detector_mocks.ts b/modules/angular2/test/core/compiler/change_detector_mocks.ts
similarity index 100%
rename from modules/angular2/test/compiler/change_detector_mocks.ts
rename to modules/angular2/test/core/compiler/change_detector_mocks.ts
diff --git a/modules/angular2/test/compiler/command_compiler_spec.ts b/modules/angular2/test/core/compiler/command_compiler_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/command_compiler_spec.ts
rename to modules/angular2/test/core/compiler/command_compiler_spec.ts
diff --git a/modules/angular2/test/compiler/directive_metadata_spec.ts b/modules/angular2/test/core/compiler/directive_metadata_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/directive_metadata_spec.ts
rename to modules/angular2/test/core/compiler/directive_metadata_spec.ts
diff --git a/modules/angular2/test/compiler/eval_module.dart b/modules/angular2/test/core/compiler/eval_module.dart
similarity index 100%
rename from modules/angular2/test/compiler/eval_module.dart
rename to modules/angular2/test/core/compiler/eval_module.dart
diff --git a/modules/angular2/test/compiler/eval_module.ts b/modules/angular2/test/core/compiler/eval_module.ts
similarity index 100%
rename from modules/angular2/test/compiler/eval_module.ts
rename to modules/angular2/test/core/compiler/eval_module.ts
diff --git a/modules/angular2/test/compiler/eval_module_spec.ts b/modules/angular2/test/core/compiler/eval_module_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/eval_module_spec.ts
rename to modules/angular2/test/core/compiler/eval_module_spec.ts
diff --git a/modules/angular2/test/compiler/html_parser_spec.ts b/modules/angular2/test/core/compiler/html_parser_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/html_parser_spec.ts
rename to modules/angular2/test/core/compiler/html_parser_spec.ts
diff --git a/modules/angular2/test/compiler/runtime_compiler_spec.ts b/modules/angular2/test/core/compiler/runtime_compiler_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/runtime_compiler_spec.ts
rename to modules/angular2/test/core/compiler/runtime_compiler_spec.ts
diff --git a/modules/angular2/test/compiler/runtime_metadata_spec.ts b/modules/angular2/test/core/compiler/runtime_metadata_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/runtime_metadata_spec.ts
rename to modules/angular2/test/core/compiler/runtime_metadata_spec.ts
diff --git a/modules/angular2/test/compiler/schema_registry_mock.ts b/modules/angular2/test/core/compiler/schema_registry_mock.ts
similarity index 100%
rename from modules/angular2/test/compiler/schema_registry_mock.ts
rename to modules/angular2/test/core/compiler/schema_registry_mock.ts
diff --git a/modules/angular2/test/compiler/source_module_spec.ts b/modules/angular2/test/core/compiler/source_module_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/source_module_spec.ts
rename to modules/angular2/test/core/compiler/source_module_spec.ts
diff --git a/modules/angular2/test/compiler/style_compiler_import.css.shim.ts b/modules/angular2/test/core/compiler/style_compiler_import.css.shim.ts
similarity index 100%
rename from modules/angular2/test/compiler/style_compiler_import.css.shim.ts
rename to modules/angular2/test/core/compiler/style_compiler_import.css.shim.ts
diff --git a/modules/angular2/test/compiler/style_compiler_import.css.ts b/modules/angular2/test/core/compiler/style_compiler_import.css.ts
similarity index 100%
rename from modules/angular2/test/compiler/style_compiler_import.css.ts
rename to modules/angular2/test/core/compiler/style_compiler_import.css.ts
diff --git a/modules/angular2/test/compiler/style_compiler_spec.ts b/modules/angular2/test/core/compiler/style_compiler_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/style_compiler_spec.ts
rename to modules/angular2/test/core/compiler/style_compiler_spec.ts
diff --git a/modules/angular2/test/compiler/style_url_resolver_spec.ts b/modules/angular2/test/core/compiler/style_url_resolver_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/style_url_resolver_spec.ts
rename to modules/angular2/test/core/compiler/style_url_resolver_spec.ts
diff --git a/modules/angular2/test/compiler/template_compiler_spec.ts b/modules/angular2/test/core/compiler/template_compiler_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/template_compiler_spec.ts
rename to modules/angular2/test/core/compiler/template_compiler_spec.ts
diff --git a/modules/angular2/test/compiler/template_normalizer_spec.ts b/modules/angular2/test/core/compiler/template_normalizer_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/template_normalizer_spec.ts
rename to modules/angular2/test/core/compiler/template_normalizer_spec.ts
diff --git a/modules/angular2/test/compiler/template_parser_spec.ts b/modules/angular2/test/core/compiler/template_parser_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/template_parser_spec.ts
rename to modules/angular2/test/core/compiler/template_parser_spec.ts
diff --git a/modules/angular2/test/compiler/template_preparser_spec.ts b/modules/angular2/test/core/compiler/template_preparser_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/template_preparser_spec.ts
rename to modules/angular2/test/core/compiler/template_preparser_spec.ts
diff --git a/modules/angular2/test/compiler/test_bindings.ts b/modules/angular2/test/core/compiler/test_bindings.ts
similarity index 100%
rename from modules/angular2/test/compiler/test_bindings.ts
rename to modules/angular2/test/core/compiler/test_bindings.ts
diff --git a/modules/angular2/test/compiler/util_spec.ts b/modules/angular2/test/core/compiler/util_spec.ts
similarity index 100%
rename from modules/angular2/test/compiler/util_spec.ts
rename to modules/angular2/test/core/compiler/util_spec.ts