diff --git a/src/google-maps/google-map/google-map-module.ts b/src/google-maps/google-map/google-map-module.ts
deleted file mode 100644
index 486899c06199..000000000000
--- a/src/google-maps/google-map/google-map-module.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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
- */
-
-import {NgModule} from '@angular/core';
-
-import {GoogleMap} from './google-map';
-
-@NgModule({
-  exports: [GoogleMap],
-  declarations: [GoogleMap],
-})
-export class GoogleMapModule {
-}
diff --git a/src/google-maps/google-map/google-map.spec.ts b/src/google-maps/google-map/google-map.spec.ts
index f3de7fc8ac95..70be04e65ef9 100644
--- a/src/google-maps/google-map/google-map.spec.ts
+++ b/src/google-maps/google-map/google-map.spec.ts
@@ -2,21 +2,20 @@ import {Component} from '@angular/core';
 import {async, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 
-import {MapMarker, MapMarkerModule} from '../map-marker/index';
+import {GoogleMapsModule} from '../google-maps-module';
+import {MapMarker} from '../map-marker/map-marker';
 import {
   createMapConstructorSpy,
   createMapSpy,
   TestingWindow
 } from '../testing/fake-google-map-utils';
-
 import {
   DEFAULT_HEIGHT,
   DEFAULT_OPTIONS,
   DEFAULT_WIDTH,
   GoogleMap,
-  GoogleMapModule,
   UpdatedGoogleMap
-} from './index';
+} from './google-map';
 
 /** Represents boundaries of a map to be used in tests. */
 const testBounds: google.maps.LatLngBoundsLiteral = {
@@ -39,8 +38,7 @@ describe('GoogleMap', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
-        GoogleMapModule,
-        MapMarkerModule,
+        GoogleMapsModule,
       ],
       declarations: [TestApp],
     });
