diff --git a/src/cdk/a11y/public_api.ts b/src/cdk/a11y/a11y-module.ts
similarity index 77%
rename from src/cdk/a11y/public_api.ts
rename to src/cdk/a11y/a11y-module.ts
index ddd32c71097d..3535993dab87 100644
--- a/src/cdk/a11y/public_api.ts
+++ b/src/cdk/a11y/a11y-module.ts
@@ -29,13 +29,3 @@ import {CdkMonitorFocus, FOCUS_MONITOR_PROVIDER} from './focus-monitor';
   ]
 })
 export class A11yModule {}
-
-export * from './activedescendant-key-manager';
-export * from './aria-describer';
-export * from './fake-mousedown';
-export * from './focus-key-manager';
-export * from './focus-trap';
-export * from './interactivity-checker';
-export * from './list-key-manager';
-export * from './live-announcer';
-export * from './focus-monitor';
diff --git a/src/cdk/a11y/index.ts b/src/cdk/a11y/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/a11y/index.ts
+++ b/src/cdk/a11y/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/a11y/public-api.ts b/src/cdk/a11y/public-api.ts
new file mode 100644
index 000000000000..2a84193417e9
--- /dev/null
+++ b/src/cdk/a11y/public-api.ts
@@ -0,0 +1,18 @@
+/**
+ * @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 * from './activedescendant-key-manager';
+export * from './aria-describer';
+export * from './fake-mousedown';
+export * from './focus-key-manager';
+export * from './focus-trap';
+export * from './interactivity-checker';
+export * from './list-key-manager';
+export * from './live-announcer';
+export * from './focus-monitor';
+export * from './a11y-module';
diff --git a/src/cdk/a11y/tsconfig-build.json b/src/cdk/a11y/tsconfig-build.json
index ed655bf2a095..3abe5d1758bb 100644
--- a/src/cdk/a11y/tsconfig-build.json
+++ b/src/cdk/a11y/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/a11y/tsconfig-es5.json b/src/cdk/a11y/tsconfig-es5.json
new file mode 100644
index 000000000000..9f859ef5e0e5
--- /dev/null
+++ b/src/cdk/a11y/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/a11y",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/bidi/public_api.ts b/src/cdk/bidi/bidi-module.ts
similarity index 76%
rename from src/cdk/bidi/public_api.ts
rename to src/cdk/bidi/bidi-module.ts
index d42a66e628a8..a411fcf673fe 100644
--- a/src/cdk/bidi/public_api.ts
+++ b/src/cdk/bidi/bidi-module.ts
@@ -11,14 +11,6 @@ import {DOCUMENT} from '@angular/platform-browser';
 import {Dir} from './dir';
 import {DIR_DOCUMENT, Directionality} from './directionality';
 
-export {
-  Directionality,
-  DIRECTIONALITY_PROVIDER_FACTORY,
-  DIRECTIONALITY_PROVIDER,
-  DIR_DOCUMENT,
-  Direction,
-} from './directionality';
-export {Dir} from './dir';
 
 @NgModule({
   exports: [Dir],
diff --git a/src/cdk/bidi/index.ts b/src/cdk/bidi/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/bidi/index.ts
+++ b/src/cdk/bidi/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/bidi/public-api.ts b/src/cdk/bidi/public-api.ts
new file mode 100644
index 000000000000..8f594855d6db
--- /dev/null
+++ b/src/cdk/bidi/public-api.ts
@@ -0,0 +1,18 @@
+/**
+ * @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 {
+  Directionality,
+  DIRECTIONALITY_PROVIDER_FACTORY,
+  DIRECTIONALITY_PROVIDER,
+  DIR_DOCUMENT,
+  Direction,
+} from './directionality';
+export {Dir} from './dir';
+export * from './bidi-module';
+
diff --git a/src/cdk/bidi/tsconfig-build.json b/src/cdk/bidi/tsconfig-build.json
index e21cf03bc8ad..660f94acd255 100644
--- a/src/cdk/bidi/tsconfig-build.json
+++ b/src/cdk/bidi/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/bidi/tsconfig-es5.json b/src/cdk/bidi/tsconfig-es5.json
new file mode 100644
index 000000000000..1d5216f97ef5
--- /dev/null
+++ b/src/cdk/bidi/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/bidi",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/coercion/index.ts b/src/cdk/coercion/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/coercion/index.ts
+++ b/src/cdk/coercion/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/coercion/public_api.ts b/src/cdk/coercion/public-api.ts
similarity index 100%
rename from src/cdk/coercion/public_api.ts
rename to src/cdk/coercion/public-api.ts
diff --git a/src/cdk/coercion/tsconfig-build.json b/src/cdk/coercion/tsconfig-build.json
index 6c423b857928..5c72df273dbd 100644
--- a/src/cdk/coercion/tsconfig-build.json
+++ b/src/cdk/coercion/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/coercion/tsconfig-es5.json b/src/cdk/coercion/tsconfig-es5.json
new file mode 100644
index 000000000000..43c178eabddb
--- /dev/null
+++ b/src/cdk/coercion/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/coercion",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/collections/index.ts b/src/cdk/collections/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/collections/index.ts
+++ b/src/cdk/collections/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/collections/public_api.ts b/src/cdk/collections/public-api.ts
similarity index 100%
rename from src/cdk/collections/public_api.ts
rename to src/cdk/collections/public-api.ts
diff --git a/src/cdk/collections/tsconfig-build.json b/src/cdk/collections/tsconfig-build.json
index 7f637f1343af..0a7c5dd6bb32 100644
--- a/src/cdk/collections/tsconfig-build.json
+++ b/src/cdk/collections/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/collections/tsconfig-es5.json b/src/cdk/collections/tsconfig-es5.json
new file mode 100644
index 000000000000..09d592aacabc
--- /dev/null
+++ b/src/cdk/collections/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/collections",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/index.ts b/src/cdk/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/index.ts
+++ b/src/cdk/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/keycodes/index.ts b/src/cdk/keycodes/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/keycodes/index.ts
+++ b/src/cdk/keycodes/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/keycodes/public_api.ts b/src/cdk/keycodes/public-api.ts
similarity index 100%
rename from src/cdk/keycodes/public_api.ts
rename to src/cdk/keycodes/public-api.ts
diff --git a/src/cdk/keycodes/tsconfig-build.json b/src/cdk/keycodes/tsconfig-build.json
index 14ba0c50bf55..487789fef280 100644
--- a/src/cdk/keycodes/tsconfig-build.json
+++ b/src/cdk/keycodes/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/keycodes/tsconfig-es5.json b/src/cdk/keycodes/tsconfig-es5.json
new file mode 100644
index 000000000000..f923de0e6448
--- /dev/null
+++ b/src/cdk/keycodes/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/keycodes",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/layout/index.ts b/src/cdk/layout/index.ts
index 5a6b2bc7c6de..289a64186096 100644
--- a/src/cdk/layout/index.ts
+++ b/src/cdk/layout/index.ts
@@ -5,4 +5,4 @@
  * 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 * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/layout/public_api.ts b/src/cdk/layout/public-api.ts
similarity index 100%
rename from src/cdk/layout/public_api.ts
rename to src/cdk/layout/public-api.ts
diff --git a/src/cdk/layout/tsconfig-build.json b/src/cdk/layout/tsconfig-build.json
index 56654d9971ff..83c719f82566 100644
--- a/src/cdk/layout/tsconfig-build.json
+++ b/src/cdk/layout/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/layout/tsconfig-es5.json b/src/cdk/layout/tsconfig-es5.json
new file mode 100644
index 000000000000..646c9c20d1b7
--- /dev/null
+++ b/src/cdk/layout/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/layout",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/observers/index.ts b/src/cdk/observers/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/observers/index.ts
+++ b/src/cdk/observers/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/observers/public_api.ts b/src/cdk/observers/public-api.ts
similarity index 100%
rename from src/cdk/observers/public_api.ts
rename to src/cdk/observers/public-api.ts
diff --git a/src/cdk/observers/tsconfig-build.json b/src/cdk/observers/tsconfig-build.json
index ba4de8f00ad6..4f4d795d4f4e 100644
--- a/src/cdk/observers/tsconfig-build.json
+++ b/src/cdk/observers/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/observers/tsconfig-es5.json b/src/cdk/observers/tsconfig-es5.json
new file mode 100644
index 000000000000..3006179c63d4
--- /dev/null
+++ b/src/cdk/observers/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/observers",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/overlay/index.ts b/src/cdk/overlay/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/overlay/index.ts
+++ b/src/cdk/overlay/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/overlay/public_api.ts b/src/cdk/overlay/overlay-module.ts
similarity index 59%
rename from src/cdk/overlay/public_api.ts
rename to src/cdk/overlay/overlay-module.ts
index ec4c15d534bf..fc8f814e10d2 100644
--- a/src/cdk/overlay/public_api.ts
+++ b/src/cdk/overlay/overlay-module.ts
@@ -5,6 +5,7 @@
  * 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
  */
+
 import {NgModule, Provider} from '@angular/core';
 import {PortalModule} from '@angular/cdk/portal';
 import {Overlay} from './overlay';
@@ -18,7 +19,6 @@ import {OverlayPositionBuilder} from './position/overlay-position-builder';
 import {OVERLAY_CONTAINER_PROVIDER} from './overlay-container';
 import {ScrollStrategyOptions} from './scroll/scroll-strategy-options';
 
