diff --git a/packages/animations/browser/package.json b/packages/animations/browser/package.json
index de0a720c49..dbf3e987d4 100644
--- a/packages/animations/browser/package.json
+++ b/packages/animations/browser/package.json
@@ -3,7 +3,7 @@
   "typings": "./browser.d.ts",
   "main": "../bundles/animations-browser.umd.js",
   "module": "../fesm5/browser.js",
-  "es2015": "../fesm2015/browser/browser.js",
+  "es2015": "../fesm2015/browser.js",
   "esm5": "../esm5/browser/browser.js",
   "esm2015": "../esm2015/browser/browser.js",
   "fesm5": "../fesm5/browser.js",
diff --git a/packages/animations/browser/testing/package.json b/packages/animations/browser/testing/package.json
index 44e87ea5c7..131f6090ff 100644
--- a/packages/animations/browser/testing/package.json
+++ b/packages/animations/browser/testing/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@angular/animations/browser/testing",
   "typings": "./testing.d.ts",
-  "main": "../../bundles/platform-browser-animations-testing.umd.js",
-  "module": "../../fesm5/animations/testing.js",
-  "es2015": "../../fesm2015/animations/testing.js",
-  "esm5": "../../esm5/animations/testing.js",
-  "esm2015": "../../esm2015/animations/testing.js",
-  "fesm5": "../../fesm5/animations/testing.js",
-  "fesm2015": "../../fesm2015/animations/testing.js"
+  "main": "../../bundles/animations-browser-testing.umd.js",
+  "module": "../../fesm5/browser/testing.js",
+  "es2015": "../../fesm2015/browser/testing.js",
+  "esm5": "../../esm5/browser/testing/testing.js",
+  "esm2015": "../../esm2015/browser/testing/testing.js",
+  "fesm5": "../../fesm5/browser/testing.js",
+  "fesm2015": "../../fesm2015/browser/testing.js"
 }
diff --git a/packages/common/http/package.json b/packages/common/http/package.json
index 1fcf26c686..7fc014ef30 100644
--- a/packages/common/http/package.json
+++ b/packages/common/http/package.json
@@ -3,7 +3,7 @@
   "typings": "./http.d.ts",
   "main": "../bundles/common-http.umd.js",
   "module": "../fesm5/http.js",
-  "es2015": "../fesm2015/http/http.js",
+  "es2015": "../fesm2015/http.js",
   "esm5": "../esm5/http/http.js",
   "esm2015": "../esm2015/http/http.js",
   "fesm5": "../fesm5/http.js",
diff --git a/packages/common/testing/package.json b/packages/common/testing/package.json
index 5efd08861c..3374f26715 100644
--- a/packages/common/testing/package.json
+++ b/packages/common/testing/package.json
@@ -3,7 +3,7 @@
   "typings": "./testing.d.ts",
   "main": "../bundles/common-testing.umd.js",
   "module": "../fesm5/testing.js",
-  "es2015": "../fesm2015/testing/testing.js",
+  "es2015": "../fesm2015/testing.js",
   "esm5": "../esm5/testing/testing.js",
   "esm2015": "../esm2015/testing/testing.js",
   "fesm5": "../fesm5/testing.js",
diff --git a/packages/compiler/testing/package.json b/packages/compiler/testing/package.json
index 4064121bf6..6031eb27b5 100644
--- a/packages/compiler/testing/package.json
+++ b/packages/compiler/testing/package.json
@@ -3,7 +3,7 @@
   "typings": "./testing.d.ts",
   "main": "../bundles/compiler-testing.umd.js",
   "module": "../fesm5/testing.js",
-  "es2015": "../fesm2015/testing/testing.js",
+  "es2015": "../fesm2015/testing.js",
   "esm5": "../esm5/testing/testing.js",
   "esm2015": "../esm2015/testing/testing.js",
   "fesm5": "../fesm5/testing.js",
diff --git a/packages/core/testing/package.json b/packages/core/testing/package.json
index 901fe793d4..fd49a3d3c9 100644
--- a/packages/core/testing/package.json
+++ b/packages/core/testing/package.json
@@ -3,7 +3,7 @@
   "typings": "./testing.d.ts",
   "main": "../bundles/core-testing.umd.js",
   "module": "../fesm5/testing.js",
-  "es2015": "../fesm2015/testing/testing.js",
+  "es2015": "../fesm2015/testing.js",
   "esm5": "../esm5/testing/testing.js",
   "esm2015": "../esm2015/testing/testing.js",
   "fesm5": "../fesm5/testing.js",
diff --git a/packages/http/testing/package.json b/packages/http/testing/package.json
index 121dd490de..705ff2d21b 100644
--- a/packages/http/testing/package.json
+++ b/packages/http/testing/package.json
@@ -3,7 +3,7 @@
   "typings": "./testing.d.ts",
   "main": "../bundles/http-testing.umd.js",
   "module": "../fesm5/testing.js",
-  "es2015": "../fesm2015/testing/testing.js",
+  "es2015": "../fesm2015/testing.js",
   "esm5": "../esm5/testing/testing.js",
   "esm2015": "../esm2015/testing/testing.js",
   "fesm5": "../fesm5/testing.js",
