diff --git a/modules/benchpress/README.dart.md b/modules/@angular/benchpress/README.dart.md
similarity index 100%
rename from modules/benchpress/README.dart.md
rename to modules/@angular/benchpress/README.dart.md
diff --git a/modules/benchpress/README.js.md b/modules/@angular/benchpress/README.js.md
similarity index 100%
rename from modules/benchpress/README.js.md
rename to modules/@angular/benchpress/README.js.md
diff --git a/modules/benchpress/benchpress.dart b/modules/@angular/benchpress/benchpress.dart
similarity index 100%
rename from modules/benchpress/benchpress.dart
rename to modules/@angular/benchpress/benchpress.dart
diff --git a/modules/benchpress/benchpress.ts b/modules/@angular/benchpress/benchpress.ts
similarity index 100%
rename from modules/benchpress/benchpress.ts
rename to modules/@angular/benchpress/benchpress.ts
diff --git a/modules/benchpress/common.ts b/modules/@angular/benchpress/common.ts
similarity index 100%
rename from modules/benchpress/common.ts
rename to modules/@angular/benchpress/common.ts
diff --git a/modules/benchpress/docs/index.md b/modules/@angular/benchpress/docs/index.md
similarity index 100%
rename from modules/benchpress/docs/index.md
rename to modules/@angular/benchpress/docs/index.md
diff --git a/modules/benchpress/docs/marked_timeline.png b/modules/@angular/benchpress/docs/marked_timeline.png
similarity index 100%
rename from modules/benchpress/docs/marked_timeline.png
rename to modules/@angular/benchpress/docs/marked_timeline.png
diff --git a/modules/benchpress/docs/overview.png b/modules/@angular/benchpress/docs/overview.png
similarity index 100%
rename from modules/benchpress/docs/overview.png
rename to modules/@angular/benchpress/docs/overview.png
diff --git a/modules/benchpress/index.dart b/modules/@angular/benchpress/index.dart
similarity index 100%
rename from modules/benchpress/index.dart
rename to modules/@angular/benchpress/index.dart
diff --git a/modules/benchpress/index.ts b/modules/@angular/benchpress/index.ts
similarity index 100%
rename from modules/benchpress/index.ts
rename to modules/@angular/benchpress/index.ts
diff --git a/modules/benchpress/package.json b/modules/@angular/benchpress/package.json
similarity index 100%
rename from modules/benchpress/package.json
rename to modules/@angular/benchpress/package.json
diff --git a/modules/benchpress/pubspec.yaml b/modules/@angular/benchpress/pubspec.yaml
similarity index 100%
rename from modules/benchpress/pubspec.yaml
rename to modules/@angular/benchpress/pubspec.yaml
diff --git a/modules/benchpress/src/common_options.ts b/modules/@angular/benchpress/src/common_options.ts
similarity index 100%
rename from modules/benchpress/src/common_options.ts
rename to modules/@angular/benchpress/src/common_options.ts
diff --git a/modules/benchpress/src/firefox_extension/.gitignore b/modules/@angular/benchpress/src/firefox_extension/.gitignore
similarity index 100%
rename from modules/benchpress/src/firefox_extension/.gitignore
rename to modules/@angular/benchpress/src/firefox_extension/.gitignore
diff --git a/modules/benchpress/src/firefox_extension/data/installed_script.dart b/modules/@angular/benchpress/src/firefox_extension/data/installed_script.dart
similarity index 100%
rename from modules/benchpress/src/firefox_extension/data/installed_script.dart
rename to modules/@angular/benchpress/src/firefox_extension/data/installed_script.dart
diff --git a/modules/benchpress/src/firefox_extension/data/installed_script.ts b/modules/@angular/benchpress/src/firefox_extension/data/installed_script.ts
similarity index 100%
rename from modules/benchpress/src/firefox_extension/data/installed_script.ts
rename to modules/@angular/benchpress/src/firefox_extension/data/installed_script.ts
diff --git a/modules/benchpress/src/firefox_extension/lib/main.dart b/modules/@angular/benchpress/src/firefox_extension/lib/main.dart
similarity index 100%
rename from modules/benchpress/src/firefox_extension/lib/main.dart
rename to modules/@angular/benchpress/src/firefox_extension/lib/main.dart
diff --git a/modules/benchpress/src/firefox_extension/lib/main.ts b/modules/@angular/benchpress/src/firefox_extension/lib/main.ts
similarity index 100%
rename from modules/benchpress/src/firefox_extension/lib/main.ts
rename to modules/@angular/benchpress/src/firefox_extension/lib/main.ts
diff --git a/modules/benchpress/src/firefox_extension/lib/parser_util.dart b/modules/@angular/benchpress/src/firefox_extension/lib/parser_util.dart
similarity index 100%
rename from modules/benchpress/src/firefox_extension/lib/parser_util.dart
rename to modules/@angular/benchpress/src/firefox_extension/lib/parser_util.dart
diff --git a/modules/benchpress/src/firefox_extension/lib/parser_util.ts b/modules/@angular/benchpress/src/firefox_extension/lib/parser_util.ts
similarity index 100%
rename from modules/benchpress/src/firefox_extension/lib/parser_util.ts
rename to modules/@angular/benchpress/src/firefox_extension/lib/parser_util.ts
diff --git a/modules/benchpress/src/firefox_extension/lib/test_helper.dart b/modules/@angular/benchpress/src/firefox_extension/lib/test_helper.dart
similarity index 100%
rename from modules/benchpress/src/firefox_extension/lib/test_helper.dart
rename to modules/@angular/benchpress/src/firefox_extension/lib/test_helper.dart
diff --git a/modules/benchpress/src/firefox_extension/lib/test_helper.ts b/modules/@angular/benchpress/src/firefox_extension/lib/test_helper.ts
similarity index 100%
rename from modules/benchpress/src/firefox_extension/lib/test_helper.ts
rename to modules/@angular/benchpress/src/firefox_extension/lib/test_helper.ts
diff --git a/modules/benchpress/src/firefox_extension/package.json b/modules/@angular/benchpress/src/firefox_extension/package.json
similarity index 100%
rename from modules/benchpress/src/firefox_extension/package.json
rename to modules/@angular/benchpress/src/firefox_extension/package.json
diff --git a/modules/benchpress/src/measure_values.ts b/modules/@angular/benchpress/src/measure_values.ts
similarity index 100%
rename from modules/benchpress/src/measure_values.ts
rename to modules/@angular/benchpress/src/measure_values.ts
diff --git a/modules/benchpress/src/metric.ts b/modules/@angular/benchpress/src/metric.ts
similarity index 100%
rename from modules/benchpress/src/metric.ts
rename to modules/@angular/benchpress/src/metric.ts
diff --git a/modules/benchpress/src/metric/multi_metric.ts b/modules/@angular/benchpress/src/metric/multi_metric.ts
similarity index 100%
rename from modules/benchpress/src/metric/multi_metric.ts
rename to modules/@angular/benchpress/src/metric/multi_metric.ts
diff --git a/modules/benchpress/src/metric/perflog_metric.ts b/modules/@angular/benchpress/src/metric/perflog_metric.ts
similarity index 100%
rename from modules/benchpress/src/metric/perflog_metric.ts
rename to modules/@angular/benchpress/src/metric/perflog_metric.ts
diff --git a/modules/benchpress/src/metric/user_metric.ts b/modules/@angular/benchpress/src/metric/user_metric.ts
similarity index 100%
rename from modules/benchpress/src/metric/user_metric.ts
rename to modules/@angular/benchpress/src/metric/user_metric.ts
diff --git a/modules/benchpress/src/reporter.ts b/modules/@angular/benchpress/src/reporter.ts
similarity index 100%
rename from modules/benchpress/src/reporter.ts
rename to modules/@angular/benchpress/src/reporter.ts
diff --git a/modules/benchpress/src/reporter/console_reporter.ts b/modules/@angular/benchpress/src/reporter/console_reporter.ts
similarity index 100%
rename from modules/benchpress/src/reporter/console_reporter.ts
rename to modules/@angular/benchpress/src/reporter/console_reporter.ts
diff --git a/modules/benchpress/src/reporter/json_file_reporter.ts b/modules/@angular/benchpress/src/reporter/json_file_reporter.ts
similarity index 100%
rename from modules/benchpress/src/reporter/json_file_reporter.ts
rename to modules/@angular/benchpress/src/reporter/json_file_reporter.ts
diff --git a/modules/benchpress/src/reporter/multi_reporter.ts b/modules/@angular/benchpress/src/reporter/multi_reporter.ts
similarity index 100%
rename from modules/benchpress/src/reporter/multi_reporter.ts
rename to modules/@angular/benchpress/src/reporter/multi_reporter.ts
diff --git a/modules/benchpress/src/runner.ts b/modules/@angular/benchpress/src/runner.ts
similarity index 100%
rename from modules/benchpress/src/runner.ts
rename to modules/@angular/benchpress/src/runner.ts
diff --git a/modules/benchpress/src/sample_description.ts b/modules/@angular/benchpress/src/sample_description.ts
similarity index 100%
rename from modules/benchpress/src/sample_description.ts
rename to modules/@angular/benchpress/src/sample_description.ts
diff --git a/modules/benchpress/src/sampler.ts b/modules/@angular/benchpress/src/sampler.ts
similarity index 100%
rename from modules/benchpress/src/sampler.ts
rename to modules/@angular/benchpress/src/sampler.ts
diff --git a/modules/benchpress/src/statistic.ts b/modules/@angular/benchpress/src/statistic.ts
similarity index 100%
rename from modules/benchpress/src/statistic.ts
rename to modules/@angular/benchpress/src/statistic.ts
diff --git a/modules/benchpress/src/validator.ts b/modules/@angular/benchpress/src/validator.ts
similarity index 100%
rename from modules/benchpress/src/validator.ts
rename to modules/@angular/benchpress/src/validator.ts
diff --git a/modules/benchpress/src/validator/regression_slope_validator.ts b/modules/@angular/benchpress/src/validator/regression_slope_validator.ts
similarity index 100%
rename from modules/benchpress/src/validator/regression_slope_validator.ts
rename to modules/@angular/benchpress/src/validator/regression_slope_validator.ts
diff --git a/modules/benchpress/src/validator/size_validator.ts b/modules/@angular/benchpress/src/validator/size_validator.ts
similarity index 100%
rename from modules/benchpress/src/validator/size_validator.ts
rename to modules/@angular/benchpress/src/validator/size_validator.ts
diff --git a/modules/benchpress/src/web_driver_adapter.ts b/modules/@angular/benchpress/src/web_driver_adapter.ts
similarity index 100%
rename from modules/benchpress/src/web_driver_adapter.ts
rename to modules/@angular/benchpress/src/web_driver_adapter.ts
diff --git a/modules/benchpress/src/web_driver_extension.ts b/modules/@angular/benchpress/src/web_driver_extension.ts
similarity index 100%
rename from modules/benchpress/src/web_driver_extension.ts
rename to modules/@angular/benchpress/src/web_driver_extension.ts
diff --git a/modules/benchpress/src/webdriver/async_webdriver_adapter.dart b/modules/@angular/benchpress/src/webdriver/async_webdriver_adapter.dart
similarity index 100%
rename from modules/benchpress/src/webdriver/async_webdriver_adapter.dart
rename to modules/@angular/benchpress/src/webdriver/async_webdriver_adapter.dart
diff --git a/modules/benchpress/src/webdriver/chrome_driver_extension.ts b/modules/@angular/benchpress/src/webdriver/chrome_driver_extension.ts
similarity index 100%
rename from modules/benchpress/src/webdriver/chrome_driver_extension.ts
rename to modules/@angular/benchpress/src/webdriver/chrome_driver_extension.ts
diff --git a/modules/benchpress/src/webdriver/firefox_driver_extension.ts b/modules/@angular/benchpress/src/webdriver/firefox_driver_extension.ts
similarity index 100%
rename from modules/benchpress/src/webdriver/firefox_driver_extension.ts
rename to modules/@angular/benchpress/src/webdriver/firefox_driver_extension.ts
diff --git a/modules/benchpress/src/webdriver/ios_driver_extension.ts b/modules/@angular/benchpress/src/webdriver/ios_driver_extension.ts
similarity index 100%
rename from modules/benchpress/src/webdriver/ios_driver_extension.ts
rename to modules/@angular/benchpress/src/webdriver/ios_driver_extension.ts
diff --git a/modules/benchpress/src/webdriver/selenium_webdriver_adapter.dart b/modules/@angular/benchpress/src/webdriver/selenium_webdriver_adapter.dart
similarity index 100%
rename from modules/benchpress/src/webdriver/selenium_webdriver_adapter.dart
rename to modules/@angular/benchpress/src/webdriver/selenium_webdriver_adapter.dart
diff --git a/modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts b/modules/@angular/benchpress/src/webdriver/selenium_webdriver_adapter.ts
similarity index 100%
rename from modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts
rename to modules/@angular/benchpress/src/webdriver/selenium_webdriver_adapter.ts
diff --git a/modules/benchpress/test/firefox_extension/conf.dart b/modules/@angular/benchpress/test/firefox_extension/conf.dart
similarity index 100%
rename from modules/benchpress/test/firefox_extension/conf.dart
rename to modules/@angular/benchpress/test/firefox_extension/conf.dart
diff --git a/modules/benchpress/test/firefox_extension/conf.ts b/modules/@angular/benchpress/test/firefox_extension/conf.ts
similarity index 100%
rename from modules/benchpress/test/firefox_extension/conf.ts
rename to modules/@angular/benchpress/test/firefox_extension/conf.ts
diff --git a/modules/benchpress/test/firefox_extension/parser_util_spec.dart b/modules/@angular/benchpress/test/firefox_extension/parser_util_spec.dart
similarity index 100%
rename from modules/benchpress/test/firefox_extension/parser_util_spec.dart
rename to modules/@angular/benchpress/test/firefox_extension/parser_util_spec.dart
diff --git a/modules/benchpress/test/firefox_extension/parser_util_spec.ts b/modules/@angular/benchpress/test/firefox_extension/parser_util_spec.ts
similarity index 100%
rename from modules/benchpress/test/firefox_extension/parser_util_spec.ts
rename to modules/@angular/benchpress/test/firefox_extension/parser_util_spec.ts
diff --git a/modules/benchpress/test/firefox_extension/sample_benchmark.dart b/modules/@angular/benchpress/test/firefox_extension/sample_benchmark.dart
similarity index 100%
rename from modules/benchpress/test/firefox_extension/sample_benchmark.dart
rename to modules/@angular/benchpress/test/firefox_extension/sample_benchmark.dart
diff --git a/modules/benchpress/test/firefox_extension/sample_benchmark.ts b/modules/@angular/benchpress/test/firefox_extension/sample_benchmark.ts
similarity index 100%
rename from modules/benchpress/test/firefox_extension/sample_benchmark.ts
rename to modules/@angular/benchpress/test/firefox_extension/sample_benchmark.ts
diff --git a/modules/benchpress/test/firefox_extension/spec.dart b/modules/@angular/benchpress/test/firefox_extension/spec.dart
similarity index 100%
rename from modules/benchpress/test/firefox_extension/spec.dart
rename to modules/@angular/benchpress/test/firefox_extension/spec.dart
diff --git a/modules/benchpress/test/firefox_extension/spec.ts b/modules/@angular/benchpress/test/firefox_extension/spec.ts
similarity index 100%
rename from modules/benchpress/test/firefox_extension/spec.ts
rename to modules/@angular/benchpress/test/firefox_extension/spec.ts
diff --git a/modules/benchpress/test/metric/multi_metric_spec.ts b/modules/@angular/benchpress/test/metric/multi_metric_spec.ts
similarity index 100%
rename from modules/benchpress/test/metric/multi_metric_spec.ts
rename to modules/@angular/benchpress/test/metric/multi_metric_spec.ts
diff --git a/modules/benchpress/test/metric/perflog_metric_spec.ts b/modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
similarity index 100%
rename from modules/benchpress/test/metric/perflog_metric_spec.ts
rename to modules/@angular/benchpress/test/metric/perflog_metric_spec.ts
diff --git a/modules/benchpress/test/metric/user_metric_spec.ts b/modules/@angular/benchpress/test/metric/user_metric_spec.ts
similarity index 100%
rename from modules/benchpress/test/metric/user_metric_spec.ts
rename to modules/@angular/benchpress/test/metric/user_metric_spec.ts
diff --git a/modules/benchpress/test/reporter/console_reporter_spec.ts b/modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
similarity index 100%
rename from modules/benchpress/test/reporter/console_reporter_spec.ts
rename to modules/@angular/benchpress/test/reporter/console_reporter_spec.ts
diff --git a/modules/benchpress/test/reporter/json_file_reporter_spec.ts b/modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts
similarity index 100%
rename from modules/benchpress/test/reporter/json_file_reporter_spec.ts
rename to modules/@angular/benchpress/test/reporter/json_file_reporter_spec.ts
diff --git a/modules/benchpress/test/reporter/multi_reporter_spec.ts b/modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
similarity index 100%
rename from modules/benchpress/test/reporter/multi_reporter_spec.ts
rename to modules/@angular/benchpress/test/reporter/multi_reporter_spec.ts
diff --git a/modules/benchpress/test/runner_spec.ts b/modules/@angular/benchpress/test/runner_spec.ts
similarity index 100%
rename from modules/benchpress/test/runner_spec.ts
rename to modules/@angular/benchpress/test/runner_spec.ts
diff --git a/modules/benchpress/test/sampler_spec.ts b/modules/@angular/benchpress/test/sampler_spec.ts
similarity index 100%
rename from modules/benchpress/test/sampler_spec.ts
rename to modules/@angular/benchpress/test/sampler_spec.ts
diff --git a/modules/benchpress/test/statistic_spec.ts b/modules/@angular/benchpress/test/statistic_spec.ts
similarity index 100%
rename from modules/benchpress/test/statistic_spec.ts
rename to modules/@angular/benchpress/test/statistic_spec.ts
diff --git a/modules/benchpress/test/trace_event_factory.ts b/modules/@angular/benchpress/test/trace_event_factory.ts
similarity index 100%
rename from modules/benchpress/test/trace_event_factory.ts
rename to modules/@angular/benchpress/test/trace_event_factory.ts
diff --git a/modules/benchpress/test/validator/regression_slope_validator_spec.ts b/modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
similarity index 100%
rename from modules/benchpress/test/validator/regression_slope_validator_spec.ts
rename to modules/@angular/benchpress/test/validator/regression_slope_validator_spec.ts
diff --git a/modules/benchpress/test/validator/size_validator_spec.ts b/modules/@angular/benchpress/test/validator/size_validator_spec.ts
similarity index 100%
rename from modules/benchpress/test/validator/size_validator_spec.ts
rename to modules/@angular/benchpress/test/validator/size_validator_spec.ts
diff --git a/modules/benchpress/test/web_driver_extension_spec.ts b/modules/@angular/benchpress/test/web_driver_extension_spec.ts
similarity index 100%
rename from modules/benchpress/test/web_driver_extension_spec.ts
rename to modules/@angular/benchpress/test/web_driver_extension_spec.ts
diff --git a/modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts b/modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
similarity index 100%
rename from modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts
rename to modules/@angular/benchpress/test/webdriver/chrome_driver_extension_spec.ts
diff --git a/modules/benchpress/test/webdriver/ios_driver_extension_spec.ts b/modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts
similarity index 100%
rename from modules/benchpress/test/webdriver/ios_driver_extension_spec.ts
rename to modules/@angular/benchpress/test/webdriver/ios_driver_extension_spec.ts
diff --git a/modules/benchpress/tsconfig.json b/modules/@angular/benchpress/tsconfig.json
similarity index 100%
rename from modules/benchpress/tsconfig.json
rename to modules/@angular/benchpress/tsconfig.json
diff --git a/modules/benchpress/types.d.ts b/modules/@angular/benchpress/types.d.ts
similarity index 100%
rename from modules/benchpress/types.d.ts
rename to modules/@angular/benchpress/types.d.ts