diff --git a/packages/animations/browser/.babelrc-browser b/packages/animations/browser/.babelrc-browser
new file mode 100644
index 0000000000..946b2f1b3f
--- /dev/null
+++ b/packages/animations/browser/.babelrc-browser
@@ -0,0 +1,9 @@
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/animations/browser"
+}
diff --git a/packages/animations/browser/.babelrc-browser-testing b/packages/animations/browser/.babelrc-browser-testing
new file mode 100644
index 0000000000..f565cc5642
--- /dev/null
+++ b/packages/animations/browser/.babelrc-browser-testing
@@ -0,0 +1,11 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/animations": "ng.animations"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/animations/browser/testing"
+}
diff --git a/packages/animations/browser/package.json b/packages/animations/browser/package.json
deleted file mode 100644
index 584c245aef..0000000000
--- a/packages/animations/browser/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "typings": "../typings/browser/index.d.ts",
-  "main": "../bundles/animation-browser.umd.js",
-  "module": "../@angular/animations/browser.es5.js",
-  "es2015": "../@angular/animations/browser.js"
-}
diff --git a/packages/animations/browser/rollup.config.js b/packages/animations/browser/rollup.config.js
deleted file mode 100644
index 96ab02a275..0000000000
--- a/packages/animations/browser/rollup.config.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/animations/@angular/animations/browser.es5.js',
-  dest: '../../../dist/packages-dist/animations/bundles/animations-browser.umd.js',
-  format: 'umd',
-  moduleName: 'ng.animations.browser',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    '@angular/animations': 'ng.animations'
-  }
-};
diff --git a/packages/animations/browser/test/engine/dom_animation_engine_spec.ts b/packages/animations/browser/test/engine/dom_animation_engine_spec.ts
index 365eaa02f5..3829b10113 100644
--- a/packages/animations/browser/test/engine/dom_animation_engine_spec.ts
+++ b/packages/animations/browser/test/engine/dom_animation_engine_spec.ts
@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {AnimationEvent, NoopAnimationPlayer, animate, keyframes, state, style, transition, trigger} from '@angular/animations';
-import {el} from '@angular/platform-browser/testing/src/browser_util';
+import {el} from '@angular/platform-browser/testing/browser_util';
 
 import {buildAnimationKeyframes} from '../../src/dsl/animation_timeline_visitor';
 import {buildTrigger} from '../../src/dsl/animation_trigger';
 import {AnimationStyleNormalizer, NoopAnimationStyleNormalizer} from '../../src/dsl/style_normalization/animation_style_normalizer';
 import {DomAnimationEngine} from '../../src/render/dom_animation_engine';
