diff --git a/src/lib/core/a11y/_a11y.scss b/src/cdk/a11y/_a11y.scss
similarity index 100%
rename from src/lib/core/a11y/_a11y.scss
rename to src/cdk/a11y/_a11y.scss
diff --git a/src/cdk/a11y/focus-monitor.spec.ts b/src/cdk/a11y/focus-monitor.spec.ts
index a2b8fbfbb5a8..41370ab208ce 100644
--- a/src/cdk/a11y/focus-monitor.spec.ts
+++ b/src/cdk/a11y/focus-monitor.spec.ts
@@ -1,10 +1,10 @@
-import {ComponentFixture, inject, TestBed, fakeAsync, tick} from '@angular/core/testing';
-import {Component, Renderer2} from '@angular/core';
-import {A11yModule} from './index';
-import {By} from '@angular/platform-browser';
 import {TAB} from '@angular/cdk/keycodes';
-import {FocusOrigin, FocusMonitor, TOUCH_BUFFER_MS} from './focus-monitor';
 import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
+import {Component, Renderer2} from '@angular/core';
+import {ComponentFixture, fakeAsync, inject, TestBed, tick} from '@angular/core/testing';
+import {By} from '@angular/platform-browser';
+import {FocusMonitor, FocusOrigin, TOUCH_BUFFER_MS} from './focus-monitor';
+import {A11yModule} from './index';
 
 
 describe('FocusMonitor', () => {
diff --git a/src/cdk/a11y/focus-monitor.ts b/src/cdk/a11y/focus-monitor.ts
index 6ed78b200df3..d3a5fd61c68a 100644
--- a/src/cdk/a11y/focus-monitor.ts
+++ b/src/cdk/a11y/focus-monitor.ts
@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {Platform} from '@angular/cdk/platform';
 import {
   Directive,
   ElementRef,
@@ -18,11 +19,10 @@ import {
   Renderer2,
   SkipSelf,
 } from '@angular/core';
-import {Platform} from '@angular/cdk/platform';
 import {Observable} from 'rxjs/Observable';
+import {of as observableOf} from 'rxjs/observable/of';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
-import {of as observableOf} from 'rxjs/observable/of';
 
 
 // This is the value used by AngularJS Material. Through trial and error (on iPhone 6S) they found
diff --git a/src/cdk/a11y/focus-trap.spec.ts b/src/cdk/a11y/focus-trap.spec.ts
index 28d07e46842c..4ccae5688498 100644
--- a/src/cdk/a11y/focus-trap.spec.ts
+++ b/src/cdk/a11y/focus-trap.spec.ts
@@ -1,8 +1,8 @@
-import {ComponentFixture, TestBed, async} from '@angular/core/testing';
+import {Platform} from '@angular/cdk/platform';
 import {Component, ViewChild} from '@angular/core';
-import {FocusTrapFactory, FocusTrapDirective, FocusTrap} from './focus-trap';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {FocusTrap, FocusTrapDirective, FocusTrapFactory} from './focus-trap';
 import {InteractivityChecker} from './interactivity-checker';
-import {Platform} from '../platform/platform';
 
 
 describe('FocusTrap', () => {
diff --git a/src/cdk/a11y/interactivity-checker.spec.ts b/src/cdk/a11y/interactivity-checker.spec.ts
index 3f28acb8b905..23473eb5ded6 100644
--- a/src/cdk/a11y/interactivity-checker.spec.ts
+++ b/src/cdk/a11y/interactivity-checker.spec.ts
@@ -1,5 +1,6 @@
+import {Platform} from '@angular/cdk/platform';
 import {InteractivityChecker} from './interactivity-checker';
-import {Platform} from '../platform/platform';
+
 
 describe('InteractivityChecker', () => {
   let testContainerElement: HTMLElement;
diff --git a/src/cdk/a11y/list-key-manager.spec.ts b/src/cdk/a11y/list-key-manager.spec.ts
index 499b5a628266..012fa45d8e9b 100644
--- a/src/cdk/a11y/list-key-manager.spec.ts
+++ b/src/cdk/a11y/list-key-manager.spec.ts
@@ -1,11 +1,11 @@
+import {DOWN_ARROW, TAB, UP_ARROW} from '@angular/cdk/keycodes';
+import {first} from '@angular/cdk/rxjs';
 import {QueryList} from '@angular/core';
 import {fakeAsync, tick} from '@angular/core/testing';
+import {createKeyboardEvent} from '../testing/event-objects';
+import {ActiveDescendantKeyManager} from './activedescendant-key-manager';
 import {FocusKeyManager} from './focus-key-manager';
-import {DOWN_ARROW, UP_ARROW, TAB} from '../keycodes/keycodes';
 import {ListKeyManager} from './list-key-manager';
-import {ActiveDescendantKeyManager} from './activedescendant-key-manager';
-import {createKeyboardEvent} from '../testing/event-objects';
-import {first} from '../rxjs/index';
 
 
 class FakeFocusable {
diff --git a/src/lib/core/portal/portal-injector.ts b/src/cdk/portal/portal-injector.ts
similarity index 100%
rename from src/lib/core/portal/portal-injector.ts
rename to src/cdk/portal/portal-injector.ts
diff --git a/src/cdk/portal/public_api.ts b/src/cdk/portal/public_api.ts
index 3006ee0af57d..253d39a60f41 100644
--- a/src/cdk/portal/public_api.ts
+++ b/src/cdk/portal/public_api.ts
@@ -9,3 +9,4 @@
 export * from './portal';
 export * from './dom-portal-host';
 export * from './portal-directives';
+export * from './portal-injector';
diff --git a/src/demo-app/snack-bar/snack-bar-demo.ts b/src/demo-app/snack-bar/snack-bar-demo.ts
index 8138d60796a1..334959021f81 100644
--- a/src/demo-app/snack-bar/snack-bar-demo.ts
+++ b/src/demo-app/snack-bar/snack-bar-demo.ts
@@ -1,12 +1,13 @@
+import {Dir} from '@angular/cdk/bidi';
 import {Component, ViewEncapsulation} from '@angular/core';
 import {
   MdSnackBar,
   MdSnackBarConfig,
   MdSnackBarHorizontalPosition,
   MdSnackBarVerticalPosition,
-  Dir,
 } from '@angular/material';
 
+
 @Component({
   moduleId: module.id,
   selector: 'snack-bar-demo',
@@ -25,7 +26,8 @@ export class SnackBarDemo {
   horizontalPosition: MdSnackBarHorizontalPosition = 'center';
   verticalPosition: MdSnackBarVerticalPosition = 'bottom';
 
-  constructor(public snackBar: MdSnackBar, private dir: Dir) { }
+  constructor(public snackBar: MdSnackBar, private dir: Dir) {
+  }
 
   open() {
     let config = new MdSnackBarConfig();
diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
index 308382a9c0f9..e4886f42dd1d 100644
--- a/src/lib/autocomplete/autocomplete.spec.ts
+++ b/src/lib/autocomplete/autocomplete.spec.ts
@@ -1,4 +1,9 @@
-import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
+import {Direction, Directionality} from '@angular/cdk/bidi';
+import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
+import {OverlayContainer} from '@angular/cdk/overlay';
+import {map, RxChain, startWith} from '@angular/cdk/rxjs';
+import {ScrollDispatcher} from '@angular/cdk/scrolling';
+import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -8,28 +13,23 @@ import {
   ViewChild,
   ViewChildren,
 } from '@angular/core';
+import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
+import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {MdOption} from '@angular/material/core';
+import {MdFormField, MdFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {ScrollDispatcher} from '@angular/cdk/scrolling';
-import {OverlayContainer} from '@angular/cdk/overlay';
-import {Direction, Directionality} from '@angular/cdk/bidi';
-import {map, RxChain, startWith} from '@angular/cdk/rxjs';
-import {createKeyboardEvent, dispatchFakeEvent, typeInElement} from '@angular/cdk/testing';
+import {Observable} from 'rxjs/Observable';
+import {Subject} from 'rxjs/Subject';
+import {Subscription} from 'rxjs/Subscription';
+import {MdInputModule} from '../input/index';
 import {
   getMdAutocompleteMissingPanelError,
   MdAutocomplete,
   MdAutocompleteModule,
-  MdAutocompleteTrigger,
   MdAutocompleteSelectedEvent,
+  MdAutocompleteTrigger,
 } from './index';
-import {MdInputModule} from '../input/index';
-import {Subscription} from 'rxjs/Subscription';
-import {DOWN_ARROW, ENTER, ESCAPE, SPACE, UP_ARROW} from '@angular/material/core';
-import {MdOption} from '@angular/material/core';
-import {MdFormField, MdFormFieldModule} from '@angular/material/form-field';
-import {Observable} from 'rxjs/Observable';
-import {Subject} from 'rxjs/Subject';
 
 
 describe('MdAutocomplete', () => {
diff --git a/src/lib/button-toggle/button-toggle.scss b/src/lib/button-toggle/button-toggle.scss
index d77f94181edc..ea408e5505bb 100644
--- a/src/lib/button-toggle/button-toggle.scss
+++ b/src/lib/button-toggle/button-toggle.scss
@@ -1,4 +1,3 @@
-@import '../core/a11y/a11y';
 @import '../core/style/elevation';
 @import '../core/style/vendor-prefixes';
 @import '../core/style/layout-common';
diff --git a/src/lib/button/button.scss b/src/lib/button/button.scss
index 89bf063c6bf7..277c0be3f9a7 100644
--- a/src/lib/button/button.scss
+++ b/src/lib/button/button.scss
@@ -1,7 +1,7 @@
 // TODO(jelbourn): Measure perf benefits for translate3d and will-change.
 // TODO(jelbourn): Figure out if anchor hover underline actually happens in any browser.
 @import 'button-base';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 @import '../core/style/layout-common';
 
 .mat-button, .mat-icon-button {
diff --git a/src/lib/card/card.scss b/src/lib/card/card.scss
index b1745820a26e..584fef8af43c 100644
--- a/src/lib/card/card.scss
+++ b/src/lib/card/card.scss
@@ -1,6 +1,6 @@
 @import '../core/style/variables';
 @import '../core/style/elevation';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 
 $mat-card-default-padding: 24px !default;
diff --git a/src/lib/chips/chip-input.spec.ts b/src/lib/chips/chip-input.spec.ts
index b50edcd4dbb9..62e9fd498a2b 100644
--- a/src/lib/chips/chip-input.spec.ts
+++ b/src/lib/chips/chip-input.spec.ts
@@ -1,13 +1,13 @@
-import {async, TestBed, ComponentFixture} from '@angular/core/testing';
-import {MdChipsModule} from './index';
+import {Directionality} from '@angular/cdk/bidi';
+import {ENTER} from '@angular/cdk/keycodes';
+import {PlatformModule} from '@angular/cdk/platform';
+import {createKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
-import {PlatformModule} from '../core/platform/index';
-import {MdChipInput, MdChipInputEvent} from './chip-input';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
-import {Directionality} from '@angular/material/core';
-import {createKeyboardEvent} from '@angular/cdk/testing';
+import {MdChipInput, MdChipInputEvent} from './chip-input';
+import {MdChipsModule} from './index';
 
-import {ENTER} from '@angular/material/core';
 
 const COMMA = 188;
 
diff --git a/src/lib/chips/chip-input.ts b/src/lib/chips/chip-input.ts
index 14684c9b0762..716d4d710b32 100644
--- a/src/lib/chips/chip-input.ts
+++ b/src/lib/chips/chip-input.ts
@@ -6,17 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {
-  Directive,
-  ElementRef,
-  Output,
-  EventEmitter,
-  Input,
-} from '@angular/core';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {ENTER} from '@angular/material/core';
+import {ENTER} from '@angular/cdk/keycodes';
+import {Directive, ElementRef, EventEmitter, Input, Output,} from '@angular/core';
 import {MdChipList} from './chip-list';
 
+
 export interface MdChipInputEvent {
   input: HTMLInputElement;
   value: string;
diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
index 947c59071f10..e4ef2f7d2de0 100644
--- a/src/lib/chips/chip-list.spec.ts
+++ b/src/lib/chips/chip-list.spec.ts
@@ -1,22 +1,13 @@
 import {FocusKeyManager} from '@angular/cdk/a11y';
+import {Directionality} from '@angular/cdk/bidi';
+import {BACKSPACE, DELETE, ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE, TAB} from '@angular/cdk/keycodes';
 import {createKeyboardEvent, dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement, QueryList, ViewChild, ViewChildren} from '@angular/core';
 import {async, ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {
-  BACKSPACE,
-  DELETE,
-  Directionality,
-  ENTER,
-  LEFT_ARROW,
-  RIGHT_ARROW,
-  SPACE,
-  TAB,
-} from '@angular/material/core';
 import {MdFormFieldModule} from '@angular/material/form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-
 import {MdInputModule} from '../input/index';
 import {MdChip} from './chip';
 import {MdChipInputEvent} from './chip-input';
diff --git a/src/lib/chips/chip-list.ts b/src/lib/chips/chip-list.ts
index 975208299ec2..caa58d318872 100644
--- a/src/lib/chips/chip-list.ts
+++ b/src/lib/chips/chip-list.ts
@@ -5,14 +5,17 @@
  * 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 {FocusKeyManager} from '@angular/cdk/a11y';
+import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SelectionModel} from '@angular/cdk/collections';
+import {BACKSPACE, DELETE, LEFT_ARROW, RIGHT_ARROW, UP_ARROW,} from '@angular/cdk/keycodes';
 import {startWith} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
-  ChangeDetectorRef,
   ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   ContentChildren,
   ElementRef,
@@ -28,21 +31,11 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {ControlValueAccessor, FormGroupDirective, NgControl, NgForm} from '@angular/forms';
-import {
-  BACKSPACE,
-  DELETE,
-  Directionality,
-  LEFT_ARROW,
-  RIGHT_ARROW,
-  UP_ARROW
-} from '@angular/material/core';
 import {MdFormFieldControl} from '@angular/material/form-field';
-
 import {Observable} from 'rxjs/Observable';
 import {merge} from 'rxjs/observable/merge';
 import {Subject} from 'rxjs/Subject';
 import {Subscription} from 'rxjs/Subscription';
-
 import {MdChip, MdChipEvent, MdChipSelectionChange} from './chip';
 import {MdChipInput} from './chip-input';
 
diff --git a/src/lib/chips/chip.spec.ts b/src/lib/chips/chip.spec.ts
index 240ceec898d6..51ade187196a 100644
--- a/src/lib/chips/chip.spec.ts
+++ b/src/lib/chips/chip.spec.ts
@@ -1,10 +1,11 @@
+import {Directionality} from '@angular/cdk/bidi';
+import {BACKSPACE, DELETE, SPACE} from '@angular/cdk/keycodes';
+import {createKeyboardEvent} from '@angular/cdk/testing';
+import {Component, DebugElement} from '@angular/core';
 import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {Component, DebugElement}  from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {createKeyboardEvent} from '@angular/cdk/testing';
-import {MdChipList, MdChip, MdChipEvent, MdChipsModule, MdChipSelectionChange} from './index';
-import {SPACE, DELETE, BACKSPACE} from '@angular/material/core';
-import {Directionality} from '@angular/material/core';
+import {MdChip, MdChipEvent, MdChipList, MdChipSelectionChange, MdChipsModule} from './index';
+
 
 describe('Chips', () => {
   let fixture: ComponentFixture<any>;
diff --git a/src/lib/chips/chip.ts b/src/lib/chips/chip.ts
index a7cdfaebb43b..003e1b9807a1 100644
--- a/src/lib/chips/chip.ts
+++ b/src/lib/chips/chip.ts
@@ -8,6 +8,7 @@
 
 import {FocusableOption} from '@angular/cdk/a11y';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {BACKSPACE, DELETE, SPACE} from '@angular/cdk/keycodes';
 import {
   Directive,
   ElementRef,
@@ -17,17 +18,10 @@ import {
   Output,
   Renderer2,
 } from '@angular/core';
-import {
-  BACKSPACE,
-  CanColor,
-  CanDisable,
-  DELETE,
-  mixinColor,
-  mixinDisabled,
-  SPACE,
-} from '@angular/material/core';
+import {CanColor, CanDisable, mixinColor, mixinDisabled} from '@angular/material/core';
 import {Subject} from 'rxjs/Subject';
 
+
 export interface MdChipEvent {
   chip: MdChip;
 }
@@ -41,8 +35,10 @@ export class MdChipSelectionChange {
 // Boilerplate for applying mixins to MdChip.
 /** @docs-private */
 export class MdChipBase {
-  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {}
+  constructor(public _renderer: Renderer2, public _elementRef: ElementRef) {
+  }
 }
+
 export const _MdChipMixinBase = mixinColor(mixinDisabled(MdChipBase), 'primary');
 
 
@@ -52,9 +48,10 @@ export const _MdChipMixinBase = mixinColor(mixinDisabled(MdChipBase), 'primary')
  */
 @Directive({
   selector: `md-basic-chip, [md-basic-chip], mat-basic-chip, [mat-basic-chip]`,
-  host: {'class': 'mat-basic-chip'}
+  host: {'class': 'mat-basic-chip'},
 })
-export class MdBasicChip { }
+export class MdBasicChip {
+}
 
 /**
  * Material design styled Chip component. Used inside the MdChipList component.
@@ -80,7 +77,7 @@ export class MdBasicChip { }
 
 })
 export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestroy, CanColor,
-  CanDisable {
+    CanDisable {
 
   protected _value: any;
 
@@ -95,7 +92,9 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
 
   /** Whether the chip is selected. */
   @Input()
-  get selected(): boolean { return this._selected; }
+  get selected(): boolean {
+    return this._selected;
+  }
   set selected(value: boolean) {
     this._selected = coerceBooleanProperty(value);
     this.selectionChange.emit({
@@ -104,7 +103,6 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
       selected: value
     });
   }
-
   /** The value of the chip. Defaults to the content inside <md-chip> tags. */
   @Input()
   get value(): any {
@@ -112,22 +110,30 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
       ? this._value
       : this._elementRef.nativeElement.textContent;
   }
-  set value(newValue: any) { this._value = newValue; }
+  set value(newValue: any) { this._value = newValue;}
 
   /**
    * Whether or not the chips are selectable. When a chip is not selectable,
    * changes to it's selected state are always ignored.
    */
-  @Input()
-  get selectable(): boolean { return this._selectable; }
-  set selectable(value: boolean) { this._selectable = coerceBooleanProperty(value); }
+  @Input() get selectable(): boolean {
+    return this._selectable;}
+
+
+  set selectable(value: boolean) {
+    this._selectable = coerceBooleanProperty(value);
+  }
 
   /**
    * Determines whether or not the chip displays the remove styling and emits (remove) events.
    */
-  @Input()
-  get removable(): boolean { return this._removable; }
-  set removable(value: boolean) { this._removable = coerceBooleanProperty(value); }
+  @Input() get removable(): boolean {
+    return this._removable;}
+
+
+  set removable(value: boolean) {
+    this._removable = coerceBooleanProperty(value);
+  }
 
   /** Emits when the chip is focused. */
   _onFocus = new Subject<MdChipEvent>();
@@ -293,11 +299,12 @@ export class MdChip extends _MdChipMixinBase implements FocusableOption, OnDestr
   selector: '[mdChipRemove], [matChipRemove]',
   host: {
     'class': 'mat-chip-remove',
-    '(click)': '_handleClick($event)'
-  }
+    '(click)': '_handleClick($event)',
+  },
 })
 export class MdChipRemove {
-  constructor(protected _parentChip: MdChip) {}
+  constructor(protected _parentChip: MdChip) {
+  }
 
   /** Calls the parent chip's public `remove()` method if applicable. */
   _handleClick(): void {
diff --git a/src/lib/chips/chips.scss b/src/lib/chips/chips.scss
index 478caf88d71f..fc1b13a851b5 100644
--- a/src/lib/chips/chips.scss
+++ b/src/lib/chips/chips.scss
@@ -1,4 +1,4 @@
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 @import '../core/style/elevation';
 
 $mat-chip-vertical-padding: 7px;
diff --git a/src/lib/core/_core.scss b/src/lib/core/_core.scss
index b13dd35b4ea4..7ae874518a80 100644
--- a/src/lib/core/_core.scss
+++ b/src/lib/core/_core.scss
@@ -1,9 +1,9 @@
 // We can use relative imports for imports from the cdk because we bundle everything
 // up into a single flat scss file for material.
 @import '../../cdk/overlay/overlay';
+@import '../../cdk/a11y/a11y';
 
 // Core styles that can be used to apply material design treatments to any element.
-@import 'a11y/a11y';
 @import 'style/elevation';
 @import 'ripple/ripple';
 @import 'option/option';
diff --git a/src/lib/core/a11y/README.md b/src/lib/core/a11y/README.md
deleted file mode 100644
index 45e45eac659a..000000000000
--- a/src/lib/core/a11y/README.md
+++ /dev/null
@@ -1 +0,0 @@
-See [cdk/a11y](../../../cdk/a11y/README.md)
diff --git a/src/lib/core/a11y/activedescendant-key-manager.ts b/src/lib/core/a11y/activedescendant-key-manager.ts
deleted file mode 100644
index 8ccabcab6c6a..000000000000
--- a/src/lib/core/a11y/activedescendant-key-manager.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {ActiveDescendantKeyManager, Highlightable} from '@angular/cdk/a11y';
diff --git a/src/lib/core/a11y/fake-mousedown.ts b/src/lib/core/a11y/fake-mousedown.ts
deleted file mode 100644
index f3d2b68e6827..000000000000
--- a/src/lib/core/a11y/fake-mousedown.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {isFakeMousedownFromScreenReader} from '@angular/cdk/a11y';
diff --git a/src/lib/core/a11y/focus-key-manager.ts b/src/lib/core/a11y/focus-key-manager.ts
deleted file mode 100644
index 0a603e1eba27..000000000000
--- a/src/lib/core/a11y/focus-key-manager.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {FocusKeyManager, FocusableOption} from '@angular/cdk/a11y';
diff --git a/src/lib/core/a11y/focus-trap.ts b/src/lib/core/a11y/focus-trap.ts
deleted file mode 100644
index 7ee2f473073b..000000000000
--- a/src/lib/core/a11y/focus-trap.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {
-  FocusTrap,
-  FocusTrapFactory,
-  FocusTrapDeprecatedDirective,
-  FocusTrapDirective
-} from '@angular/cdk/a11y';
-
-
-
-
-
diff --git a/src/lib/core/a11y/index.ts b/src/lib/core/a11y/index.ts
deleted file mode 100644
index 50ef493946c2..000000000000
--- a/src/lib/core/a11y/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {A11yModule} from '@angular/cdk/a11y';
diff --git a/src/lib/core/a11y/interactivity-checker.ts b/src/lib/core/a11y/interactivity-checker.ts
deleted file mode 100644
index def5fa2b1511..000000000000
--- a/src/lib/core/a11y/interactivity-checker.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {InteractivityChecker} from '@angular/cdk/a11y';
diff --git a/src/lib/core/a11y/list-key-manager.ts b/src/lib/core/a11y/list-key-manager.ts
deleted file mode 100644
index 8710826427ee..000000000000
--- a/src/lib/core/a11y/list-key-manager.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {ListKeyManagerOption, ListKeyManager} from '@angular/cdk/a11y';
diff --git a/src/lib/core/a11y/live-announcer.ts b/src/lib/core/a11y/live-announcer.ts
deleted file mode 100644
index 7965fd4cf102..000000000000
--- a/src/lib/core/a11y/live-announcer.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {
-  AriaLivePoliteness,
-  LIVE_ANNOUNCER_ELEMENT_TOKEN,
-  LiveAnnouncer,
-  LIVE_ANNOUNCER_PROVIDER_FACTORY,
-  LIVE_ANNOUNCER_PROVIDER
-} from '@angular/cdk/a11y';
diff --git a/src/lib/core/bidi/dir.ts b/src/lib/core/bidi/dir.ts
deleted file mode 100644
index a264ca5780cb..000000000000
--- a/src/lib/core/bidi/dir.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {Dir} from '@angular/cdk/bidi';
-
diff --git a/src/lib/core/bidi/directionality.ts b/src/lib/core/bidi/directionality.ts
deleted file mode 100644
index 00f584c8c8ff..000000000000
--- a/src/lib/core/bidi/directionality.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {
-  Direction,
-  DIR_DOCUMENT,
-  Directionality,
-  DIRECTIONALITY_PROVIDER_FACTORY,
-  DIRECTIONALITY_PROVIDER,
-} from '@angular/cdk/bidi';
diff --git a/src/lib/core/bidi/index.ts b/src/lib/core/bidi/index.ts
deleted file mode 100644
index df77755789b3..000000000000
--- a/src/lib/core/bidi/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {
-  Directionality,
-  DIRECTIONALITY_PROVIDER,
-  DIR_DOCUMENT,
-  Direction,
-  Dir,
-  BidiModule,
-} from '@angular/cdk/bidi';
diff --git a/src/lib/core/compatibility/compatibility.spec.ts b/src/lib/core/compatibility/compatibility.spec.ts
index 091dad452dfd..b22fe0a9055a 100644
--- a/src/lib/core/compatibility/compatibility.spec.ts
+++ b/src/lib/core/compatibility/compatibility.spec.ts
@@ -90,10 +90,10 @@ describe('Style compatibility', () => {
 
 
 @Component({ template: `<md-checkbox>Hungry</md-checkbox>` })
-class ComponentWithMdCheckbox { }
+export class ComponentWithMdCheckbox { }
 
 @Component({ template: `<mat-checkbox>Hungry</mat-checkbox>` })
-class ComponentWithMatCheckbox { }
+export class ComponentWithMatCheckbox { }
 
 
 @NgModule({
diff --git a/src/lib/core/datetime/native-date-adapter.spec.ts b/src/lib/core/datetime/native-date-adapter.spec.ts
index 8ec5202fa151..92371ee0742f 100644
--- a/src/lib/core/datetime/native-date-adapter.spec.ts
+++ b/src/lib/core/datetime/native-date-adapter.spec.ts
@@ -1,8 +1,8 @@
-import {TestBed, async, inject} from '@angular/core/testing';
-import {NativeDateAdapter, NativeDateModule, DateAdapter, MAT_DATE_LOCALE} from './index';
-import {Platform} from '../platform/index';
-import {DEC, FEB, JAN, MAR} from '../testing/month-constants';
+import {Platform} from '@angular/cdk/platform';
 import {LOCALE_ID} from '@angular/core';
+import {async, inject, TestBed} from '@angular/core/testing';
+import {DEC, FEB, JAN, MAR} from '../testing/month-constants';
+import {DateAdapter, MAT_DATE_LOCALE, NativeDateAdapter, NativeDateModule} from './index';
 
 const SUPPORTS_INTL = typeof Intl != 'undefined';
 
diff --git a/src/lib/core/keyboard/keycodes.ts b/src/lib/core/keyboard/keycodes.ts
deleted file mode 100644
index 3aef9a4baa83..000000000000
--- a/src/lib/core/keyboard/keycodes.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-
-export {
-  UP_ARROW,
-  DOWN_ARROW,
-  RIGHT_ARROW,
-  LEFT_ARROW,
-  PAGE_UP,
-  PAGE_DOWN,
-  HOME,
-  END,
-  ENTER,
-  SPACE,
-  TAB,
-  ESCAPE,
-  BACKSPACE,
-  DELETE,
-  A,
-  Z,
-} from '@angular/cdk/keycodes';
diff --git a/src/lib/core/option/_option.scss b/src/lib/core/option/_option.scss
index 4bd536b08e3f..bf9e20c2d3f5 100644
--- a/src/lib/core/option/_option.scss
+++ b/src/lib/core/option/_option.scss
@@ -1,6 +1,6 @@
 @import '../style/menu-common';
 @import '../style/vendor-prefixes';
-@import '../a11y/a11y';
+@import '../../../cdk/a11y/a11y';
 @import '../style/layout-common';
 
 /**
diff --git a/src/lib/core/option/option.ts b/src/lib/core/option/option.ts
index baf7353f70b1..8174c0b5f9fc 100644
--- a/src/lib/core/option/option.ts
+++ b/src/lib/core/option/option.ts
@@ -6,20 +6,20 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {ENTER, SPACE} from '@angular/cdk/keycodes';
 import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   ElementRef,
   EventEmitter,
   Input,
-  Output,
-  ViewEncapsulation,
   Optional,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
+  Output,
   QueryList,
+  ViewEncapsulation,
 } from '@angular/core';
-import {ENTER, SPACE} from '../keyboard/keycodes';
-import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {MATERIAL_COMPATIBILITY_MODE} from '../compatibility/compatibility';
 import {MdOptgroup} from './optgroup';
 
diff --git a/src/lib/core/overlay/index.ts b/src/lib/core/overlay/index.ts
deleted file mode 100644
index 621bec001c17..000000000000
--- a/src/lib/core/overlay/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export * from '@angular/cdk/overlay';
diff --git a/src/lib/core/platform/features.ts b/src/lib/core/platform/features.ts
deleted file mode 100644
index 04844f624ef6..000000000000
--- a/src/lib/core/platform/features.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {getSupportedInputTypes} from '@angular/cdk/platform';
diff --git a/src/lib/core/platform/index.ts b/src/lib/core/platform/index.ts
deleted file mode 100644
index e8f8a33331cc..000000000000
--- a/src/lib/core/platform/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {PlatformModule} from '@angular/cdk/platform';
-export * from './platform';
-export * from './features';
diff --git a/src/lib/core/platform/platform.ts b/src/lib/core/platform/platform.ts
deleted file mode 100755
index 648567b59d24..000000000000
--- a/src/lib/core/platform/platform.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {Platform} from '@angular/cdk/platform';
diff --git a/src/lib/core/portal/README.md b/src/lib/core/portal/README.md
deleted file mode 100644
index f9e84739173a..000000000000
--- a/src/lib/core/portal/README.md
+++ /dev/null
@@ -1 +0,0 @@
-See [cdk/portal](../../../cdk/portal/portal.md)
diff --git a/src/lib/core/portal/dom-portal-host.ts b/src/lib/core/portal/dom-portal-host.ts
deleted file mode 100644
index 45424d674bbd..000000000000
--- a/src/lib/core/portal/dom-portal-host.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-export {DomPortalHost} from '@angular/cdk/portal';
diff --git a/src/lib/core/portal/portal-directives.ts b/src/lib/core/portal/portal-directives.ts
deleted file mode 100644
index e2eed6c434aa..000000000000
--- a/src/lib/core/portal/portal-directives.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {TemplatePortalDirective, PortalHostDirective, PortalModule} from '@angular/cdk/portal';
diff --git a/src/lib/core/portal/portal.ts b/src/lib/core/portal/portal.ts
deleted file mode 100644
index 91ac14adaeab..000000000000
--- a/src/lib/core/portal/portal.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {
-  Portal,
-  PortalHost,
-  BasePortalHost,
-  ComponentPortal,
-  TemplatePortal
-} from '@angular/cdk/portal';
diff --git a/src/lib/core/public_api.ts b/src/lib/core/public_api.ts
index e0d835d549e8..4a540f7e1cf6 100644
--- a/src/lib/core/public_api.ts
+++ b/src/lib/core/public_api.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export * from './a11y/index';
 export * from './animation/animation';
-export * from './bidi/index';
 export * from './common-behaviors/index';
 export * from './compatibility/compatibility';
 export * from './coordination/unique-selection-dispatcher';
@@ -16,18 +14,10 @@ export * from './datetime/index';
 export * from './error/error-options';
 export * from './gestures/gesture-annotations';
 export * from './gestures/gesture-config';
-export * from './keyboard/keycodes';
 export * from './line/line';
 export * from './option/index';
-export * from './overlay/index';
 export * from './placeholder/placeholder-options';
-export * from './platform/index';
-export * from './portal/portal';
-export * from './portal/dom-portal-host';
-export * from './portal/portal-directives';
-export * from './portal/portal-injector';
 export * from './ripple/index';
-export * from './rxjs/index';
 export * from './selection/index';
 export * from './style/index';
 export * from './util/object-extend';
diff --git a/src/lib/core/ripple/_ripple.scss b/src/lib/core/ripple/_ripple.scss
index 47623e1497fc..257df0e8ba69 100644
--- a/src/lib/core/ripple/_ripple.scss
+++ b/src/lib/core/ripple/_ripple.scss
@@ -1,5 +1,5 @@
 @import '../theming/theming';
-@import '../a11y/a11y';
+@import '../../../cdk/a11y/a11y';
 
 $mat-ripple-color-opacity: 0.1;
 
diff --git a/src/lib/core/rxjs/index.ts b/src/lib/core/rxjs/index.ts
deleted file mode 100644
index a6f22e575d8e..000000000000
--- a/src/lib/core/rxjs/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export * from './rx-chain';
-export * from './rx-operators';
diff --git a/src/lib/core/rxjs/rx-chain.spec.ts b/src/lib/core/rxjs/rx-chain.spec.ts
deleted file mode 100644
index e9bc10ec5401..000000000000
--- a/src/lib/core/rxjs/rx-chain.spec.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import {Observable} from 'rxjs/Observable';
-import {of as observableOf} from 'rxjs/observable/of';
-import {RxChain, map, filter, first} from './index';
-
-describe('RxChain', () => {
-  it('should call all of the operators in the chain', () => {
-    let operators = { map, filter, first };
-
-    spyOn(operators, 'map');
-    spyOn(operators, 'filter');
-    spyOn(operators, 'first');
-
-    RxChain.from(observableOf(1, 2, 3))
-      .call(operators.map, i => i * 2)
-      .call(operators.filter, i => i % 2 === 0)
-      .call(operators.first);
-
-    expect(operators.map).toHaveBeenCalled();
-    expect(operators.filter).toHaveBeenCalled();
-    expect(operators.first).toHaveBeenCalled();
-  });
-
-  it('should be able to subscribe', () => {
-    const spy = jasmine.createSpy('subscription spy');
-
-    RxChain.from(observableOf(1, 2))
-      .call(map, i => i * 2)
-      .call(first)
-      .subscribe(spy);
-
-    expect(spy).toHaveBeenCalledWith(2);
-  });
-
-  it('should be able to return the result observable', () => {
-    const chain = RxChain.from(observableOf(1, 2))
-      .call(map, i => i * 2)
-      .call(first);
-
-    expect(chain.result() instanceof Observable).toBe(true);
-  });
-});
diff --git a/src/lib/core/rxjs/rx-chain.ts b/src/lib/core/rxjs/rx-chain.ts
deleted file mode 100644
index fa3f771efcf7..000000000000
--- a/src/lib/core/rxjs/rx-chain.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {RxChain} from '@angular/cdk/rxjs';
diff --git a/src/lib/core/rxjs/rx-operators.ts b/src/lib/core/rxjs/rx-operators.ts
deleted file mode 100644
index 864b6be10b2f..000000000000
--- a/src/lib/core/rxjs/rx-operators.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export {
-  StrictRxChain,
-  FinallyBrand,
-  CatchBrand,
-  DoBrand,
-  MapBrand,
-  FilterBrand,
-  ShareBrand,
-  FirstBrand,
-  SwitchMapBrand,
-  StartWithBrand,
-  DebounceTimeBrand,
-  AuditTimeBrand,
-  TakeUntilBrand,
-  finallyOperatorType,
-  catchOperatorType,
-  doOperatorType,
-  mapOperatorType,
-  filterOperatorType,
-  shareOperatorType,
-  firstOperatorType,
-  switchMapOperatorType,
-  startWithOperatorType,
-  debounceTimeOperatorType,
-  auditTimeOperatorType,
-  takeUntilOperatorType,
-  finallyOperator,
-  catchOperator,
-  doOperator,
-  map,
-  filter,
-  share,
-  first,
-  switchMap,
-  startWith,
-  debounceTime,
-  auditTime,
-  takeUntil,
-} from '@angular/cdk/rxjs';
diff --git a/src/lib/core/style/index.ts b/src/lib/core/style/index.ts
index 54ed99b4b68a..c97f88c2e49e 100644
--- a/src/lib/core/style/index.ts
+++ b/src/lib/core/style/index.ts
@@ -6,20 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {A11yModule} from '@angular/cdk/a11y';
-
-/** @deprecated */
-@NgModule({
-  imports: [A11yModule],
-  exports: [A11yModule],
-})
-export class StyleModule {}
-
-export {
-  CdkMonitorFocus,
-  FocusMonitor,
-  FOCUS_MONITOR_PROVIDER,
-  FocusOrigin,
-} from '@angular/cdk/a11y';
 export * from './apply-transform';
diff --git a/src/lib/datepicker/calendar.spec.ts b/src/lib/datepicker/calendar.spec.ts
index 867a44c7616a..686fa406de13 100644
--- a/src/lib/datepicker/calendar.spec.ts
+++ b/src/lib/datepicker/calendar.spec.ts
@@ -1,11 +1,3 @@
-import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
-import {Component} from '@angular/core';
-import {MdCalendar} from './calendar';
-import {By} from '@angular/platform-browser';
-import {MdMonthView} from './month-view';
-import {MdYearView} from './year-view';
-import {MdCalendarBody} from './calendar-body';
-import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
 import {
   DOWN_ARROW,
   END,
@@ -15,13 +7,33 @@ import {
   PAGE_DOWN,
   PAGE_UP,
   RIGHT_ARROW,
-  UP_ARROW
+  UP_ARROW,
+} from '@angular/cdk/keycodes';
+import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
+import {Component} from '@angular/core';
+import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
+import {
+  AUG,
+  DEC,
+  FEB,
+  JAN,
+  JUL,
+  JUN,
+  MAR,
+  MAY,
+  MdNativeDateModule,
+  NoConflictStyleCompatibilityMode,
+  NOV,
+  SEP,
 } from '@angular/material/core';
-import {MdDatepickerIntl} from './datepicker-intl';
-import {MdNativeDateModule} from '@angular/material/core';
-import {NoConflictStyleCompatibilityMode} from '@angular/material/core';
+import {By} from '@angular/platform-browser';
 import {MdButtonModule} from '../button/index';
-import {AUG, DEC, FEB, JAN, JUL, NOV, MAR, MAY, JUN, SEP} from '@angular/material/core';
+import {MdCalendar} from './calendar';
+import {MdCalendarBody} from './calendar-body';
+import {MdDatepickerIntl} from './datepicker-intl';
+import {MdMonthView} from './month-view';
+import {MdYearView} from './year-view';
+
 
 describe('MdCalendar', () => {
   beforeEach(async(() => {
diff --git a/src/lib/dialog/dialog.scss b/src/lib/dialog/dialog.scss
index 8ef8eea9df4c..2f04aec0b4cb 100644
--- a/src/lib/dialog/dialog.scss
+++ b/src/lib/dialog/dialog.scss
@@ -1,6 +1,6 @@
 @import '../core/style/elevation';
 @import '../core/style/vendor-prefixes';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 
 $mat-dialog-padding: 24px !default;
diff --git a/src/lib/dialog/dialog.ts b/src/lib/dialog/dialog.ts
index 5ff66f717a0b..0fa02226f787 100644
--- a/src/lib/dialog/dialog.ts
+++ b/src/lib/dialog/dialog.ts
@@ -14,7 +14,7 @@ import {
   OverlayConfig,
   ScrollStrategy,
 } from '@angular/cdk/overlay';
-import {ComponentPortal, ComponentType, TemplatePortal} from '@angular/cdk/portal';
+import {ComponentPortal, ComponentType, PortalInjector, TemplatePortal} from '@angular/cdk/portal';
 import {startWith} from '@angular/cdk/rxjs';
 import {Location} from '@angular/common';
 import {
@@ -27,7 +27,7 @@ import {
   SkipSelf,
   TemplateRef,
 } from '@angular/core';
-import {extendObject, PortalInjector} from '@angular/material/core';
+import {extendObject} from '@angular/material/core';
 import {Observable} from 'rxjs/Observable';
 import {defer} from 'rxjs/observable/defer';
 import {Subject} from 'rxjs/Subject';
@@ -35,6 +35,7 @@ import {MdDialogConfig} from './dialog-config';
 import {MdDialogContainer} from './dialog-container';
 import {MdDialogRef} from './dialog-ref';
 
+
 export const MD_DIALOG_DATA = new InjectionToken<any>('MdDialogData');
 
 
diff --git a/src/lib/expansion/expansion-panel-header.ts b/src/lib/expansion/expansion-panel-header.ts
index e18cfe61a67b..3b0799fef527 100644
--- a/src/lib/expansion/expansion-panel-header.ts
+++ b/src/lib/expansion/expansion-panel-header.ts
@@ -6,31 +6,25 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {animate, state, style, transition, trigger} from '@angular/animations';
+import {FocusMonitor} from '@angular/cdk/a11y';
+import {ENTER, SPACE} from '@angular/cdk/keycodes';
+import {filter} from '@angular/cdk/rxjs';
 import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   Directive,
+  ElementRef,
   Host,
-  ViewEncapsulation,
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
+  Input,
   OnDestroy,
   Renderer2,
-  ElementRef,
-  Input,
+  ViewEncapsulation,
 } from '@angular/core';
-import {
-  trigger,
-  state,
-  style,
-  transition,
-  animate,
-} from '@angular/animations';
-import {SPACE, ENTER} from '@angular/material/core';
-import {MdExpansionPanel, EXPANSION_PANEL_ANIMATION_TIMING} from './expansion-panel';
-import {filter} from '@angular/material/core';
-import {FocusMonitor} from '@angular/cdk/a11y';
 import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
+import {EXPANSION_PANEL_ANIMATION_TIMING, MdExpansionPanel} from './expansion-panel';
 
 
 /**
diff --git a/src/lib/form-field/form-field-module.ts b/src/lib/form-field/form-field-module.ts
index 6cb8d7ccdea8..46f51cd12a8e 100644
--- a/src/lib/form-field/form-field-module.ts
+++ b/src/lib/form-field/form-field-module.ts
@@ -6,15 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
+import {PlatformModule} from '@angular/cdk/platform';
 import {MdError} from './error';
 import {MdFormField} from './form-field';
 import {MdHint} from './hint';
 import {MdPlaceholder} from './placeholder';
 import {MdPrefix} from './prefix';
 import {MdSuffix} from './suffix';
-import {CommonModule} from '@angular/common';
-import {PlatformModule} from '@angular/material/core';
 
 
 @NgModule({
diff --git a/src/lib/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
index 3507ef0f30f0..7ff669fc292d 100644
--- a/src/lib/icon/icon-registry.ts
+++ b/src/lib/icon/icon-registry.ts
@@ -6,22 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {catchOperator, doOperator, finallyOperator, map, RxChain, share} from '@angular/cdk/rxjs';
 import {Injectable, Optional, SecurityContext, SkipSelf} from '@angular/core';
 import {Http} from '@angular/http';
-import {
-  catchOperator,
-  doOperator,
-  finallyOperator,
-  map,
-  RxChain,
-  share,
-} from '@angular/material/core';
 import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
 import {Observable} from 'rxjs/Observable';
 import {forkJoin} from 'rxjs/observable/forkJoin';
 import {of as observableOf} from 'rxjs/observable/of';
 import {_throw as observableThrow} from 'rxjs/observable/throw';
 
+
 /**
  * Returns an exception to be thrown in the case when attempting to
  * load an icon with a name that cannot be found.
diff --git a/src/lib/icon/icon.ts b/src/lib/icon/icon.ts
index f27d46ea5d29..f5a001d0ee01 100644
--- a/src/lib/icon/icon.ts
+++ b/src/lib/icon/icon.ts
@@ -6,7 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {first} from '@angular/cdk/rxjs';
 import {
+  Attribute,
   ChangeDetectionStrategy,
   Component,
   ElementRef,
@@ -16,11 +18,9 @@ import {
   Renderer2,
   SimpleChanges,
   ViewEncapsulation,
-  Attribute,
 } from '@angular/core';
-import {MdIconRegistry} from './icon-registry';
 import {CanColor, mixinColor} from '@angular/material/core';
-import {first} from '@angular/material/core';
+import {MdIconRegistry} from './icon-registry';
 
 
 // Boilerplate for applying mixins to MdIcon.
diff --git a/src/lib/input/input-module.ts b/src/lib/input/input-module.ts
index 0e6f22491e62..c114e4d0c2fe 100644
--- a/src/lib/input/input-module.ts
+++ b/src/lib/input/input-module.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {MdInput} from './input';
-import {MdTextareaAutosize} from './autosize';
+import {PlatformModule} from '@angular/cdk/platform';
 import {CommonModule} from '@angular/common';
-import {PlatformModule} from '@angular/material/core';
+import {NgModule} from '@angular/core';
 import {MdFormFieldModule} from '@angular/material/form-field';
+import {MdTextareaAutosize} from './autosize';
+import {MdInput} from './input';
 
 
 @NgModule({
diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index a960c88017e3..ba534a980a7e 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -1,5 +1,7 @@
+import {Platform, PlatformModule} from '@angular/cdk/platform';
+import {createFakeEvent, dispatchFakeEvent, wrappedErrorMessage} from '@angular/cdk/testing';
+import {ChangeDetectionStrategy, Component, ViewChild} from '@angular/core';
 import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
-import {Component, ViewChild, ChangeDetectionStrategy} from '@angular/core';
 import {
   FormControl,
   FormGroup,
@@ -7,24 +9,24 @@ import {
   FormsModule,
   NgForm,
   ReactiveFormsModule,
-  Validators
+  Validators,
 } from '@angular/forms';
-import {By} from '@angular/platform-browser';
-import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MdInputModule} from './index';
-import {MdInput} from './input';
-import {Platform} from '@angular/material/core';
-import {PlatformModule} from '@angular/material/core';
-import {wrappedErrorMessage, dispatchFakeEvent, createFakeEvent} from '@angular/cdk/testing';
 import {
-  MdFormField,
-  MdFormFieldModule,
+  MD_ERROR_GLOBAL_OPTIONS,
+  MD_PLACEHOLDER_GLOBAL_OPTIONS,
+  showOnDirtyErrorStateMatcher,
+} from '@angular/material/core';
+import {
   getMdFormFieldDuplicatedHintError,
   getMdFormFieldMissingControlError,
   getMdFormFieldPlaceholderConflictError,
+  MdFormField,
+  MdFormFieldModule,
 } from '@angular/material/form-field';
-import {MD_PLACEHOLDER_GLOBAL_OPTIONS} from '@angular/material/core';
-import {MD_ERROR_GLOBAL_OPTIONS, showOnDirtyErrorStateMatcher} from '@angular/material/core';
+import {By} from '@angular/platform-browser';
+import {NoopAnimationsModule} from '@angular/platform-browser/animations';
+import {MdInputModule} from './index';
+import {MdInput} from './input';
 
 describe('MdInput without forms', function () {
   beforeEach(async(() => {
diff --git a/src/lib/list/selection-list.spec.ts b/src/lib/list/selection-list.spec.ts
index 623cde717a65..bb3752c3fdd9 100644
--- a/src/lib/list/selection-list.spec.ts
+++ b/src/lib/list/selection-list.spec.ts
@@ -1,10 +1,10 @@
-import {async, TestBed, ComponentFixture, inject} from '@angular/core/testing';
+import {DOWN_ARROW, SPACE, UP_ARROW} from '@angular/cdk/keycodes';
+import {Platform} from '@angular/cdk/platform';
+import {createKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
+import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
-import {MdSelectionList, MdListOption, MdListModule} from './index';
-import {createKeyboardEvent} from '@angular/cdk/testing';
-import {UP_ARROW, DOWN_ARROW, SPACE} from '@angular/material/core';
-import {Platform} from '@angular/material/core';
+import {MdListModule, MdListOption, MdSelectionList} from './index';
 
 
 describe('MdSelectionList', () => {
diff --git a/src/lib/list/selection-list.ts b/src/lib/list/selection-list.ts
index 2603911a4905..5cd645a33c1d 100644
--- a/src/lib/list/selection-list.ts
+++ b/src/lib/list/selection-list.ts
@@ -9,6 +9,8 @@
 import {FocusableOption, FocusKeyManager} from '@angular/cdk/a11y';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {SelectionModel} from '@angular/cdk/collections';
+import {SPACE} from '@angular/cdk/keycodes';
+import {RxChain, startWith, switchMap} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -35,10 +37,6 @@ import {
   MdLineSetter,
   mixinDisabled,
   mixinDisableRipple,
-  RxChain,
-  SPACE,
-  startWith,
-  switchMap,
 } from '@angular/material/core';
 import {merge} from 'rxjs/observable/merge';
 import {Subscription} from 'rxjs/Subscription';
diff --git a/src/lib/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
index 594de4d5e5e0..aa7d1c8dfef1 100644
--- a/src/lib/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -6,11 +6,20 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {AnimationEvent} from '@angular/animations';
+import {FocusKeyManager} from '@angular/cdk/a11y';
+import {Direction} from '@angular/cdk/bidi';
+import {ESCAPE, LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
+import {RxChain, startWith, switchMap} from '@angular/cdk/rxjs';
 import {
   AfterContentInit,
+  ChangeDetectionStrategy,
   Component,
   ContentChildren,
+  ElementRef,
   EventEmitter,
+  Inject,
+  InjectionToken,
   Input,
   OnDestroy,
   Output,
@@ -18,24 +27,16 @@ import {
   TemplateRef,
   ViewChild,
   ViewEncapsulation,
-  ElementRef,
-  ChangeDetectionStrategy,
-  InjectionToken,
-  Inject,
 } from '@angular/core';
-import {AnimationEvent} from '@angular/animations';
-import {MenuPositionX, MenuPositionY} from './menu-positions';
+import {Observable} from 'rxjs/Observable';
+import {merge} from 'rxjs/observable/merge';
+import {Subscription} from 'rxjs/Subscription';
+import {fadeInItems, transformMenu} from './menu-animations';
 import {throwMdMenuInvalidPositionX, throwMdMenuInvalidPositionY} from './menu-errors';
 import {MdMenuItem} from './menu-item';
-import {FocusKeyManager} from '@angular/cdk/a11y';
 import {MdMenuPanel} from './menu-panel';
-import {Subscription} from 'rxjs/Subscription';
-import {transformMenu, fadeInItems} from './menu-animations';
-import {ESCAPE, LEFT_ARROW, RIGHT_ARROW} from '@angular/material/core';
-import {merge} from 'rxjs/observable/merge';
-import {Observable} from 'rxjs/Observable';
-import {Direction} from '@angular/cdk/bidi';
-import {RxChain, startWith, switchMap} from '@angular/cdk/rxjs';
+import {MenuPositionX, MenuPositionY} from './menu-positions';
+
 
 /** Default `md-menu` options that can be overridden. */
 export interface MdMenuDefaultOptions {
diff --git a/src/lib/menu/menu.scss b/src/lib/menu/menu.scss
index 04cfcc38a1fa..5fcc8a889650 100644
--- a/src/lib/menu/menu.scss
+++ b/src/lib/menu/menu.scss
@@ -3,7 +3,7 @@
 @import '../core/style/button-common';
 @import '../core/style/layout-common';
 @import '../core/style/menu-common';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 @import '../core/style/layout-common';
 
 $mat-menu-vertical-padding: 8px !default;
diff --git a/src/lib/select/select.scss b/src/lib/select/select.scss
index 9b57b49d63ea..1056cef91149 100644
--- a/src/lib/select/select.scss
+++ b/src/lib/select/select.scss
@@ -2,7 +2,7 @@
 @import '../core/style/list-common';
 @import '../core/style/variables';
 @import '../core/style/vendor-prefixes';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 $mat-select-trigger-height: 30px !default;
 $mat-select-trigger-min-width: 112px !default;
diff --git a/src/lib/sidenav/drawer.scss b/src/lib/sidenav/drawer.scss
index 26800af1f258..9d46906c21fd 100644
--- a/src/lib/sidenav/drawer.scss
+++ b/src/lib/sidenav/drawer.scss
@@ -1,7 +1,7 @@
 @import '../core/style/variables';
 @import '../core/style/elevation';
 @import '../core/style/layout-common';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 // stylelint-disable max-line-length
 // Mixin that creates a new stacking context.
diff --git a/src/lib/sidenav/drawer.ts b/src/lib/sidenav/drawer.ts
index 52271e625fc7..ef241cacd3fa 100644
--- a/src/lib/sidenav/drawer.ts
+++ b/src/lib/sidenav/drawer.ts
@@ -10,6 +10,7 @@ import {animate, AnimationEvent, state, style, transition, trigger} from '@angul
 import {FocusTrap, FocusTrapFactory} from '@angular/cdk/a11y';
 import {Directionality} from '@angular/cdk/bidi';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
+import {ESCAPE} from '@angular/cdk/keycodes';
 import {
   AfterContentInit,
   ChangeDetectionStrategy,
@@ -28,9 +29,11 @@ import {
   Renderer2,
   ViewEncapsulation,
 } from '@angular/core';
-import {ESCAPE, first, startWith, takeUntil} from '@angular/material/core';
 import {DOCUMENT} from '@angular/platform-browser';
 import {merge} from 'rxjs/observable/merge';
+import {first} from 'rxjs/operator/first';
+import {startWith} from 'rxjs/operator/startWith';
+import {takeUntil} from 'rxjs/operator/takeUntil';
 import {Subscription} from 'rxjs/Subscription';
 
 
diff --git a/src/lib/slide-toggle/slide-toggle.scss b/src/lib/slide-toggle/slide-toggle.scss
index 62f3298d78a4..8fd0e11da000 100644
--- a/src/lib/slide-toggle/slide-toggle.scss
+++ b/src/lib/slide-toggle/slide-toggle.scss
@@ -2,7 +2,7 @@
 @import '../core/ripple/ripple';
 @import '../core/style/elevation';
 @import '../core/style/vendor-prefixes';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 $mat-slide-toggle-thumb-size: 20px !default;
 $mat-slide-toggle-bar-border-radius: 8px !default;
diff --git a/src/lib/slider/slider-module.ts b/src/lib/slider/slider-module.ts
index 2d669c54d4ab..979859b91a12 100644
--- a/src/lib/slider/slider-module.ts
+++ b/src/lib/slider/slider-module.ts
@@ -6,13 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {A11yModule} from '@angular/cdk/a11y';
+import {BidiModule} from '@angular/cdk/bidi';
+import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
+import {GestureConfig, MdCommonModule} from '@angular/material/core';
 import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
-import {CommonModule} from '@angular/common';
-import {MdCommonModule, GestureConfig} from '@angular/material/core';
 import {MdSlider} from './slider';
-import {BidiModule} from '@angular/material/core';
-import {A11yModule} from '@angular/cdk/a11y';
 
 
 @NgModule({
diff --git a/src/lib/slider/slider.spec.ts b/src/lib/slider/slider.spec.ts
index e8962601f00b..72e0ef7d9a06 100644
--- a/src/lib/slider/slider.spec.ts
+++ b/src/lib/slider/slider.spec.ts
@@ -1,11 +1,6 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {Component, DebugElement, ViewChild} from '@angular/core';
-import {By, HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
-import {MdSlider, MdSliderModule} from './index';
-import {TestGestureConfig} from './test-gesture-config';
-import {BidiModule} from '@angular/material/core';
+import {BidiModule} from '@angular/cdk/bidi';
 import {
+  BACKSPACE,
   DOWN_ARROW,
   END,
   HOME,
@@ -14,9 +9,15 @@ import {
   PAGE_UP,
   RIGHT_ARROW,
   UP_ARROW,
-  BACKSPACE
-} from '@angular/material/core';
+} from '@angular/cdk/keycodes';
 import {dispatchFakeEvent, dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing';
+import {Component, DebugElement, ViewChild} from '@angular/core';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {By, HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
+import {MdSlider, MdSliderModule} from './index';
+import {TestGestureConfig} from './test-gesture-config';
+
 
 describe('MdSlider without forms', () => {
   let gestureConfig: TestGestureConfig;
diff --git a/src/lib/snack-bar/snack-bar-container.scss b/src/lib/snack-bar/snack-bar-container.scss
index 164040d9b079..72e1ae221690 100644
--- a/src/lib/snack-bar/snack-bar-container.scss
+++ b/src/lib/snack-bar/snack-bar-container.scss
@@ -1,4 +1,4 @@
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 $mat-snack-bar-padding: 14px 24px !default;
 $mat-snack-bar-min-width: 288px !default;
diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts
index e4e3a13a3d86..293e2c903e95 100644
--- a/src/lib/snack-bar/snack-bar.ts
+++ b/src/lib/snack-bar/snack-bar.ts
@@ -6,16 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ComponentRef, Injectable, Injector, Optional, SkipSelf } from '@angular/core';
-import {Overlay, OverlayRef, OverlayConfig} from '@angular/cdk/overlay';
-import {ComponentPortal, ComponentType} from '@angular/cdk/portal';
 import {LiveAnnouncer} from '@angular/cdk/a11y';
-import {PortalInjector} from '@angular/material/core';
+import {Overlay, OverlayConfig, OverlayRef} from '@angular/cdk/overlay';
+import {ComponentPortal, ComponentType, PortalInjector} from '@angular/cdk/portal';
+import {ComponentRef, Injectable, Injector, Optional, SkipSelf} from '@angular/core';
 import {extendObject} from '@angular/material/core';
+import {SimpleSnackBar} from './simple-snack-bar';
 import {MD_SNACK_BAR_DATA, MdSnackBarConfig} from './snack-bar-config';
-import {MdSnackBarRef} from './snack-bar-ref';
 import {MdSnackBarContainer} from './snack-bar-container';
-import {SimpleSnackBar} from './simple-snack-bar';
+import {MdSnackBarRef} from './snack-bar-ref';
 
 
 /**
diff --git a/src/lib/sort/sort.spec.ts b/src/lib/sort/sort.spec.ts
index d4a5d40b53b1..36038f4d0d70 100644
--- a/src/lib/sort/sort.spec.ts
+++ b/src/lib/sort/sort.spec.ts
@@ -1,19 +1,20 @@
-import {async, ComponentFixture, TestBed, inject} from '@angular/core/testing';
+import {CollectionViewer, DataSource} from '@angular/cdk/collections';
+import {CdkTableModule} from '@angular/cdk/table';
+import {dispatchMouseEvent, wrappedErrorMessage} from '@angular/cdk/testing';
 import {Component, ElementRef, ViewChild} from '@angular/core';
+import {async, ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MdSort, MdSortHeader, Sort, SortDirection, MdSortModule, MdSortHeaderIntl} from './index';
-import {DataSource, CollectionViewer} from '@angular/cdk/collections';
-import {CdkTableModule} from '@angular/cdk/table';
 import {Observable} from 'rxjs/Observable';
+import {map} from 'rxjs/operator/map';
+import {MdTableModule} from '../table/index';
+import {MdSort, MdSortHeader, MdSortHeaderIntl, MdSortModule, Sort, SortDirection} from './index';
 import {
   getMdSortDuplicateMdSortableIdError,
   getMdSortHeaderMissingIdError,
-  getMdSortHeaderNotContainedWithinMdSortError
+  getMdSortHeaderNotContainedWithinMdSortError,
 } from './sort-errors';
-import {wrappedErrorMessage, dispatchMouseEvent} from '@angular/cdk/testing';
-import {map} from '@angular/material/core';
-import {MdTableModule} from '../table/index';
+
 
 describe('MdSort', () => {
   let fixture: ComponentFixture<SimpleMdSortApp>;
diff --git a/src/lib/stepper/stepper.spec.ts b/src/lib/stepper/stepper.spec.ts
index 5662e317bc89..ec042211fd71 100644
--- a/src/lib/stepper/stepper.spec.ts
+++ b/src/lib/stepper/stepper.spec.ts
@@ -1,14 +1,15 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {Directionality} from '@angular/cdk/bidi';
+import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
+import {dispatchKeyboardEvent} from '@angular/cdk/testing';
 import {Component, DebugElement} from '@angular/core';
-import {MdStepperModule} from './index';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
+import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
+import {MdStepperModule} from './index';
+import {MdHorizontalStepper, MdStepper, MdVerticalStepper} from './stepper';
 import {MdStepperNext, MdStepperPrevious} from './stepper-button';
-import {dispatchKeyboardEvent} from '@angular/cdk/testing';
-import {ENTER, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
-import {MdStepper, MdHorizontalStepper, MdVerticalStepper} from './stepper';
-import {Directionality} from '@angular/material/core';
+
 
 const VALID_REGEX = /valid/;
 
diff --git a/src/lib/tabs/tab-body.spec.ts b/src/lib/tabs/tab-body.spec.ts
index bd7592f97a36..cead88350898 100644
--- a/src/lib/tabs/tab-body.spec.ts
+++ b/src/lib/tabs/tab-body.spec.ts
@@ -1,12 +1,11 @@
-import {Component, ViewChild, TemplateRef, ViewContainerRef} from '@angular/core';
+import {Direction, Directionality} from '@angular/cdk/bidi';
+import {PortalModule, TemplatePortal} from '@angular/cdk/portal';
 import {CommonModule} from '@angular/common';
-import {PortalModule} from '@angular/cdk/portal';
-import {async, ComponentFixture, TestBed, flushMicrotasks, fakeAsync} from '@angular/core/testing';
+import {Component, TemplateRef, ViewChild, ViewContainerRef} from '@angular/core';
+import {async, ComponentFixture, fakeAsync, flushMicrotasks, TestBed} from '@angular/core/testing';
+import {MdRippleModule} from '@angular/material/core';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {Direction, Directionality} from '@angular/material/core';
-import {TemplatePortal} from '@angular/material/core';
 import {MdTabBody} from './tab-body';
-import {MdRippleModule} from '@angular/material/core';
 
 
 describe('MdTabBody', () => {
diff --git a/src/lib/tabs/tab.ts b/src/lib/tabs/tab.ts
index a8499dba0e29..852c9aa84d92 100644
--- a/src/lib/tabs/tab.ts
+++ b/src/lib/tabs/tab.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {TemplatePortal} from '@angular/material/core';
+import {TemplatePortal} from '@angular/cdk/portal';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -22,8 +22,9 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {CanDisable, mixinDisabled} from '@angular/material/core';
-import {MdTabLabel} from './tab-label';
 import {Subject} from 'rxjs/Subject';
+import {MdTabLabel} from './tab-label';
+
 
 // Boilerplate for applying mixins to MdTab.
 /** @docs-private */
diff --git a/src/lib/tooltip/tooltip.scss b/src/lib/tooltip/tooltip.scss
index 1b69d057673f..e3bb19b162ab 100644
--- a/src/lib/tooltip/tooltip.scss
+++ b/src/lib/tooltip/tooltip.scss
@@ -1,5 +1,5 @@
 @import '../core/style/variables';
-@import '../core/a11y/a11y';
+@import '../../cdk/a11y/a11y';
 
 $mat-tooltip-horizontal-padding: 8px;
 $mat-tooltip-max-width: 250px;