diff --git a/src/google-maps/google-map/google-map.ts b/src/google-maps/google-map/google-map.ts
index 81963bf8f4b2..ffc6e5fa9c7d 100644
--- a/src/google-maps/google-map/google-map.ts
+++ b/src/google-maps/google-map/google-map.ts
@@ -24,7 +24,7 @@ import {
 import {BehaviorSubject, combineLatest, Observable, Subject} from 'rxjs';
 import {map, shareReplay, take, takeUntil} from 'rxjs/operators';
 
-import {MapMarker} from '../map-marker/index';
+import {MapMarker} from '../map-marker/map-marker';
 
 interface GoogleMapsWindow extends Window {
   google?: typeof google;
diff --git a/src/google-maps/google-map/index.ts b/src/google-maps/google-map/index.ts
deleted file mode 100644
index 34b16fbeddf7..000000000000
--- a/src/google-maps/google-map/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 './google-map';
-export * from './google-map-module';
diff --git a/src/google-maps/google-maps-module.ts b/src/google-maps/google-maps-module.ts
index 28c81e47a38a..ed3c29c193fd 100644
--- a/src/google-maps/google-maps-module.ts
+++ b/src/google-maps/google-maps-module.ts
@@ -8,21 +8,20 @@
 
 import {NgModule} from '@angular/core';
 
-import {GoogleMap, GoogleMapModule} from './google-map/index';
-import {MapInfoWindow, MapInfoWindowModule} from './map-info-window/index';
-import {MapMarker, MapMarkerModule} from './map-marker/index';
+import {GoogleMap} from './google-map/google-map';
+import {MapInfoWindow} from './map-info-window/map-info-window';
+import {MapMarker} from './map-marker/map-marker';
+
+const COMPONENTS = [
+  GoogleMap,
+  MapInfoWindow,
+  MapMarker,
+  MapInfoWindow,
+];
 
 @NgModule({
-  imports: [
-    GoogleMapModule,
-    MapInfoWindowModule,
-    MapMarkerModule,
-  ],
-  exports: [
-    GoogleMap,
-    MapInfoWindow,
-    MapMarker,
-  ],
+  declarations: COMPONENTS,
+  exports: COMPONENTS,
 })
 export class GoogleMapsModule {
 }
diff --git a/src/google-maps/map-info-window/index.ts b/src/google-maps/map-info-window/index.ts
deleted file mode 100644
index 46f6e6539a4d..000000000000
--- a/src/google-maps/map-info-window/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 './map-info-window';
-export * from './map-info-window-module';
diff --git a/src/google-maps/map-info-window/map-info-window-module.ts b/src/google-maps/map-info-window/map-info-window-module.ts
deleted file mode 100644
index de7eed77138b..000000000000
--- a/src/google-maps/map-info-window/map-info-window-module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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
- */
-
-import {NgModule} from '@angular/core';
-import {MapInfoWindow} from './map-info-window';
-
-@NgModule({
-  exports: [MapInfoWindow],
-  declarations: [MapInfoWindow],
-})
-export class MapInfoWindowModule {
-}
diff --git a/src/google-maps/map-info-window/map-info-window.spec.ts b/src/google-maps/map-info-window/map-info-window.spec.ts
index c7f488434c37..b2346630dbe1 100644
--- a/src/google-maps/map-info-window/map-info-window.spec.ts
+++ b/src/google-maps/map-info-window/map-info-window.spec.ts
@@ -2,8 +2,8 @@ import {Component} from '@angular/core';
 import {async, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 
-import {DEFAULT_OPTIONS, GoogleMapModule, UpdatedGoogleMap} from '../google-map/index';
-import {MapMarker} from '../map-marker/index';
+import {DEFAULT_OPTIONS, UpdatedGoogleMap} from '../google-map/google-map';
+import {MapMarker} from '../map-marker/map-marker';
 import {
   createInfoWindowConstructorSpy,
   createInfoWindowSpy,
@@ -12,17 +12,15 @@ import {
   TestingWindow
 } from '../testing/fake-google-map-utils';
 
-import {MapInfoWindow, MapInfoWindowModule} from './index';
+import {GoogleMapsModule} from '../google-maps-module';
+import {MapInfoWindow} from './map-info-window';
 
 describe('MapInfoWindow', () => {
   let mapSpy: jasmine.SpyObj<UpdatedGoogleMap>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [
-        GoogleMapModule,
-        MapInfoWindowModule,
-      ],
+      imports: [GoogleMapsModule],
       declarations: [TestApp],
     });
   }));
diff --git a/src/google-maps/map-info-window/map-info-window.ts b/src/google-maps/map-info-window/map-info-window.ts
index 11136f8c82e7..efb9c747bcf2 100644
--- a/src/google-maps/map-info-window/map-info-window.ts
+++ b/src/google-maps/map-info-window/map-info-window.ts
@@ -18,8 +18,8 @@ import {
 import {BehaviorSubject, combineLatest, Observable, Subject} from 'rxjs';
 import {map, takeUntil} from 'rxjs/operators';
 
-import {GoogleMap} from '../google-map/index';
-import {MapMarker} from '../map-marker/index';
+import {GoogleMap} from '../google-map/google-map';
+import {MapMarker} from '../map-marker/map-marker';
 
 /**
  * Angular component that renders a Google Maps info window via the Google Maps JavaScript API.
diff --git a/src/google-maps/map-marker/index.ts b/src/google-maps/map-marker/index.ts
deleted file mode 100644
index 6e68afdc7e09..000000000000
--- a/src/google-maps/map-marker/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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 './map-marker';
-export * from './map-marker-module';
diff --git a/src/google-maps/map-marker/map-marker-module.ts b/src/google-maps/map-marker/map-marker-module.ts
deleted file mode 100644
index 6752cd28eae8..000000000000
--- a/src/google-maps/map-marker/map-marker-module.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @license
- * Copyright Google LLC 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
- */
-
-import {NgModule} from '@angular/core';
-import {MapMarker} from './map-marker';
-
-@NgModule({
-  exports: [MapMarker],
-  declarations: [MapMarker],
-})
-export class MapMarkerModule {
-}
diff --git a/src/google-maps/map-marker/map-marker.spec.ts b/src/google-maps/map-marker/map-marker.spec.ts
index 047fe764b02f..1f27a4359f41 100644
--- a/src/google-maps/map-marker/map-marker.spec.ts
+++ b/src/google-maps/map-marker/map-marker.spec.ts
@@ -8,12 +8,13 @@ import {
   TestingWindow
 } from '../testing/fake-google-map-utils';
 
-import {DEFAULT_MARKER_OPTIONS, MapMarker, MapMarkerModule} from './index';
+import {GoogleMapsModule} from '../google-maps-module';
+import {DEFAULT_MARKER_OPTIONS, MapMarker} from './map-marker';
 
 describe('MapMarker', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MapMarkerModule],
+      imports: [GoogleMapsModule],
       declarations: [TestApp],
     });
   }));
diff --git a/src/google-maps/public-api.ts b/src/google-maps/public-api.ts
index a16afad5b4df..c80c17faf5b9 100644
--- a/src/google-maps/public-api.ts
+++ b/src/google-maps/public-api.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export {GoogleMap} from './google-map/index';
-export {MapInfoWindow} from './map-info-window/index';
-export {MapMarker} from './map-marker/index';
-export * from './google-maps-module';
+export {GoogleMap} from './google-map/google-map';
+export {MapMarker} from './map-marker/map-marker';
+export {GoogleMapsModule} from './google-maps-module';
+export {MapInfoWindow} from './map-info-window/map-info-window';
diff --git a/src/google-maps/testing/fake-google-map-utils.ts b/src/google-maps/testing/fake-google-map-utils.ts
index 5f5988efc736..e0c3bd5b54f2 100644
--- a/src/google-maps/testing/fake-google-map-utils.ts
+++ b/src/google-maps/testing/fake-google-map-utils.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {UpdatedGoogleMap} from '../google-map/index';
+import {UpdatedGoogleMap} from '../google-map/google-map';
 
 /** Window interface for testing */
 export interface TestingWindow extends Window {