diff --git a/packages/platform-browser-dynamic/testing/package.json b/packages/platform-browser-dynamic/testing/package.json
index 6ed154399e..217c057569 100644
--- a/packages/platform-browser-dynamic/testing/package.json
+++ b/packages/platform-browser-dynamic/testing/package.json
@@ -3,7 +3,7 @@
   "typings": "./testing.d.ts",
   "main": "../bundles/platform-browser-dynamic-testing.umd.js",
   "module": "../fesm5/testing.js",
-  "es2015": "../fesm2015/testing/testing.js",
+  "es2015": "../fesm2015/testing.js",
   "esm5": "../esm5/testing/testing.js",
   "esm2015": "../esm2015/testing/testing.js",
   "fesm5": "../fesm5/testing.js",
diff --git a/packages/platform-browser/animations/package.json b/packages/platform-browser/animations/package.json
index 2f7ab859ab..8862a25b6f 100644
--- a/packages/platform-browser/animations/package.json
+++ b/packages/platform-browser/animations/package.json
@@ -3,7 +3,7 @@
   "typings": "./animations.d.ts",
   "main": "../bundles/platform-browser-animations.umd.js",
   "module": "../fesm5/animations.js",
-  "es2015": "../fesm2015/animations/animations.js",
+  "es2015": "../fesm2015/animations.js",
   "esm5": "../esm5/animations/animations.js",
   "esm2015": "../esm2015/animations/animations.js",
   "fesm5": "../fesm5/animations.js",
diff --git a/packages/platform-browser/testing/package.json b/packages/platform-browser/testing/package.json
index 794dff0c00..1a00568c53 100644
--- a/packages/platform-browser/testing/package.json
+++ b/packages/platform-browser/testing/package.json
@@ -3,7 +3,7 @@
   "typings": "./testing.d.ts",
   "main": "../bundles/platform-browser-testing.umd.js",
   "module": "../fesm5/testing.js",
-  "es2015": "../fesm2015/testing/testing.js",
+  "es2015": "../fesm2015/testing.js",
   "esm5": "../esm5/testing/testing.js",
   "esm2015": "../esm2015/testing/testing.js",
   "fesm5": "../fesm5/testing.js",
diff --git a/packages/platform-server/testing/package.json b/packages/platform-server/testing/package.json
index bd74a173e9..ed539f92b9 100644
--- a/packages/platform-server/testing/package.json
+++ b/packages/platform-server/testing/package.json
@@ -3,7 +3,7 @@
   "typings": "./testing.d.ts",
   "main": "../bundles/platform-server-testing.umd.js",
   "module": "../fesm5/testing.js",
-  "es2015": "../fesm2015/testing/testing.js",
+  "es2015": "../fesm2015/testing.js",
   "esm5": "../esm5/testing/testing.js",
   "esm2015": "../esm2015/testing/testing.js",
   "fesm5": "../fesm5/testing.js",
diff --git a/packages/router/testing/package.json b/packages/router/testing/package.json
index 4105d52785..80a08ba3ae 100644
--- a/packages/router/testing/package.json
+++ b/packages/router/testing/package.json
@@ -3,7 +3,7 @@
   "typings": "./testing.d.ts",
   "main": "../bundles/router-testing.umd.js",
   "module": "../fesm5/testing.js",
-  "es2015": "../fesm2015/testing/testing.js",
+  "es2015": "../fesm2015/testing.js",
   "esm5": "../esm5/testing/testing.js",
   "esm2015": "../esm2015/testing/testing.js",
   "fesm5": "../fesm5/testing.js",
diff --git a/packages/router/upgrade/package.json b/packages/router/upgrade/package.json
index e3dcb7bf1f..8578e3a0f8 100644
--- a/packages/router/upgrade/package.json
+++ b/packages/router/upgrade/package.json
@@ -3,7 +3,7 @@
   "typings": "./upgrade.d.ts",
   "main": "../bundles/router-upgrade.umd.js",
   "module": "../fesm5/upgrade.js",
-  "es2015": "../fesm2015/upgrade/upgrade.js",
+  "es2015": "../fesm2015/upgrade.js",
   "esm5": "../esm5/upgrade/upgrade.js",
   "esm2015": "../esm2015/upgrade/upgrade.js",
   "fesm5": "../fesm5/upgrade.js",
diff --git a/packages/upgrade/static/package.json b/packages/upgrade/static/package.json
index e2928067b7..a91e77fa42 100644
--- a/packages/upgrade/static/package.json
+++ b/packages/upgrade/static/package.json
@@ -3,7 +3,7 @@
   "typings": "./static.d.ts",
   "main": "../bundles/upgrade-static.umd.js",
   "module": "../fesm5/static.js",
-  "es2015": "../fesm2015/static/static.js",
+  "es2015": "../fesm2015/static.js",
   "esm5": "../esm5/static/static.js",
   "esm2015": "../esm2015/static/static.js",
   "fesm5": "../fesm5/static.js",