-
 export const OVERLAY_PROVIDERS: Provider[] = [
   Overlay,
   OverlayPositionBuilder,
@@ -34,22 +34,3 @@ export const OVERLAY_PROVIDERS: Provider[] = [
   providers: [OVERLAY_PROVIDERS, ScrollStrategyOptions],
 })
 export class OverlayModule {}
-
-
-export * from './overlay-config';
-export {Overlay} from './overlay';
-export {OverlayContainer} from './overlay-container';
-export {FullscreenOverlayContainer} from './fullscreen-overlay-container';
-export {OverlayRef} from './overlay-ref';
-export {ConnectedOverlayDirective, OverlayOrigin} from './overlay-directives';
-export {ViewportRuler} from '@angular/cdk/scrolling';
-export {ComponentType} from '@angular/cdk/portal';
-
-export * from './position/connected-position';
-export * from './scroll/index';
-
-// Export pre-defined position strategies and interface to build custom ones.
-export {PositionStrategy} from './position/position-strategy';
-export {GlobalPositionStrategy} from './position/global-position-strategy';
-export {ConnectedPositionStrategy} from './position/connected-position-strategy';
-export {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
diff --git a/src/cdk/overlay/public-api.ts b/src/cdk/overlay/public-api.ts
new file mode 100644
index 000000000000..c00527e42bfa
--- /dev/null
+++ b/src/cdk/overlay/public-api.ts
@@ -0,0 +1,26 @@
+/**
+ * @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 * from './overlay-config';
+export {Overlay} from './overlay';
+export {OverlayContainer} from './overlay-container';
+export {FullscreenOverlayContainer} from './fullscreen-overlay-container';
+export {OverlayRef} from './overlay-ref';
+export {ConnectedOverlayDirective, OverlayOrigin} from './overlay-directives';
+export {ViewportRuler} from '@angular/cdk/scrolling';
+export {ComponentType} from '@angular/cdk/portal';
+
+export * from './position/connected-position';
+export * from './scroll/index';
+export * from './overlay-module';
+
+// Export pre-defined position strategies and interface to build custom ones.
+export {PositionStrategy} from './position/position-strategy';
+export {GlobalPositionStrategy} from './position/global-position-strategy';
+export {ConnectedPositionStrategy} from './position/connected-position-strategy';
+export {VIEWPORT_RULER_PROVIDER} from '@angular/cdk/scrolling';
diff --git a/src/cdk/overlay/tsconfig-build.json b/src/cdk/overlay/tsconfig-build.json
index 8b6df58dda2a..254e6404a551 100644
--- a/src/cdk/overlay/tsconfig-build.json
+++ b/src/cdk/overlay/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/overlay/tsconfig-es5.json b/src/cdk/overlay/tsconfig-es5.json
new file mode 100644
index 000000000000..3ea6fd8f9d03
--- /dev/null
+++ b/src/cdk/overlay/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/overlay",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/platform/index.ts b/src/cdk/platform/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/platform/index.ts
+++ b/src/cdk/platform/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/platform/public_api.ts b/src/cdk/platform/platform-module.ts
similarity index 85%
rename from src/cdk/platform/public_api.ts
rename to src/cdk/platform/platform-module.ts
index ea7a9a4b4cf4..f22d00f6c0d8 100644
--- a/src/cdk/platform/public_api.ts
+++ b/src/cdk/platform/platform-module.ts
@@ -14,7 +14,3 @@ import {Platform} from './platform';
   providers: [Platform]
 })
 export class PlatformModule {}
-
-
-export * from './platform';
-export * from './features';
diff --git a/src/cdk/platform/public-api.ts b/src/cdk/platform/public-api.ts
new file mode 100644
index 000000000000..8d7a3bb4b669
--- /dev/null
+++ b/src/cdk/platform/public-api.ts
@@ -0,0 +1,11 @@
+/**
+ * @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 * from './platform';
+export * from './features';
+export * from './platform-module';
diff --git a/src/cdk/platform/tsconfig-build.json b/src/cdk/platform/tsconfig-build.json
index b5b3db511172..2da6b605cd5a 100644
--- a/src/cdk/platform/tsconfig-build.json
+++ b/src/cdk/platform/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/platform/tsconfig-es5.json b/src/cdk/platform/tsconfig-es5.json
new file mode 100644
index 000000000000..d51201683c7e
--- /dev/null
+++ b/src/cdk/platform/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/platform",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/portal/index.ts b/src/cdk/portal/index.ts
index 2b504ab757d8..cb3190feb609 100644
--- a/src/cdk/portal/index.ts
+++ b/src/cdk/portal/index.ts
@@ -8,4 +8,4 @@
 
 
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/portal/public_api.ts b/src/cdk/portal/public-api.ts
similarity index 100%
rename from src/cdk/portal/public_api.ts
rename to src/cdk/portal/public-api.ts
diff --git a/src/cdk/portal/tsconfig-build.json b/src/cdk/portal/tsconfig-build.json
index c22ae5810fa8..fd3241f76e01 100644
--- a/src/cdk/portal/tsconfig-build.json
+++ b/src/cdk/portal/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/portal/tsconfig-es5.json b/src/cdk/portal/tsconfig-es5.json
new file mode 100644
index 000000000000..021b7e9a7a21
--- /dev/null
+++ b/src/cdk/portal/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/portal",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/public_api.ts b/src/cdk/public-api.ts
similarity index 100%
rename from src/cdk/public_api.ts
rename to src/cdk/public-api.ts
diff --git a/src/cdk/rxjs/index.ts b/src/cdk/rxjs/index.ts
index 2b504ab757d8..cb3190feb609 100644
--- a/src/cdk/rxjs/index.ts
+++ b/src/cdk/rxjs/index.ts
@@ -8,4 +8,4 @@
 
 
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/rxjs/public_api.ts b/src/cdk/rxjs/public-api.ts
similarity index 100%
rename from src/cdk/rxjs/public_api.ts
rename to src/cdk/rxjs/public-api.ts
diff --git a/src/cdk/rxjs/tsconfig-build.json b/src/cdk/rxjs/tsconfig-build.json
index 6ee37efb86c8..a03294444966 100644
--- a/src/cdk/rxjs/tsconfig-build.json
+++ b/src/cdk/rxjs/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/rxjs/tsconfig-es5.json b/src/cdk/rxjs/tsconfig-es5.json
new file mode 100644
index 000000000000..8c164ebef3de
--- /dev/null
+++ b/src/cdk/rxjs/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/rxjs",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/scrolling/index.ts b/src/cdk/scrolling/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/scrolling/index.ts
+++ b/src/cdk/scrolling/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/scrolling/public-api.ts b/src/cdk/scrolling/public-api.ts
new file mode 100644
index 000000000000..7a069a29a314
--- /dev/null
+++ b/src/cdk/scrolling/public-api.ts
@@ -0,0 +1,12 @@
+/**
+ * @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 * from './scroll-dispatcher';
+export * from './scrollable';
+export * from './viewport-ruler';
+export * from './scrolling-module';
diff --git a/src/cdk/scrolling/scroll-dispatcher.spec.ts b/src/cdk/scrolling/scroll-dispatcher.spec.ts
index d08dc5f8cf4c..68c94a5e3bef 100644
--- a/src/cdk/scrolling/scroll-dispatcher.spec.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.spec.ts
@@ -1,6 +1,6 @@
 import {inject, TestBed, async, fakeAsync, ComponentFixture, tick} from '@angular/core/testing';
 import {NgModule, Component, ViewChild, ElementRef} from '@angular/core';
-import {Scrollable, ScrollDispatcher, ScrollDispatchModule} from './public_api';
+import {Scrollable, ScrollDispatcher, ScrollDispatchModule} from './public-api';
 import {dispatchFakeEvent} from '@angular/cdk/testing';
 
 describe('Scroll Dispatcher', () => {
diff --git a/src/cdk/scrolling/public_api.ts b/src/cdk/scrolling/scrolling-module.ts
similarity index 85%
rename from src/cdk/scrolling/public_api.ts
rename to src/cdk/scrolling/scrolling-module.ts
index 96b6f3a842bf..1f0a669e39a3 100644
--- a/src/cdk/scrolling/public_api.ts
+++ b/src/cdk/scrolling/scrolling-module.ts
@@ -18,7 +18,3 @@ import {PlatformModule} from '@angular/cdk/platform';
   providers: [SCROLL_DISPATCHER_PROVIDER],
 })
 export class ScrollDispatchModule {}
-
-export * from './scroll-dispatcher';
-export * from './scrollable';
-export * from './viewport-ruler';
diff --git a/src/cdk/scrolling/tsconfig-build.json b/src/cdk/scrolling/tsconfig-build.json
index 20b5757fb12c..c15183d45540 100644
--- a/src/cdk/scrolling/tsconfig-build.json
+++ b/src/cdk/scrolling/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/cdk/scrolling/tsconfig-es5.json b/src/cdk/scrolling/tsconfig-es5.json
new file mode 100644
index 000000000000..01eed669f762
--- /dev/null
+++ b/src/cdk/scrolling/tsconfig-es5.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/scrolling",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/scrolling/viewport-ruler.spec.ts b/src/cdk/scrolling/viewport-ruler.spec.ts
index 349b00efb186..f5afd837e752 100644
--- a/src/cdk/scrolling/viewport-ruler.spec.ts
+++ b/src/cdk/scrolling/viewport-ruler.spec.ts
@@ -1,5 +1,5 @@
 import {TestBed, inject} from '@angular/core/testing';
-import {ScrollDispatchModule} from './public_api';
+import {ScrollDispatchModule} from './public-api';
 import {ViewportRuler, VIEWPORT_RULER_PROVIDER} from './viewport-ruler';
 
 
diff --git a/src/cdk/stepper/index.ts b/src/cdk/stepper/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/cdk/stepper/index.ts
+++ b/src/cdk/stepper/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/stepper/public-api.ts b/src/cdk/stepper/public-api.ts
new file mode 100644
index 000000000000..b5c762587815
--- /dev/null
+++ b/src/cdk/stepper/public-api.ts
@@ -0,0 +1,12 @@
+/**
+ * @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 * from './stepper';
+export * from './step-label';
+export * from './stepper-button';
+export * from './stepper-module';
diff --git a/src/cdk/stepper/public_api.ts b/src/cdk/stepper/stepper-module.ts
similarity index 89%
rename from src/cdk/stepper/public_api.ts
rename to src/cdk/stepper/stepper-module.ts
index 2ef3326db218..e52cb742a796 100644
--- a/src/cdk/stepper/public_api.ts
+++ b/src/cdk/stepper/stepper-module.ts
@@ -19,7 +19,3 @@ import {BidiModule} from '@angular/cdk/bidi';
   declarations: [CdkStep, CdkStepper, CdkStepLabel, CdkStepperNext, CdkStepperPrevious]
 })
 export class CdkStepperModule {}
-
-export * from './stepper';
-export * from './step-label';
-export * from './stepper-button';
diff --git a/src/cdk/stepper/tsconfig-build.json b/src/cdk/stepper/tsconfig-build.json
index 2f9f6e461859..8088edebe7be 100644
--- a/src/cdk/stepper/tsconfig-build.json
+++ b/src/cdk/stepper/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/cdk/stepper/tsconfig-es5.json b/src/cdk/stepper/tsconfig-es5.json
new file mode 100644
index 000000000000..3eabe48b6384
--- /dev/null
+++ b/src/cdk/stepper/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/stepper",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/table/index.ts b/src/cdk/table/index.ts
index 2b504ab757d8..cb3190feb609 100644
--- a/src/cdk/table/index.ts
+++ b/src/cdk/table/index.ts
@@ -8,4 +8,4 @@
 
 
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/table/public-api.ts b/src/cdk/table/public-api.ts
new file mode 100644
index 000000000000..8f01d6e237f6
--- /dev/null
+++ b/src/cdk/table/public-api.ts
@@ -0,0 +1,15 @@
+/**
+ * @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 * from './table';
+export * from './cell';
+export * from './row';
+export * from './table-module';
+
+/** Re-export DataSource for a more intuitive experience for users of just the table. */
+export {DataSource} from '@angular/cdk/collections';
diff --git a/src/cdk/table/public_api.ts b/src/cdk/table/table-module.ts
similarity index 81%
rename from src/cdk/table/public_api.ts
rename to src/cdk/table/table-module.ts
index 24a36e8ddd94..5ad1975e5578 100644
--- a/src/cdk/table/public_api.ts
+++ b/src/cdk/table/table-module.ts
@@ -12,13 +12,6 @@ import {HeaderRowPlaceholder, RowPlaceholder, CdkTable} from './table';
 import {CdkCellOutlet, CdkHeaderRow, CdkHeaderRowDef, CdkRow, CdkRowDef} from './row';
 import {CdkColumnDef, CdkHeaderCellDef, CdkHeaderCell, CdkCell, CdkCellDef} from './cell';
 
-export * from './table';
-export * from './cell';
-export * from './row';
-
-/** Re-export DataSource for a more intuitive experience for users of just the table. */
-export {DataSource} from '@angular/cdk/collections';
-
 const EXPORTED_DECLARATIONS = [
   CdkTable,
   CdkRowDef,
diff --git a/src/cdk/table/tsconfig-build.json b/src/cdk/table/tsconfig-build.json
index cacbba393c91..fa5055dc7a07 100644
--- a/src/cdk/table/tsconfig-build.json
+++ b/src/cdk/table/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/cdk/table/tsconfig-es5.json b/src/cdk/table/tsconfig-es5.json
new file mode 100644
index 000000000000..c431202d220a
--- /dev/null
+++ b/src/cdk/table/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk/table",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/cdk/testing/index.ts b/src/cdk/testing/index.ts
index 2b504ab757d8..cb3190feb609 100644
--- a/src/cdk/testing/index.ts
+++ b/src/cdk/testing/index.ts
@@ -8,4 +8,4 @@
 
 
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/cdk/testing/public_api.ts b/src/cdk/testing/public-api.ts
similarity index 100%
rename from src/cdk/testing/public_api.ts
rename to src/cdk/testing/public-api.ts
diff --git a/src/cdk/tsconfig-build.json b/src/cdk/tsconfig-build.json
index 2ce5c0ace94e..cbae6367a2b8 100644
--- a/src/cdk/tsconfig-build.json
+++ b/src/cdk/tsconfig-build.json
@@ -1,5 +1,4 @@
-// TypeScript config file that is used to compile the cdk package. Target environment needs to be
-// ES2015 since the build process will create FESM bundles using rollup.
+// TypeScript config file that is used to compile the cdk's ES2015 package.
 {
   "compilerOptions": {
     "baseUrl": ".",
@@ -21,11 +20,11 @@
     "skipLibCheck": true,
     "types": [],
     "paths": {
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
     }
   },
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/cdk/tsconfig-es5.json b/src/cdk/tsconfig-es5.json
new file mode 100644
index 000000000000..e85105f31cfd
--- /dev/null
+++ b/src/cdk/tsconfig-es5.json
@@ -0,0 +1,38 @@
+// TypeScript config file that is used to compile the cdk's ES5 package.
+// TODO: Remove this file in favor of overrides when we update to ngc 5.x
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "declaration": false,
+    "stripInternal": false,
+    "experimentalDecorators": true,
+    "noUnusedParameters": true,
+    "strictNullChecks": true,
+    "importHelpers": true,
+    "newLine": "lf",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "../../dist/packages/cdk/esm5",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "target": "es5",
+    "lib": ["es2015", "dom"],
+    "skipLibCheck": true,
+    "types": [],
+    "paths": {
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
+    }
+  },
+  "files": [
+    "public-api.ts",
+    "typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/cdk",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index f10e687d711e..47c7ff114954 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -28,7 +28,7 @@ System.config({
       'node:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
 
     // TODO(devversion): replace once the index.ts file for the Material package has been added.
-    '@angular/material': 'dist/packages/material/public_api.js',
+    '@angular/material': 'dist/packages/material/public-api.js',
     '@angular/cdk': 'dist/packages/cdk/index.js',
     '@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
     '@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
diff --git a/src/demo-app/tsconfig-build.json b/src/demo-app/tsconfig-build.json
index c3169ecece30..8ad4d20b6c8e 100644
--- a/src/demo-app/tsconfig-build.json
+++ b/src/demo-app/tsconfig-build.json
@@ -22,7 +22,7 @@
     ],
     "baseUrl": ".",
     "paths": {
-      "@angular/material": ["../../dist/packages/material/public_api"],
+      "@angular/material": ["../../dist/packages/material/public-api"],
       "@angular/cdk/*": ["../../dist/packages/cdk/*"],
       "@angular/material/*": ["../../dist/packages/material/*"],
       "@angular/material-moment-adapter": ["../../dist/packages/material-moment-adapter"]
diff --git a/src/demo-app/tsconfig.json b/src/demo-app/tsconfig.json
index 3e4fa9c6417d..f7f702c1c807 100644
--- a/src/demo-app/tsconfig.json
+++ b/src/demo-app/tsconfig.json
@@ -7,7 +7,7 @@
     "paths": {
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
-      "@angular/material": ["../lib/public_api.ts"]
+      "@angular/material": ["../lib/public-api.ts"]
     }
   },
   "include": ["./**/*.ts"]
diff --git a/src/e2e-app/tsconfig.json b/src/e2e-app/tsconfig.json
index ab108ba3a8f0..aef9e39b38e8 100644
--- a/src/e2e-app/tsconfig.json
+++ b/src/e2e-app/tsconfig.json
@@ -7,8 +7,8 @@
     "paths": {
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
-      "@angular/material": ["../lib/public_api.ts"],
-      "@angular/material-examples": ["../material-examples/public_api.ts"]
+      "@angular/material": ["../lib/public-api.ts"],
+      "@angular/material-examples": ["../material-examples/public-api.ts"]
     }
   },
   "include": ["./**/*.ts"]
diff --git a/src/lib/autocomplete/index.ts b/src/lib/autocomplete/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/autocomplete/index.ts
+++ b/src/lib/autocomplete/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/autocomplete/public_api.ts b/src/lib/autocomplete/public-api.ts
similarity index 100%
rename from src/lib/autocomplete/public_api.ts
rename to src/lib/autocomplete/public-api.ts
diff --git a/src/lib/autocomplete/tsconfig-build.json b/src/lib/autocomplete/tsconfig-build.json
index 363a0a4837d6..75a5aaeb002c 100644
--- a/src/lib/autocomplete/tsconfig-build.json
+++ b/src/lib/autocomplete/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/autocomplete/tsconfig-es5.json b/src/lib/autocomplete/tsconfig-es5.json
new file mode 100644
index 000000000000..270cd7838bee
--- /dev/null
+++ b/src/lib/autocomplete/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/autocomplete",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/button-toggle/index.ts b/src/lib/button-toggle/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/button-toggle/index.ts
+++ b/src/lib/button-toggle/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/button-toggle/public_api.ts b/src/lib/button-toggle/public-api.ts
similarity index 100%
rename from src/lib/button-toggle/public_api.ts
rename to src/lib/button-toggle/public-api.ts
diff --git a/src/lib/button-toggle/tsconfig-build.json b/src/lib/button-toggle/tsconfig-build.json
index fadd13eed97c..412d014f6615 100644
--- a/src/lib/button-toggle/tsconfig-build.json
+++ b/src/lib/button-toggle/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/button-toggle/tsconfig-es5.json b/src/lib/button-toggle/tsconfig-es5.json
new file mode 100644
index 000000000000..af9532f0a445
--- /dev/null
+++ b/src/lib/button-toggle/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/button-toggle",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/button/index.ts b/src/lib/button/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/button/index.ts
+++ b/src/lib/button/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/button/public_api.ts b/src/lib/button/public-api.ts
similarity index 100%
rename from src/lib/button/public_api.ts
rename to src/lib/button/public-api.ts
diff --git a/src/lib/button/tsconfig-build.json b/src/lib/button/tsconfig-build.json
index aa81fe018b36..f058d3781f4b 100644
--- a/src/lib/button/tsconfig-build.json
+++ b/src/lib/button/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/button/tsconfig-es5.json b/src/lib/button/tsconfig-es5.json
new file mode 100644
index 000000000000..e9d81168005e
--- /dev/null
+++ b/src/lib/button/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/button",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/card/index.ts b/src/lib/card/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/card/index.ts
+++ b/src/lib/card/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/card/public_api.ts b/src/lib/card/public-api.ts
similarity index 100%
rename from src/lib/card/public_api.ts
rename to src/lib/card/public-api.ts
diff --git a/src/lib/card/tsconfig-build.json b/src/lib/card/tsconfig-build.json
index c53fd82c5200..0c9534bb05bd 100644
--- a/src/lib/card/tsconfig-build.json
+++ b/src/lib/card/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/card/tsconfig-es5.json b/src/lib/card/tsconfig-es5.json
new file mode 100644
index 000000000000..2a4cd40559bc
--- /dev/null
+++ b/src/lib/card/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/card",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/checkbox/index.ts b/src/lib/checkbox/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/checkbox/index.ts
+++ b/src/lib/checkbox/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/checkbox/public_api.ts b/src/lib/checkbox/public-api.ts
similarity index 100%
rename from src/lib/checkbox/public_api.ts
rename to src/lib/checkbox/public-api.ts
diff --git a/src/lib/checkbox/tsconfig-build.json b/src/lib/checkbox/tsconfig-build.json
index 41f11c4177b9..8cb32cbf27fc 100644
--- a/src/lib/checkbox/tsconfig-build.json
+++ b/src/lib/checkbox/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/checkbox/tsconfig-es5.json b/src/lib/checkbox/tsconfig-es5.json
new file mode 100644
index 000000000000..4b2b11e78453
--- /dev/null
+++ b/src/lib/checkbox/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/checkbox",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/chips/index.ts b/src/lib/chips/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/chips/index.ts
+++ b/src/lib/chips/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/chips/public_api.ts b/src/lib/chips/public-api.ts
similarity index 100%
rename from src/lib/chips/public_api.ts
rename to src/lib/chips/public-api.ts
diff --git a/src/lib/chips/tsconfig-build.json b/src/lib/chips/tsconfig-build.json
index 1db61d5c0404..79f6f27b4146 100644
--- a/src/lib/chips/tsconfig-build.json
+++ b/src/lib/chips/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/chips/tsconfig-es5.json b/src/lib/chips/tsconfig-es5.json
new file mode 100644
index 000000000000..fa2928e33c28
--- /dev/null
+++ b/src/lib/chips/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/chips",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/core/index.ts b/src/lib/core/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/core/index.ts
+++ b/src/lib/core/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/core/public_api.ts b/src/lib/core/public-api.ts
similarity index 100%
rename from src/lib/core/public_api.ts
rename to src/lib/core/public-api.ts
diff --git a/src/lib/core/tsconfig-build.json b/src/lib/core/tsconfig-build.json
index e053dfc9fea7..c12f2c686a4a 100644
--- a/src/lib/core/tsconfig-build.json
+++ b/src/lib/core/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/core/tsconfig-es5.json b/src/lib/core/tsconfig-es5.json
new file mode 100644
index 000000000000..b6cc1b088696
--- /dev/null
+++ b/src/lib/core/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/core",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/datepicker/index.ts b/src/lib/datepicker/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/datepicker/index.ts
+++ b/src/lib/datepicker/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/datepicker/public_api.ts b/src/lib/datepicker/public-api.ts
similarity index 100%
rename from src/lib/datepicker/public_api.ts
rename to src/lib/datepicker/public-api.ts
diff --git a/src/lib/datepicker/tsconfig-build.json b/src/lib/datepicker/tsconfig-build.json
index 97ca0946f88a..34c3535eda7b 100644
--- a/src/lib/datepicker/tsconfig-build.json
+++ b/src/lib/datepicker/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/datepicker/tsconfig-es5.json b/src/lib/datepicker/tsconfig-es5.json
new file mode 100644
index 000000000000..fdb09e47a9dc
--- /dev/null
+++ b/src/lib/datepicker/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/datepicker",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/dialog/index.ts b/src/lib/dialog/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/dialog/index.ts
+++ b/src/lib/dialog/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/dialog/public_api.ts b/src/lib/dialog/public-api.ts
similarity index 100%
rename from src/lib/dialog/public_api.ts
rename to src/lib/dialog/public-api.ts
diff --git a/src/lib/dialog/tsconfig-build.json b/src/lib/dialog/tsconfig-build.json
index 09c13c1babf8..d0007d9b5d5d 100644
--- a/src/lib/dialog/tsconfig-build.json
+++ b/src/lib/dialog/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/dialog/tsconfig-es5.json b/src/lib/dialog/tsconfig-es5.json
new file mode 100644
index 000000000000..29106ba3e285
--- /dev/null
+++ b/src/lib/dialog/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/dialog",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/expansion/index.ts b/src/lib/expansion/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/expansion/index.ts
+++ b/src/lib/expansion/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/expansion/public_api.ts b/src/lib/expansion/public-api.ts
similarity index 100%
rename from src/lib/expansion/public_api.ts
rename to src/lib/expansion/public-api.ts
diff --git a/src/lib/expansion/tsconfig-build.json b/src/lib/expansion/tsconfig-build.json
index e8334a21f70b..15bd3530d644 100644
--- a/src/lib/expansion/tsconfig-build.json
+++ b/src/lib/expansion/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/expansion/tsconfig-es5.json b/src/lib/expansion/tsconfig-es5.json
new file mode 100644
index 000000000000..44013006f711
--- /dev/null
+++ b/src/lib/expansion/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/expansion",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/form-field/index.ts b/src/lib/form-field/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/form-field/index.ts
+++ b/src/lib/form-field/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/form-field/public_api.ts b/src/lib/form-field/public-api.ts
similarity index 100%
rename from src/lib/form-field/public_api.ts
rename to src/lib/form-field/public-api.ts
diff --git a/src/lib/form-field/tsconfig-build.json b/src/lib/form-field/tsconfig-build.json
index b140fb2b357e..a32c30086890 100644
--- a/src/lib/form-field/tsconfig-build.json
+++ b/src/lib/form-field/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/form-field/tsconfig-es5.json b/src/lib/form-field/tsconfig-es5.json
new file mode 100644
index 000000000000..d60777a3bc17
--- /dev/null
+++ b/src/lib/form-field/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/form-field",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/grid-list/index.ts b/src/lib/grid-list/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/grid-list/index.ts
+++ b/src/lib/grid-list/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/grid-list/public_api.ts b/src/lib/grid-list/public-api.ts
similarity index 100%
rename from src/lib/grid-list/public_api.ts
rename to src/lib/grid-list/public-api.ts
diff --git a/src/lib/grid-list/tsconfig-build.json b/src/lib/grid-list/tsconfig-build.json
index 16701dc99e35..40192c7b4fe0 100644
--- a/src/lib/grid-list/tsconfig-build.json
+++ b/src/lib/grid-list/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/grid-list/tsconfig-es5.json b/src/lib/grid-list/tsconfig-es5.json
new file mode 100644
index 000000000000..fa301bb0536b
--- /dev/null
+++ b/src/lib/grid-list/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/grid-list",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/icon/index.ts b/src/lib/icon/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/icon/index.ts
+++ b/src/lib/icon/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/icon/public_api.ts b/src/lib/icon/public-api.ts
similarity index 100%
rename from src/lib/icon/public_api.ts
rename to src/lib/icon/public-api.ts
diff --git a/src/lib/icon/tsconfig-build.json b/src/lib/icon/tsconfig-build.json
index 34954d67357d..2863f1622ca4 100644
--- a/src/lib/icon/tsconfig-build.json
+++ b/src/lib/icon/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/icon/tsconfig-es5.json b/src/lib/icon/tsconfig-es5.json
new file mode 100644
index 000000000000..e198911c3ff1
--- /dev/null
+++ b/src/lib/icon/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/icon",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/input/index.ts b/src/lib/input/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/input/index.ts
+++ b/src/lib/input/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/input/public_api.ts b/src/lib/input/public-api.ts
similarity index 100%
rename from src/lib/input/public_api.ts
rename to src/lib/input/public-api.ts
diff --git a/src/lib/input/tsconfig-build.json b/src/lib/input/tsconfig-build.json
index 22083bcdbe92..45b212d8d299 100644
--- a/src/lib/input/tsconfig-build.json
+++ b/src/lib/input/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/input/tsconfig-es5.json b/src/lib/input/tsconfig-es5.json
new file mode 100644
index 000000000000..d525ac0e2db6
--- /dev/null
+++ b/src/lib/input/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/input",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/list/index.ts b/src/lib/list/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/list/index.ts
+++ b/src/lib/list/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/list/public_api.ts b/src/lib/list/public-api.ts
similarity index 100%
rename from src/lib/list/public_api.ts
rename to src/lib/list/public-api.ts
diff --git a/src/lib/list/tsconfig-build.json b/src/lib/list/tsconfig-build.json
index 21cbaa9d9aa3..77ea7c3f1e63 100644
--- a/src/lib/list/tsconfig-build.json
+++ b/src/lib/list/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/list/tsconfig-es5.json b/src/lib/list/tsconfig-es5.json
new file mode 100644
index 000000000000..70ed29f73566
--- /dev/null
+++ b/src/lib/list/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/list",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/menu/index.ts b/src/lib/menu/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/menu/index.ts
+++ b/src/lib/menu/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/menu/public_api.ts b/src/lib/menu/public-api.ts
similarity index 100%
rename from src/lib/menu/public_api.ts
rename to src/lib/menu/public-api.ts
diff --git a/src/lib/menu/tsconfig-build.json b/src/lib/menu/tsconfig-build.json
index c92044ad4fbb..9c56861b719f 100644
--- a/src/lib/menu/tsconfig-build.json
+++ b/src/lib/menu/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/menu/tsconfig-es5.json b/src/lib/menu/tsconfig-es5.json
new file mode 100644
index 000000000000..0ab607ca20b8
--- /dev/null
+++ b/src/lib/menu/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/menu",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/paginator/index.ts b/src/lib/paginator/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/paginator/index.ts
+++ b/src/lib/paginator/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/paginator/public_api.ts b/src/lib/paginator/public-api.ts
similarity index 100%
rename from src/lib/paginator/public_api.ts
rename to src/lib/paginator/public-api.ts
diff --git a/src/lib/paginator/tsconfig-build.json b/src/lib/paginator/tsconfig-build.json
index dc0ef8a23eca..020fbcdeb1b0 100644
--- a/src/lib/paginator/tsconfig-build.json
+++ b/src/lib/paginator/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/paginator/tsconfig-es5.json b/src/lib/paginator/tsconfig-es5.json
new file mode 100644
index 000000000000..c44fbd84a895
--- /dev/null
+++ b/src/lib/paginator/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/paginator",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/progress-bar/index.ts b/src/lib/progress-bar/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/progress-bar/index.ts
+++ b/src/lib/progress-bar/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/progress-bar/public_api.ts b/src/lib/progress-bar/public-api.ts
similarity index 100%
rename from src/lib/progress-bar/public_api.ts
rename to src/lib/progress-bar/public-api.ts
diff --git a/src/lib/progress-bar/tsconfig-build.json b/src/lib/progress-bar/tsconfig-build.json
index ec367b48b5b2..e18e92a26d6e 100644
--- a/src/lib/progress-bar/tsconfig-build.json
+++ b/src/lib/progress-bar/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/progress-bar/tsconfig-es5.json b/src/lib/progress-bar/tsconfig-es5.json
new file mode 100644
index 000000000000..de3a5147f84a
--- /dev/null
+++ b/src/lib/progress-bar/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/progress-bar",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/progress-spinner/index.ts b/src/lib/progress-spinner/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/progress-spinner/index.ts
+++ b/src/lib/progress-spinner/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/progress-spinner/public_api.ts b/src/lib/progress-spinner/public-api.ts
similarity index 100%
rename from src/lib/progress-spinner/public_api.ts
rename to src/lib/progress-spinner/public-api.ts
diff --git a/src/lib/progress-spinner/tsconfig-build.json b/src/lib/progress-spinner/tsconfig-build.json
index dc6e5bd5dbf4..fd88072e0bde 100644
--- a/src/lib/progress-spinner/tsconfig-build.json
+++ b/src/lib/progress-spinner/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/progress-spinner/tsconfig-es5.json b/src/lib/progress-spinner/tsconfig-es5.json
new file mode 100644
index 000000000000..3c36425605e9
--- /dev/null
+++ b/src/lib/progress-spinner/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/progress-spinner",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/public_api.ts b/src/lib/public-api.ts
similarity index 100%
rename from src/lib/public_api.ts
rename to src/lib/public-api.ts
diff --git a/src/lib/radio/index.ts b/src/lib/radio/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/radio/index.ts
+++ b/src/lib/radio/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/radio/public_api.ts b/src/lib/radio/public-api.ts
similarity index 100%
rename from src/lib/radio/public_api.ts
rename to src/lib/radio/public-api.ts
diff --git a/src/lib/radio/tsconfig-build.json b/src/lib/radio/tsconfig-build.json
index 463d0fc3554b..17ffa21a38b0 100644
--- a/src/lib/radio/tsconfig-build.json
+++ b/src/lib/radio/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/radio/tsconfig-es5.json b/src/lib/radio/tsconfig-es5.json
new file mode 100644
index 000000000000..ad255b05988b
--- /dev/null
+++ b/src/lib/radio/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/radio",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/select/index.ts b/src/lib/select/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/select/index.ts
+++ b/src/lib/select/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/select/public_api.ts b/src/lib/select/public-api.ts
similarity index 100%
rename from src/lib/select/public_api.ts
rename to src/lib/select/public-api.ts
diff --git a/src/lib/select/tsconfig-build.json b/src/lib/select/tsconfig-build.json
index e763b501c047..332d57b04508 100644
--- a/src/lib/select/tsconfig-build.json
+++ b/src/lib/select/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/select/tsconfig-es5.json b/src/lib/select/tsconfig-es5.json
new file mode 100644
index 000000000000..d62b57196fca
--- /dev/null
+++ b/src/lib/select/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/select",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/sidenav/index.ts b/src/lib/sidenav/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/sidenav/index.ts
+++ b/src/lib/sidenav/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/sidenav/public_api.ts b/src/lib/sidenav/public-api.ts
similarity index 100%
rename from src/lib/sidenav/public_api.ts
rename to src/lib/sidenav/public-api.ts
diff --git a/src/lib/sidenav/tsconfig-build.json b/src/lib/sidenav/tsconfig-build.json
index 68f4c0a51b27..6ab34fe3e7f9 100644
--- a/src/lib/sidenav/tsconfig-build.json
+++ b/src/lib/sidenav/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/sidenav/tsconfig-es5.json b/src/lib/sidenav/tsconfig-es5.json
new file mode 100644
index 000000000000..3dd15b1fb496
--- /dev/null
+++ b/src/lib/sidenav/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/sidenav",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/slide-toggle/index.ts b/src/lib/slide-toggle/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/slide-toggle/index.ts
+++ b/src/lib/slide-toggle/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/slide-toggle/public_api.ts b/src/lib/slide-toggle/public-api.ts
similarity index 100%
rename from src/lib/slide-toggle/public_api.ts
rename to src/lib/slide-toggle/public-api.ts
diff --git a/src/lib/slide-toggle/tsconfig-build.json b/src/lib/slide-toggle/tsconfig-build.json
index ec866d061861..f3ce8d212c49 100644
--- a/src/lib/slide-toggle/tsconfig-build.json
+++ b/src/lib/slide-toggle/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/slide-toggle/tsconfig-es5.json b/src/lib/slide-toggle/tsconfig-es5.json
new file mode 100644
index 000000000000..b97898736129
--- /dev/null
+++ b/src/lib/slide-toggle/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/slide-toggle",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/slider/index.ts b/src/lib/slider/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/slider/index.ts
+++ b/src/lib/slider/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/slider/public_api.ts b/src/lib/slider/public-api.ts
similarity index 100%
rename from src/lib/slider/public_api.ts
rename to src/lib/slider/public-api.ts
diff --git a/src/lib/slider/tsconfig-build.json b/src/lib/slider/tsconfig-build.json
index dc10c8d1a735..058c51a4f809 100644
--- a/src/lib/slider/tsconfig-build.json
+++ b/src/lib/slider/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/slider/tsconfig-es5.json b/src/lib/slider/tsconfig-es5.json
new file mode 100644
index 000000000000..99221098dfce
--- /dev/null
+++ b/src/lib/slider/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/slider",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/snack-bar/index.ts b/src/lib/snack-bar/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/snack-bar/index.ts
+++ b/src/lib/snack-bar/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/snack-bar/public_api.ts b/src/lib/snack-bar/public-api.ts
similarity index 100%
rename from src/lib/snack-bar/public_api.ts
rename to src/lib/snack-bar/public-api.ts
diff --git a/src/lib/snack-bar/tsconfig-build.json b/src/lib/snack-bar/tsconfig-build.json
index d359903ccc29..fa1a0c61f270 100644
--- a/src/lib/snack-bar/tsconfig-build.json
+++ b/src/lib/snack-bar/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/snack-bar/tsconfig-es5.json b/src/lib/snack-bar/tsconfig-es5.json
new file mode 100644
index 000000000000..37a896c2f10f
--- /dev/null
+++ b/src/lib/snack-bar/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/snack-bar",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/sort/index.ts b/src/lib/sort/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/sort/index.ts
+++ b/src/lib/sort/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/sort/public_api.ts b/src/lib/sort/public-api.ts
similarity index 100%
rename from src/lib/sort/public_api.ts
rename to src/lib/sort/public-api.ts
diff --git a/src/lib/sort/tsconfig-build.json b/src/lib/sort/tsconfig-build.json
index ec944587d015..5945b3b11575 100644
--- a/src/lib/sort/tsconfig-build.json
+++ b/src/lib/sort/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/sort/tsconfig-es5.json b/src/lib/sort/tsconfig-es5.json
new file mode 100644
index 000000000000..bb823828f668
--- /dev/null
+++ b/src/lib/sort/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/sort",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/stepper/index.ts b/src/lib/stepper/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/stepper/index.ts
+++ b/src/lib/stepper/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/stepper/public_api.ts b/src/lib/stepper/public-api.ts
similarity index 100%
rename from src/lib/stepper/public_api.ts
rename to src/lib/stepper/public-api.ts
diff --git a/src/lib/stepper/tsconfig-build.json b/src/lib/stepper/tsconfig-build.json
index 09793c4ded61..0a6ef5312c18 100644
--- a/src/lib/stepper/tsconfig-build.json
+++ b/src/lib/stepper/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/stepper/tsconfig-es5.json b/src/lib/stepper/tsconfig-es5.json
new file mode 100644
index 000000000000..8d84f1139b9d
--- /dev/null
+++ b/src/lib/stepper/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/stepper",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/table/index.ts b/src/lib/table/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/table/index.ts
+++ b/src/lib/table/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/table/public_api.ts b/src/lib/table/public-api.ts
similarity index 100%
rename from src/lib/table/public_api.ts
rename to src/lib/table/public-api.ts
diff --git a/src/lib/table/tsconfig-build.json b/src/lib/table/tsconfig-build.json
index 1f0b7ce0ec35..6db2b02dc726 100644
--- a/src/lib/table/tsconfig-build.json
+++ b/src/lib/table/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/table/tsconfig-es5.json b/src/lib/table/tsconfig-es5.json
new file mode 100644
index 000000000000..fe82cc879d3a
--- /dev/null
+++ b/src/lib/table/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/table",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/tabs/index.ts b/src/lib/tabs/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/tabs/index.ts
+++ b/src/lib/tabs/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/tabs/public_api.ts b/src/lib/tabs/public-api.ts
similarity index 100%
rename from src/lib/tabs/public_api.ts
rename to src/lib/tabs/public-api.ts
diff --git a/src/lib/tabs/tsconfig-build.json b/src/lib/tabs/tsconfig-build.json
index b86c725d3b37..5588862906c6 100644
--- a/src/lib/tabs/tsconfig-build.json
+++ b/src/lib/tabs/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/tabs/tsconfig-es5.json b/src/lib/tabs/tsconfig-es5.json
new file mode 100644
index 000000000000..67cceed8ef8a
--- /dev/null
+++ b/src/lib/tabs/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/tabs",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/toolbar/index.ts b/src/lib/toolbar/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/toolbar/index.ts
+++ b/src/lib/toolbar/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/toolbar/public_api.ts b/src/lib/toolbar/public-api.ts
similarity index 100%
rename from src/lib/toolbar/public_api.ts
rename to src/lib/toolbar/public-api.ts
diff --git a/src/lib/toolbar/tsconfig-build.json b/src/lib/toolbar/tsconfig-build.json
index 5cb7948f310d..878a5dbd9beb 100644
--- a/src/lib/toolbar/tsconfig-build.json
+++ b/src/lib/toolbar/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/toolbar/tsconfig-es5.json b/src/lib/toolbar/tsconfig-es5.json
new file mode 100644
index 000000000000..a759c38fcec4
--- /dev/null
+++ b/src/lib/toolbar/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/toolbar",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/tooltip/index.ts b/src/lib/tooltip/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/lib/tooltip/index.ts
+++ b/src/lib/tooltip/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/lib/tooltip/public_api.ts b/src/lib/tooltip/public-api.ts
similarity index 100%
rename from src/lib/tooltip/public_api.ts
rename to src/lib/tooltip/public-api.ts
diff --git a/src/lib/tooltip/tsconfig-build.json b/src/lib/tooltip/tsconfig-build.json
index 1a9490324e1f..2f969769c8c3 100644
--- a/src/lib/tooltip/tsconfig-build.json
+++ b/src/lib/tooltip/tsconfig-build.json
@@ -1,7 +1,7 @@
 {
   "extends": "../tsconfig-build",
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "../typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/tooltip/tsconfig-es5.json b/src/lib/tooltip/tsconfig-es5.json
new file mode 100644
index 000000000000..8f5505fabaa2
--- /dev/null
+++ b/src/lib/tooltip/tsconfig-es5.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../tsconfig-es5",
+  "files": [
+    "public-api.ts",
+    "../typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material/tooltip",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/tsconfig-build.json b/src/lib/tsconfig-build.json
index 8da26353210e..c161db414d67 100644
--- a/src/lib/tsconfig-build.json
+++ b/src/lib/tsconfig-build.json
@@ -1,5 +1,4 @@
-// TypeScript config file that is used to compile the library. Target environment needs to be
-// ES2015 since the build process will create FESM bundles using rollup.
+// TypeScript config file that is used to compile the library into ES2015.
 {
   "compilerOptions": {
     "declaration": true,
@@ -21,12 +20,12 @@
     "types": [],
     "baseUrl": ".",
     "paths": {
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"],
-      "@angular/material/*": ["../../dist/packages/material/*/public_api"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"],
+      "@angular/material/*": ["../../dist/packages/material/*/public-api"]
     }
   },
   "files": [
-    "public_api.ts",
+    "public-api.ts",
     "typings.d.ts"
   ],
   "angularCompilerOptions": {
diff --git a/src/lib/tsconfig-es5.json b/src/lib/tsconfig-es5.json
new file mode 100644
index 000000000000..20e6026d3e17
--- /dev/null
+++ b/src/lib/tsconfig-es5.json
@@ -0,0 +1,39 @@
+// TypeScript config file that is used to compile the library into ES5.
+// TODO: Remove this file in favor of overrides when we update to ngc 5.x
+{
+  "compilerOptions": {
+    "declaration": false,
+    "stripInternal": false,
+    "experimentalDecorators": true,
+    "noUnusedParameters": true,
+    "strictNullChecks": true,
+    "importHelpers": true,
+    "newLine": "lf",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "../../dist/packages/material/esm5",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "target": "es5",
+    "lib": ["es2015", "dom"],
+    "skipLibCheck": true,
+    "types": [],
+    "baseUrl": ".",
+    "paths": {
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"],
+      "@angular/material/*": ["../../dist/packages/material/*/public-api"]
+    }
+  },
+  "files": [
+    "public-api.ts",
+    "typings.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/lib/tsconfig-tests.json b/src/lib/tsconfig-tests.json
index 6a405806a69d..a3e422e45be2 100644
--- a/src/lib/tsconfig-tests.json
+++ b/src/lib/tsconfig-tests.json
@@ -10,7 +10,7 @@
     "types": ["jasmine"],
     "paths": {
       "@angular/material/*": ["./*"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"]
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
     }
   },
   "include": [
diff --git a/src/material-examples/index.ts b/src/material-examples/index.ts
index 4aaf8f92eda0..7e1a213e3ea5 100644
--- a/src/material-examples/index.ts
+++ b/src/material-examples/index.ts
@@ -1 +1 @@
-export * from './public_api';
+export * from './public-api';
diff --git a/src/material-examples/public_api.ts b/src/material-examples/public-api.ts
similarity index 100%
rename from src/material-examples/public_api.ts
rename to src/material-examples/public-api.ts
diff --git a/src/material-examples/tsconfig-build.json b/src/material-examples/tsconfig-build.json
index 4d04613664e0..a800246ead3e 100644
--- a/src/material-examples/tsconfig-build.json
+++ b/src/material-examples/tsconfig-build.json
@@ -20,13 +20,13 @@
     "types": [],
     "baseUrl": ".",
     "paths": {
-      "@angular/material/*": ["../../dist/packages/material/*/public_api"],
-      "@angular/material": ["../../dist/packages/material/public_api"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"]
+      "@angular/material/*": ["../../dist/packages/material/*/public-api"],
+      "@angular/material": ["../../dist/packages/material/public-api"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
     }
   },
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/material-examples/tsconfig-es5.json b/src/material-examples/tsconfig-es5.json
new file mode 100644
index 000000000000..0f6a544d8044
--- /dev/null
+++ b/src/material-examples/tsconfig-es5.json
@@ -0,0 +1,38 @@
+// TypeScript config file that is used to compile the examples. Target environment needs to be
+// ES2015 since the build process will create FESM bundles using rollup.
+{
+  "compilerOptions": {
+    "declaration": false,
+    "stripInternal": false,
+    "experimentalDecorators": true,
+    "noUnusedParameters": true,
+    "strictNullChecks": true,
+    "importHelpers": true,
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "../../dist/packages/material-examples/esm5",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "target": "es5",
+    "lib": ["es2015", "dom"],
+    "skipLibCheck": true,
+    "types": [],
+    "baseUrl": ".",
+    "paths": {
+      "@angular/material/*": ["../../dist/packages/material/*/public-api"],
+      "@angular/material": ["../../dist/packages/material/public-api"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
+    }
+  },
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material-examples",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/material-examples/tsconfig.json b/src/material-examples/tsconfig.json
index 3e4fa9c6417d..f7f702c1c807 100644
--- a/src/material-examples/tsconfig.json
+++ b/src/material-examples/tsconfig.json
@@ -7,7 +7,7 @@
     "paths": {
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
-      "@angular/material": ["../lib/public_api.ts"]
+      "@angular/material": ["../lib/public-api.ts"]
     }
   },
   "include": ["./**/*.ts"]
diff --git a/src/material-moment-adapter/index.ts b/src/material-moment-adapter/index.ts
index f93e7c31d564..d6e71197ad19 100644
--- a/src/material-moment-adapter/index.ts
+++ b/src/material-moment-adapter/index.ts
@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './public_api';
+export * from './public-api';
diff --git a/src/material-moment-adapter/public_api.ts b/src/material-moment-adapter/public-api.ts
similarity index 100%
rename from src/material-moment-adapter/public_api.ts
rename to src/material-moment-adapter/public-api.ts
diff --git a/src/material-moment-adapter/tsconfig-build.json b/src/material-moment-adapter/tsconfig-build.json
index 8aeaea2f87d6..d1cc7b1e9d54 100644
--- a/src/material-moment-adapter/tsconfig-build.json
+++ b/src/material-moment-adapter/tsconfig-build.json
@@ -1,5 +1,4 @@
-// TypeScript config file that is used to compile the moment-adapter package. Target environment
-// needs to be ES2015 since the build process will create FESM bundles using rollup.
+// TypeScript config file that is used to compile the moment-adapter package into ES2015.
 {
   "compilerOptions": {
     // Needed for Moment.js since it doesn't have a default export.
@@ -23,13 +22,13 @@
     "skipLibCheck": true,
     "types": [],
     "paths": {
-      "@angular/material/*": ["../../dist/packages/material/*/public_api"],
-      "@angular/material": ["../../dist/packages/material/public_api"],
-      "@angular/cdk/*": ["../../dist/packages/cdk/*/public_api"]
+      "@angular/material/*": ["../../dist/packages/material/*/public-api"],
+      "@angular/material": ["../../dist/packages/material/public-api"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
     }
   },
   "files": [
-    "public_api.ts"
+    "public-api.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
diff --git a/src/material-moment-adapter/tsconfig-es5.json b/src/material-moment-adapter/tsconfig-es5.json
new file mode 100644
index 000000000000..2e98923ce36b
--- /dev/null
+++ b/src/material-moment-adapter/tsconfig-es5.json
@@ -0,0 +1,41 @@
+// TypeScript config file that is used to compile the moment-adapter package into ES5.
+// TODO: Remove this file in favor of overrides when we update to ngc 5.x
+{
+  "compilerOptions": {
+    // Needed for Moment.js since it doesn't have a default export.
+    "allowSyntheticDefaultImports": true,
+    "baseUrl": ".",
+    "declaration": false,
+    "stripInternal": false,
+    "experimentalDecorators": true,
+    "noUnusedParameters": true,
+    "strictNullChecks": true,
+    "importHelpers": true,
+    "newLine": "lf",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "../../dist/packages/material-moment-adapter/esm5",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "target": "es5",
+    "lib": ["es2015", "dom"],
+    "skipLibCheck": true,
+    "types": [],
+    "paths": {
+      "@angular/material/*": ["../../dist/packages/material/*/public-api"],
+      "@angular/material": ["../../dist/packages/material/public-api"],
+      "@angular/cdk/*": ["../../dist/packages/cdk/*/public-api"]
+    }
+  },
+  "files": [
+    "public-api.ts"
+  ],
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/material-moment-adapter",
+    "skipTemplateCodegen": true
+  }
+}
diff --git a/src/material-moment-adapter/tsconfig.json b/src/material-moment-adapter/tsconfig.json
index 3e4fa9c6417d..f7f702c1c807 100644
--- a/src/material-moment-adapter/tsconfig.json
+++ b/src/material-moment-adapter/tsconfig.json
@@ -7,7 +7,7 @@
     "paths": {
       "@angular/cdk/*": ["../cdk/*"],
       "@angular/material/*": ["../lib/*"],
-      "@angular/material": ["../lib/public_api.ts"]
+      "@angular/material": ["../lib/public-api.ts"]
     }
   },
   "include": ["./**/*.ts"]
diff --git a/test/karma-test-shim.js b/test/karma-test-shim.js
index 2712689e5335..ed4d8b4cddff 100644
--- a/test/karma-test-shim.js
+++ b/test/karma-test-shim.js
@@ -48,7 +48,7 @@ System.config({
 
     // Path mappings for local packages that can be imported inside of tests.
     // TODO(devversion): replace once the index.ts file for the Material package has been added.
-    '@angular/material': 'dist/packages/material/public_api.js',
+    '@angular/material': 'dist/packages/material/public-api.js',
     '@angular/cdk': 'dist/packages/cdk/index.js',
     '@angular/cdk/a11y': 'dist/packages/cdk/a11y/index.js',
     '@angular/cdk/bidi': 'dist/packages/cdk/bidi/index.js',
diff --git a/tools/package-tools/build-bundles.ts b/tools/package-tools/build-bundles.ts
index 8fd0ea387f5e..ae06de1ddc19 100644
--- a/tools/package-tools/build-bundles.ts
+++ b/tools/package-tools/build-bundles.ts
@@ -1,8 +1,5 @@
 import {join, dirname} from 'path';
-import {ScriptTarget, ModuleKind, NewLineKind} from 'typescript';
 import {uglifyJsFile} from './minify-sources';
-import {remapSourcemap} from './sourcemap-remap';
-import {transpileFile} from './typescript-transpile';
 import {buildConfig} from './build-config';
 import {BuildPackage} from './build-package';
 import {rollupRemoveLicensesPlugin} from './rollup-remove-licenses';
@@ -36,6 +33,7 @@ export class PackageBundler {
 
     return this.bundleEntryPoint({
       entryFile: this.buildPackage.entryFilePath,
+      esm5EntryFile: join(this.buildPackage.esm5OutputDir, 'index.js'),
       moduleName: `ng.${this.buildPackage.name}`,
       esm2015Dest: join(bundlesDir, `${packageName}.js`),
       esm5Dest: join(bundlesDir, `${packageName}.es5.js`),
@@ -48,9 +46,11 @@ export class PackageBundler {
   private async bundleSecondaryEntryPoint(entryPoint: string) {
     const packageName = this.buildPackage.name;
     const entryFile = join(this.buildPackage.outputDir, entryPoint, 'index.js');
+    const esm5EntryFile = join(this.buildPackage.esm5OutputDir, entryPoint, 'index.js');
 
     return this.bundleEntryPoint({
       entryFile,
+      esm5EntryFile,
       moduleName: `ng.${packageName}.${entryPoint}`,
       esm2015Dest: join(bundlesDir, `${packageName}`, `${entryPoint}.js`),
       esm5Dest: join(bundlesDir, `${packageName}`, `${entryPoint}.es5.js`),
@@ -66,6 +66,7 @@ export class PackageBundler {
    */
   private async bundleEntryPoint(config: BundlesConfig) {
     // Build FESM-2015 bundle file.
+    // TODO: re-add sorcery when we upgrade to Angular 5.x
     await this.createRollupBundle({
       moduleName: config.moduleName,
       entry: config.entryFile,
@@ -73,20 +74,17 @@ export class PackageBundler {
       format: 'es',
     });
 
-    await remapSourcemap(config.esm2015Dest);
-
-    // Downlevel ES2015 bundle to ES5.
-    transpileFile(config.esm2015Dest, config.esm5Dest, {
-      importHelpers: true,
-      target: ScriptTarget.ES5,
-      module: ModuleKind.ES2015,
-      allowJs: true,
-      newLine: NewLineKind.LineFeed
+    // Build FESM-5 bundle file.
+    // TODO: re-add sorcery when we upgrade to Angular 5.x
+    await this.createRollupBundle({
+      moduleName: config.moduleName,
+      entry: config.esm5EntryFile,
+      dest: config.esm5Dest,
+      format: 'es',
     });
 
-    await remapSourcemap(config.esm5Dest);
-
     // Create UMD bundle of ES5 output.
+    // TODO: re-add sorcery when we upgrade to Angular 5.x
     await this.createRollupBundle({
       moduleName: config.moduleName,
       entry: config.esm5Dest,
@@ -94,12 +92,9 @@ export class PackageBundler {
       format: 'umd'
     });
 
-    await remapSourcemap(config.umdDest);
-
     // Create a minified UMD bundle using UglifyJS
+    // TODO: re-add sorcery when we upgrade to Angular 5.x
     uglifyJsFile(config.umdDest, config.umdMinDest);
-
-    await remapSourcemap(config.umdMinDest);
   }
 
   /** Creates a rollup bundle of a specified JavaScript file.*/
@@ -182,6 +177,7 @@ export class PackageBundler {
 /** Configuration for creating library bundles. */
 interface BundlesConfig {
   entryFile: string;
+  esm5EntryFile: string;
   moduleName: string;
   esm2015Dest: string;
   esm5Dest: string;
diff --git a/tools/package-tools/build-notes.md b/tools/package-tools/build-notes.md
new file mode 100644
index 000000000000..f3a397436469
--- /dev/null
+++ b/tools/package-tools/build-notes.md
@@ -0,0 +1,20 @@
+In order to ensure our source maps trace back properly (and code 
+size analysis tools can use these maps), we have made some changes 
+to our build process. These changes will align with angular/angular's 
+build process while we wait to update to Angular 5.x.
+
+* Instead of downleveling to ES2015, creating a Rollup bundle, then 
+transpiling that bundle down to ES5, we now downlevel to both ES2015 
+and ES5, then create separate Rollup bundles for each. Note: We have to 
+use NGC for both ES2015 and ES5 downleveling (rather than using TSC for 
+the second pass and copying over flat files) because TSC generates 
+decorator code that build-optimizer is not designed to support. For now, 
+decorators must be passed through NGC.
+
+* We are removing sorcery until we can upgrade tsickle and ngc to latest. 
+Our versions of these break when mapping all the way back to TS. 
+(temporary)
+
+* We have to add separate tsconfigs for transpiling to ES5 because our 
+version of ngc doesn't allow overrides. When we update to compiler-cli 
+5.x, we should be able to remove these files. (temporary)
diff --git a/tools/package-tools/build-package.ts b/tools/package-tools/build-package.ts
index ba6b32276089..6c357ad8e3ed 100644
--- a/tools/package-tools/build-package.ts
+++ b/tools/package-tools/build-package.ts
@@ -7,9 +7,12 @@ import {compileEntryPoint, renamePrivateReExportsToBeUnique} from './compile-ent
 
 const {packagesDir, outputDir} = buildConfig;
 
-/** Name of the tsconfig file that is responsible for building a package. */
+/** Name of the tsconfig file that is responsible for building an ES2015 package. */
 const buildTsconfigName = 'tsconfig-build.json';
 
+/** Name of the tsconfig file that is responsible for building an ES5 package. */
+const es5TsconfigName = 'tsconfig-es5.json';
+
 /** Name of the tsconfig file that is responsible for building the tests. */
 const testsTsconfigName = 'tsconfig-tests.json';
 
@@ -17,9 +20,12 @@ export class BuildPackage {
   /** Path to the package sources. */
   sourceDir: string;
 
-  /** Path to the package output. */
+  /** Path to the ES2015 package output. */
   outputDir: string;
 
+  /** Path to the ES5 package output. */
+  esm5OutputDir: string;
+
   /** Whether this package will re-export its secondary-entry points at the root module. */
   exportsSecondaryEntryPointsAtRoot = false;
 
@@ -55,6 +61,7 @@ export class BuildPackage {
   constructor(public readonly name: string, public readonly dependencies: BuildPackage[] = []) {
     this.sourceDir = join(packagesDir, name);
     this.outputDir = join(outputDir, 'packages', name);
+    this.esm5OutputDir = join(outputDir, 'packages', name, 'esm5');
 
     this.tsconfigBuild = join(this.sourceDir, buildTsconfigName);
     this.tsconfigTests = join(this.sourceDir, testsTsconfigName);
@@ -70,11 +77,11 @@ export class BuildPackage {
     // Depth 1: a11y, scrolling
     // Depth 2: overlay
     for (const entryPointGroup of this.secondaryEntryPointsByDepth) {
-      await Promise.all(entryPointGroup.map(p => compileEntryPoint(this, buildTsconfigName, p)));
+      await Promise.all(entryPointGroup.map(p => this._compileBothTargets(p)));
     }
 
     // Compile the primary entry-point.
-    await compileEntryPoint(this, buildTsconfigName);
+    await this._compileBothTargets();
   }
 
   /** Compiles the TypeScript test source files for the package. */
@@ -87,6 +94,13 @@ export class BuildPackage {
     await this.bundler.createBundles();
   }
 
+  /** Compiles TS into both ES2015 and ES5, then updates exports. */
+  private async _compileBothTargets(p = '') {
+    return compileEntryPoint(this, buildTsconfigName, p)
+        .then(() => compileEntryPoint(this, es5TsconfigName, p))
+        .then(() => renamePrivateReExportsToBeUnique(this, p));
+  }
+
   /** Compiles the TypeScript sources of a primary or secondary entry point. */
   private async _compileTestEntryPoint(tsconfigName: string, secondaryEntryPoint = '') {
     const entryPointPath = join(this.sourceDir, secondaryEntryPoint);
diff --git a/tools/package-tools/compile-entry-point.ts b/tools/package-tools/compile-entry-point.ts
index 40dd9b2d46b0..db7176adbc5e 100644
--- a/tools/package-tools/compile-entry-point.ts
+++ b/tools/package-tools/compile-entry-point.ts
@@ -24,8 +24,7 @@ export async function compileEntryPoint(buildPackage: BuildPackage, tsconfigName
 
     childProcess.on('exit', (exitCode: number) => exitCode === 0 ? resolve() : reject());
   })
-    .catch(() => console.error(red(`Failed to compile ${secondaryEntryPoint}`)))
-    .then(() => renamePrivateReExportsToBeUnique(buildPackage, secondaryEntryPoint));
+    .catch(() => console.error(red(`Failed to compile ${secondaryEntryPoint}`)));
 }
 
 /** Renames `ɵa`-style re-exports generated by Angular to be unique across compilation units. */
@@ -39,10 +38,18 @@ export function renamePrivateReExportsToBeUnique(buildPackage: BuildPackage,
   if (buildPackage.exportsSecondaryEntryPointsAtRoot && secondaryEntryPoint) {
     const entryPointId = nextId++;
     const outputPath = join(buildPackage.outputDir, secondaryEntryPoint);
-    glob(join(outputPath, '**/*.+(js|d.ts|metadata.json)')).forEach(filePath => {
-      let fileContent = readFileSync(filePath, 'utf-8');
-      fileContent = fileContent.replace(/(ɵ[a-z]+)/g, `$1${entryPointId}`);
-      writeFileSync(filePath, fileContent, 'utf-8');
-    });
+    const esm5OutputPath = join(buildPackage.esm5OutputDir, secondaryEntryPoint);
+
+    addIdToGlob(outputPath, entryPointId);
+    addIdToGlob(esm5OutputPath, entryPointId);
   }
 }
+
+/** Updates exports in designated folder with identifier specified. */
+function addIdToGlob(outputPath: string, entryPointId: number): void {
+  glob(join(outputPath, '**/*.+(js|d.ts|metadata.json)')).forEach(filePath => {
+    let fileContent = readFileSync(filePath, 'utf-8');
+    fileContent = fileContent.replace(/(ɵ[a-z]+)/g, `$1${entryPointId}`);
+    writeFileSync(filePath, fileContent, 'utf-8');
+  });
+}
diff --git a/tools/package-tools/gulp/build-tasks-gulp.ts b/tools/package-tools/gulp/build-tasks-gulp.ts
index 39731bfed111..675306ee73f6 100644
--- a/tools/package-tools/gulp/build-tasks-gulp.ts
+++ b/tools/package-tools/gulp/build-tasks-gulp.ts
@@ -82,6 +82,7 @@ export function createPackageBuildTasks(buildPackage: BuildPackage) {
    */
   task(`${taskName}:assets`, [
     `${taskName}:assets:scss`,
+    `${taskName}:assets:es5-scss`,
     `${taskName}:assets:copy-styles`,
     `${taskName}:assets:html`
   ]);
@@ -90,11 +91,19 @@ export function createPackageBuildTasks(buildPackage: BuildPackage) {
     buildPackage.outputDir, buildPackage.sourceDir, true)
   );
 
+  task(`${taskName}:assets:es5-scss`, buildScssTask(
+      buildPackage.esm5OutputDir, buildPackage.sourceDir, true)
+  );
+
   task(`${taskName}:assets:copy-styles`, () => {
-    return src(stylesGlob).pipe(dest(buildPackage.outputDir));
+    return src(stylesGlob)
+        .pipe(dest(buildPackage.outputDir))
+        .pipe(dest(buildPackage.esm5OutputDir));
   });
   task(`${taskName}:assets:html`, () => {
-    return src(htmlGlob).pipe(htmlmin(htmlMinifierOptions)).pipe(dest(buildPackage.outputDir));
+    return src(htmlGlob).pipe(htmlmin(htmlMinifierOptions))
+        .pipe(dest(buildPackage.outputDir))
+        .pipe(dest(buildPackage.esm5OutputDir));
   });
 
   task(`${taskName}:assets:inline`, () => inlineResourcesForDirectory(buildPackage.outputDir));