-import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_animation_driver';
+import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/mock_animation_driver';
 
 function makeTrigger(name: string, steps: any) {
   const triggerData = trigger(name, steps);
diff --git a/packages/animations/browser/testing/rollup.config.js b/packages/animations/browser/testing/rollup.config.js
index bde5281dad..0ee8058d39 100644
--- a/packages/animations/browser/testing/rollup.config.js
+++ b/packages/animations/browser/testing/rollup.config.js
@@ -7,13 +7,15 @@
  */
 
 export default {
-  entry: '../../../../dist/packages-dist/animations/@angular/animations/browser/testing.es5.js',
-  dest: '../../../../dist/packages-dist/animations/bundles/animations-browser-testing.umd.js',
+  entry:
+      '../../../../dist/packages-dist/platform-browser/@angular/platform-browser/animations/testing.es5.js',
+  dest:
+      '../../../../dist/packages-dist/platform-browser/bundles/platform-browser-animations-testing.umd.js',
   format: 'umd',
-  moduleName: 'ng.animations.browser.testing',
+  moduleName: 'ng.platformBrowser.testing',
   globals: {
     '@angular/core': 'ng.core',
     '@angular/common': 'ng.common',
-    '@angular/animations': 'ng.animations'
+    '@angular/platform-browser': 'ng.platformBrowser'
   }
 };
diff --git a/packages/animations/browser/testing/src/mock_animation_driver.ts b/packages/animations/browser/testing/src/mock_animation_driver.ts
index b349ef45b9..cec7c66476 100644
--- a/packages/animations/browser/testing/src/mock_animation_driver.ts
+++ b/packages/animations/browser/testing/src/mock_animation_driver.ts
@@ -7,7 +7,7 @@
  */
 import {AUTO_STYLE, AnimationPlayer, NoopAnimationPlayer, ɵStyleData} from '@angular/animations';
 
-import {AnimationDriver} from '../../src/render/animation_driver';
+import {AnimationDriver} from '../src/render/animation_driver';
 
 /**
  * @experimental Animation support is experimental.
diff --git a/packages/animations/browser/testing/tsconfig-build.json b/packages/animations/browser/testing/tsconfig-build.json
index fea449e67c..ab1a41f1e0 100644
--- a/packages/animations/browser/testing/tsconfig-build.json
+++ b/packages/animations/browser/testing/tsconfig-build.json
@@ -1,15 +1,16 @@
 {
-  "extends": "../../tsconfig-build",
+  "extends": "./tsconfig-build",
   "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/animations",
     "paths": {
-      "@angular/animations": ["../../dist/packages/animations"]
+      "@angular/animations": ["../../../dist/packages-dist/animations"]
     }
   },
   "files": [
-    "index.ts",
-    "../../../../node_modules/@types/hammerjs/index.d.ts",
-    "../../../../node_modules/@types/jasmine/index.d.ts",
-    "../../../../node_modules/zone.js/dist/zone.js.d.ts"
+    "browser/testing/index.ts",
+    "../../../node_modules/@types/hammerjs/index.d.ts",
+    "../../../node_modules/@types/jasmine/index.d.ts",
+    "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
     "strictMetadataEmit": true
diff --git a/packages/animations/browser/tsconfig-build.json b/packages/animations/browser/tsconfig-build.json
index 769bd13ed6..50880dfb4d 100644
--- a/packages/animations/browser/tsconfig-build.json
+++ b/packages/animations/browser/tsconfig-build.json
@@ -1,13 +1,14 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "./tsconfig-build",
 
   "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/animations",
     "paths": {
-      "@angular/animations": ["../../dist/packages/animations"]
+      "@angular/animations": ["../../../dist/packages-dist/animations"]
     }
   },
   "files": [
-    "public_api.ts",
+    "browser/public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts",
     "../../system.d.ts"
   ],
diff --git a/packages/animations/tsconfig-build.json b/packages/animations/tsconfig-build.json
index 48195a320d..44329d1c9d 100644
--- a/packages/animations/tsconfig-build.json
+++ b/packages/animations/tsconfig-build.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "module": "es2015",
     "moduleResolution": "node",
-    "outDir": "../../dist/packages/animations",
+    "outDir": "../../../dist/packages-dist/animations",
     "paths": {
     },
     "rootDir": ".",
@@ -20,8 +20,8 @@
   },
   "files": [
     "public_api.ts",
-    "../../node_modules/zone.js/dist/zone.js.d.ts",
-    "../system.d.ts"
+    "../../../node_modules/zone.js/dist/zone.js.d.ts",
+    "../../system.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/packages/platform-browser/animations/src/module.ts b/packages/platform-browser/animations/src/module.ts
index e374c716ff..effd444d2f 100644
--- a/packages/platform-browser/animations/src/module.ts
+++ b/packages/platform-browser/animations/src/module.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {NgModule} from '@angular/core';
-import {BrowserModule} from '../../src/browser';
+import {BrowserModule} from '@angular/platform-browser';
 
 import {BROWSER_ANIMATIONS_PROVIDERS, BROWSER_NOOP_ANIMATIONS_PROVIDERS} from './providers';
 
diff --git a/packages/platform-browser/animations/src/providers.ts b/packages/platform-browser/animations/src/providers.ts
index 1b6833cbf7..a0a8902b52 100644
--- a/packages/platform-browser/animations/src/providers.ts
+++ b/packages/platform-browser/animations/src/providers.ts
@@ -8,7 +8,7 @@
 
 import {AnimationDriver, ɵAnimationEngine as AnimationEngine, ɵAnimationStyleNormalizer as AnimationStyleNormalizer, ɵDomAnimationEngine as DomAnimationEngine, ɵNoopAnimationDriver as NoopAnimationDriver, ɵNoopAnimationEngine as NoopAnimationEngine, ɵWebAnimationsDriver as WebAnimationsDriver, ɵWebAnimationsStyleNormalizer as WebAnimationsStyleNormalizer, ɵsupportsWebAnimations as supportsWebAnimations} from '@angular/animations/browser';
 import {Injectable, NgZone, Provider, RendererFactory2} from '@angular/core';
-import {DomRendererFactory2} from '../../src/dom/dom_renderer';
+import {ɵDomRendererFactory2} from '@angular/platform-browser';
 
 import {AnimationRendererFactory} from './animation_renderer';
 
@@ -31,7 +31,7 @@ export function instantiateDefaultStyleNormalizer() {
 }
 
 export function instantiateRendererFactory(
-    renderer: DomRendererFactory2, engine: AnimationEngine, zone: NgZone) {
+    renderer: ɵDomRendererFactory2, engine: AnimationEngine, zone: NgZone) {
   return new AnimationRendererFactory(renderer, engine, zone);
 }
 
@@ -45,7 +45,7 @@ export const BROWSER_ANIMATIONS_PROVIDERS: Provider[] = [
   {provide: AnimationEngine, useClass: InjectableAnimationEngine}, {
     provide: RendererFactory2,
     useFactory: instantiateRendererFactory,
-    deps: [DomRendererFactory2, AnimationEngine, NgZone]
+    deps: [ɵDomRendererFactory2, AnimationEngine, NgZone]
   }
 ];
 
@@ -57,6 +57,6 @@ export const BROWSER_NOOP_ANIMATIONS_PROVIDERS: Provider[] = [
   {provide: AnimationEngine, useClass: NoopAnimationEngine}, {
     provide: RendererFactory2,
     useFactory: instantiateRendererFactory,
-    deps: [DomRendererFactory2, AnimationEngine, NgZone]
+    deps: [ɵDomRendererFactory2, AnimationEngine, NgZone]
   }
 ];
diff --git a/packages/platform-browser/animations/test/noop_animation_engine_spec.ts b/packages/platform-browser/animations/test/noop_animation_engine_spec.ts
index ef36ba1211..11c364f8cf 100644
--- a/packages/platform-browser/animations/test/noop_animation_engine_spec.ts
+++ b/packages/platform-browser/animations/test/noop_animation_engine_spec.ts
@@ -7,7 +7,7 @@
  */
 import {state, style, trigger} from '@angular/animations';
 import {ɵNoopAnimationEngine as NoopAnimationEngine} from '@angular/animations/browser';
-import {el} from '@angular/platform-browser/testing/src/browser_util';
+import {el} from '@angular/platform-browser/testing/browser_util';
 
 export function main() {
   describe('NoopAnimationEngine', () => {
diff --git a/packages/platform-browser/animations/tsconfig-build.json b/packages/platform-browser/animations/tsconfig-build.json
index b73d97145d..b1ae369a3f 100644
--- a/packages/platform-browser/animations/tsconfig-build.json
+++ b/packages/platform-browser/animations/tsconfig-build.json
@@ -1,18 +1,19 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "./tsconfig-build",
 
   "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/platform-browser",
     "paths": {
-      "rxjs/*": ["../../node_modules/rxjs/*"],
-      "@angular/core": ["../../dist/packages/core"],
-      "@angular/core/testing": ["../../dist/packages/core/testing"],
-      "@angular/animations": ["../../dist/packages/animations"],
-      "@angular/animations/browser": ["../../dist/packages/animations/browser"],
-      "@angular/platform-browser": ["../../dist/packages/platform-browser"]
+      "rxjs/*": ["../../../node_modules/rxjs/*"],
+      "@angular/core": ["../../../dist/packages-dist/core"],
+      "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
+      "@angular/animations": ["../../../dist/packages-dist/animations"],
+      "@angular/animations/browser": ["../../../dist/packages-dist/animations/browser"],
+      "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"]
     }
   },
   "files": [
-    "public_api.ts",
+    "animations/public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts",
     "../../system.d.ts"
   ],
diff --git a/tools/gulp-tasks/public-api.js b/tools/gulp-tasks/public-api.js
index be79b22c47..33ffa5bfe5 100644
--- a/tools/gulp-tasks/public-api.js
+++ b/tools/gulp-tasks/public-api.js
@@ -7,7 +7,7 @@ const entrypoints = [
   //'dist/packages-dist/compiler/index.d.ts',
   //'dist/packages-dist/compiler/testing.d.ts',
   'dist/packages-dist/upgrade/typings/upgrade.d.ts',
-  'dist/packages-dist/upgrade/typings/static/index.d.ts',
+  'dist/packages-dist/upgrade/typings/static/static.d.ts',
   'dist/packages-dist/platform-browser/typings/platform-browser.d.ts',
   'dist/packages-dist/platform-browser/typings/testing/index.d.ts',
   'dist/packages-dist/platform-browser-dynamic/typings/platform-browser-dynamic.d.ts',
@@ -19,9 +19,9 @@ const entrypoints = [
   'dist/packages-dist/http/typings/http.d.ts', 'dist/packages-dist/http/typings/testing/index.d.ts',
   'dist/packages-dist/forms/typings/forms.d.ts', 'dist/packages-dist/router/typings/router.d.ts',
   'dist/packages-dist/animations/typings/animations.d.ts',
-  'dist/packages-dist/animations/typings/browser/index.d.ts',
+  'dist/packages-dist/animations/typings/browser/browser.d.ts',
   'dist/packages-dist/animations/typings/browser/testing/index.d.ts',
-  'dist/packages-dist/platform-browser/typings/animations/index.d.ts'
+  'dist/packages-dist/platform-browser/typings/animations/animations.d.ts'
 ];
 
 const publicApiDir = 'tools/public_api_guard';
diff --git a/tools/public_api_guard/animations/typings/browser/index.d.ts b/tools/public_api_guard/animations/typings/browser/browser.d.ts
similarity index 100%
rename from tools/public_api_guard/animations/typings/browser/index.d.ts
rename to tools/public_api_guard/animations/typings/browser/browser.d.ts