diff --git a/bundle/src/components/button/mdc.button.directive.ts b/bundle/src/components/button/mdc.button.directive.ts
index cc616f1..62d9a41 100644
--- a/bundle/src/components/button/mdc.button.directive.ts
+++ b/bundle/src/components/button/mdc.button.directive.ts
@@ -1,75 +1,86 @@
-import { AfterContentInit, Directive, ElementRef, HostBinding, Input, OnDestroy, Renderer2, forwardRef } from '@angular/core';
-import { MDCRipple } from '@material/ripple';
-import { asBoolean } from '../../utils/value.utils';
-import { AbstractMdcRipple } from '../ripple/abstract.mdc.ripple';
-import { MdcEventRegistry } from '../../utils/mdc.event.registry';
-
-// TODO: mdc-button__icon
-
-/**
- * Material design button. Anchors can also be styled as buttons with this directive.
- * Defaults to a button that is flushed with the surface.
- * Use the input modifiers to alter the styling, or create your own style
- * based on the provided sass-mixins.
- */
-@Directive({
-    selector: 'button[mdcButton],a[mdcButton]',
-    providers: [{provide: AbstractMdcRipple, useExisting: forwardRef(() => MdcButtonDirective) }]
-})
-export class MdcButtonDirective extends AbstractMdcRipple implements AfterContentInit, OnDestroy {
-    @HostBinding('class.mdc-button') _cls = true;
-    private _dense = false;
-    private _raised = false;
-    private _outlined = false;
-
-    constructor(public _elm: ElementRef, renderer: Renderer2, registry: MdcEventRegistry) {
-        super(_elm, renderer, registry);
-    }
-
-    ngAfterContentInit() {
-        this.initRipple();
-    }
-
-    ngOnDestroy() {
-        this.destroyRipple();
-    }
-
-    /**
-     * When this input is defined and does not have value false, the button will be elevated
-     * upon the surface.
-     */
-    @HostBinding('class.mdc-button--raised') @Input()
-    get raised() {
-        return this._raised;
-    }
-
-    set raised(val: any) {
-        this._raised = asBoolean(val);
-    }
-
-    /**
-     * When this input is defined and does not have value false, the button will be styled 
-     * flush with the surface and have a visible border.
-     */
-    @HostBinding('class.mdc-button--outlined') @Input()
-    get outlined() {
-        return this._outlined;
-    }
-
-    set outlined(val: any) {
-        this._outlined = asBoolean(val);
-    }
-
-    /**
-     * When this input is defined and does not have value false, the button text is compressed
-     * to make it slightly smaller.
-     */
-    @HostBinding('class.mdc-button--dense') @Input()
-    get dense() {
-        return this._dense;
-    }
-
-    set dense(val: any) {
-        this._dense = asBoolean(val);
-    }
-}
+import { AfterContentInit, Directive, ElementRef, HostBinding, Input, OnDestroy, Renderer2, forwardRef } from '@angular/core';
+import { MDCRipple } from '@material/ripple';
+import { asBoolean } from '../../utils/value.utils';
+import { AbstractMdcRipple } from '../ripple/abstract.mdc.ripple';
+import { MdcEventRegistry } from '../../utils/mdc.event.registry';
+
+/**
+ * Use this directive for adding an icon to an <code>mdcButton</code>. This directive can be
+ * added to font-style icons (such as <a href="https://material.io/icons/">material icons</a>
+ * from Google fonts), or with <code>svg</code> elements for svg based icons.
+ */
+@Directive({
+    selector: 'mdcButtonIcon'
+})
+export class MdcButtonIconDirective {
+    @HostBinding('class.mdc-button__icon') _cls = true;
+    @HostBinding('attr.aria-hidden') _ariaHidden = true;
+}
+
+/**
+ * Material design button. Anchors can also be styled as buttons with this directive.
+ * Defaults to a button that is flushed with the surface.
+ * Use the input modifiers to alter the styling, or create your own style
+ * based on the provided sass-mixins.
+ */
+@Directive({
+    selector: 'button[mdcButton],a[mdcButton]',
+    providers: [{provide: AbstractMdcRipple, useExisting: forwardRef(() => MdcButtonDirective) }]
+})
+export class MdcButtonDirective extends AbstractMdcRipple implements AfterContentInit, OnDestroy {
+    @HostBinding('class.mdc-button') _cls = true;
+    private _dense = false;
+    private _raised = false;
+    private _outlined = false;
+
+    constructor(public _elm: ElementRef, renderer: Renderer2, registry: MdcEventRegistry) {
+        super(_elm, renderer, registry);
+    }
+
+    ngAfterContentInit() {
+        this.initRipple();
+    }
+
+    ngOnDestroy() {
+        this.destroyRipple();
+    }
+
+    /**
+     * When this input is defined and does not have value false, the button will be elevated
+     * upon the surface.
+     */
+    @HostBinding('class.mdc-button--raised') @Input()
+    get raised() {
+        return this._raised;
+    }
+
+    set raised(val: any) {
+        this._raised = asBoolean(val);
+    }
+
+    /**
+     * When this input is defined and does not have value false, the button will be styled 
+     * flush with the surface and have a visible border.
+     */
+    @HostBinding('class.mdc-button--outlined') @Input()
+    get outlined() {
+        return this._outlined;
+    }
+
+    set outlined(val: any) {
+        this._outlined = asBoolean(val);
+    }
+
+    /**
+     * When this input is defined and does not have value false, the button text is compressed
+     * to make it slightly smaller.
+     */
+    @HostBinding('class.mdc-button--dense') @Input()
+    get dense() {
+        return this._dense;
+    }
+
+    set dense(val: any) {
+        this._dense = asBoolean(val);
+    }
+}
diff --git a/bundle/src/material.module.ts b/bundle/src/material.module.ts
index cfdae86..4047a61 100644
--- a/bundle/src/material.module.ts
+++ b/bundle/src/material.module.ts
@@ -1,215 +1,216 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { MdcButtonDirective } from './components/button/mdc.button.directive';
-import { MdcCardDirective,
-    MdcCardMediaDirective,
-    MdcCardMediaContentDirective,
-    MdcCardActionButtonsDirective,
-    MdcCardActionIconsDirective,
-    MdcCardActionsDirective,
-    MdcCardPrimaryActionDirective } from './components/card/mdc.card.directive';
-import { MdcCheckboxDirective,
-    MdcCheckboxInputDirective } from './components/checkbox/mdc.checkbox.directive';
-import { MdcDrawerDirective,
-    MdcDrawerContainerDirective,
-    MdcDrawerToolbarSpacerDirective,
-    MdcDrawerHeaderDirective,
-    MdcDrawerHeaderContentDirective,
-    MdcDrawerContentDirective } from './components/drawer/mdc.drawer.directive';
-import { MdcElevationDirective } from './components/elevation/mdc.elevation.directive';
-import { MdcFabDirective,
-    MdcFabIconDirective } from './components/fab/mdc.fab.directive';
-import { MdcFloatingLabelDirective } from './components/floating-label/mdc.floating-label.directive';
-import { MdcFormFieldDirective,
-    MdcFormFieldInputDirective,
-    MdcFormFieldLabelDirective } from './components/form-field/mdc.form-field.directive';
-import { MdcIconDirective } from './components/icon/mdc.icon.directive';
-import { MdcIconToggleDirective,
-    MdcIconToggleIconDirective,
-    MdcFormsIconToggleDirective } from './components/icon-toggle/mdc.icon-toggle.directive';
-import { MdcLinearProgressDirective } from './components/linear-progress/mdc.linear-progress.directive';
-import { MdcListDividerDirective,
-    MdcListItemDirective,
-    MdcListItemTextDirective,
-    MdcListItemSecondaryTextDirective,
-    MdcListItemGraphicDirective,
-    MdcListItemMetaDirective,
-    MdcListDirective,
-    MdcListGroupSubHeaderDirective,
-    MdcListGroupDirective } from './components/list/mdc.list.directive';
-import { MdcMenuAnchorDirective, MdcMenuDirective } from './components/menu/mdc.menu.directive';
-import { MdcRadioDirective,
-    MdcRadioInputDirective } from './components/radio/mdc.radio.directive';
-import { MdcRippleDirective } from './components/ripple/mdc.ripple.directive';
-import { MdcSelectDirective, MdcSelectControlDirective } from './components/select/mdc.select.directive';
-import { MdcSliderDirective,
-    MdcFormsSliderDirective } from './components/slider/mdc.slider.directive';
-import { MdcSnackbarService, MDC_SNACKBAR_PROVIDER } from './components/snackbar/mdc.snackbar.service';
-import { MdcSwitchInputDirective,
-    MdcSwitchDirective } from './components/switch/mdc.switch.directive';    
-import { AbstractMdcTabDirective, MdcTabDirective,
-    MdcTabIconDirective,
-    MdcTabIconTextDirective,
-    MdcTabChange } from './components/tabs/mdc.tab.directive';
-import { MdcTabRouterDirective } from './components/tabs/mdc.tab.router.directive';
-import { MdcTabBarDirective } from './components/tabs/mdc.tab.bar.directive';
-import { MdcTabBarScrollerDirective,
-    MdcTabBarScrollerInnerDirective,
-    MdcTabBarScrollerBackDirective,
-    MdcTabBarScrollerForwardDirective,
-    MdcTabBarScrollerFrameDirective } from './components/tabs/mdc.tab.bar.scroller.directive';
-import { MdcTextFieldDirective,
-    MdcTextFieldInputDirective,
-    MdcTextFieldIconDirective,
-    MdcTextFieldHelperTextDirective } from './components/text-field/mdc.text-field.directive';
-import { MdcToolbarDirective,
-    MdcToolbarRowDirective,
-    MdcToolbarSectionDirective,
-    MdcToolbarTitleDirective,
-    MdcToolbarIcon,
-    MdcToolbarMenuIcon,
-    MdcToolbarFixedAdjustDirective } from './components/toolbar/mdc.toolbar.directive';
-import { MdcScrollbarResizeDirective } from './components/utility/mdc.scrollbar-resize.directive';
-import { MdcEventRegistry, MDC_EVENT_REGISTRY_PROVIDER } from './utils/mdc.event.registry';
-
-export { MdcButtonDirective } from './components/button/mdc.button.directive';
-export { MdcCardDirective,
-    MdcCardMediaDirective,
-    MdcCardMediaContentDirective,
-    MdcCardActionButtonsDirective,
-    MdcCardActionIconsDirective,
-    MdcCardActionsDirective,
-    MdcCardPrimaryActionDirective } from './components/card/mdc.card.directive';
-export { MdcCheckboxDirective,
-    MdcCheckboxInputDirective } from './components/checkbox/mdc.checkbox.directive';
-export { MdcDrawerDirective,
-    MdcDrawerContainerDirective,
-    MdcDrawerToolbarSpacerDirective,
-    MdcDrawerHeaderDirective,
-    MdcDrawerHeaderContentDirective,
-    MdcDrawerContentDirective } from './components/drawer/mdc.drawer.directive';
-export { MdcElevationDirective } from './components/elevation/mdc.elevation.directive';
-export { MdcFabDirective,
-    MdcFabIconDirective } from './components/fab/mdc.fab.directive';
-export { MdcFloatingLabelDirective } from './components/floating-label/mdc.floating-label.directive';
-export { MdcFormFieldDirective,
-    MdcFormFieldInputDirective,
-    MdcFormFieldLabelDirective } from './components/form-field/mdc.form-field.directive';
-export { MdcIconDirective } from './components/icon/mdc.icon.directive';
-export { MdcIconToggleDirective,
-    MdcIconToggleIconDirective,
-    MdcFormsIconToggleDirective } from './components/icon-toggle/mdc.icon-toggle.directive';
-export { MdcLinearProgressDirective } from './components/linear-progress/mdc.linear-progress.directive';
-export { MdcListDividerDirective,
-    MdcListItemDirective,
-    MdcListItemTextDirective,
-    MdcListItemSecondaryTextDirective,
-    MdcListItemGraphicDirective,
-    MdcListItemMetaDirective,
-    MdcListDirective,
-    MdcListGroupSubHeaderDirective,
-    MdcListGroupDirective } from './components/list/mdc.list.directive';
-export { MdcMenuAnchorDirective, MdcMenuDirective } from './components/menu/mdc.menu.directive';    
-export { MdcRadioDirective,
-    MdcRadioInputDirective } from './components/radio/mdc.radio.directive';
-export { MdcRippleDirective } from './components/ripple/mdc.ripple.directive';
-export { MdcSelectDirective, MdcSelectControlDirective } from './components/select/mdc.select.directive';
-export { MdcSliderDirective,
-    MdcFormsSliderDirective } from './components/slider/mdc.slider.directive';
-export { MdcSnackbarMessage } from './components/snackbar/mdc.snackbar.message';
-export { MdcSnackbarService } from './components/snackbar/mdc.snackbar.service';
-export { MdcSwitchInputDirective,
-    MdcSwitchDirective } from './components/switch/mdc.switch.directive';
-export { AbstractMdcTabDirective, MdcTabDirective,
-    MdcTabIconDirective,
-    MdcTabIconTextDirective,
-    MdcTabChange } from './components/tabs/mdc.tab.directive';
-export { MdcTabRouterDirective } from './components/tabs/mdc.tab.router.directive';
-export { MdcTabBarDirective } from './components/tabs/mdc.tab.bar.directive';
-export { MdcTabBarScrollerDirective,
-    MdcTabBarScrollerInnerDirective,
-    MdcTabBarScrollerBackDirective,
-    MdcTabBarScrollerForwardDirective,
-    MdcTabBarScrollerFrameDirective }
-export { MdcTextFieldDirective,
-    MdcTextFieldInputDirective,
-    MdcTextFieldIconDirective,
-    MdcTextFieldHelperTextDirective } from './components/text-field/mdc.text-field.directive';
-export { MdcToolbarDirective,
-    MdcToolbarRowDirective,
-    MdcToolbarSectionDirective,
-    MdcToolbarTitleDirective,
-    MdcToolbarIcon,
-    MdcToolbarMenuIcon,
-    MdcToolbarFixedAdjustDirective } from './components/toolbar/mdc.toolbar.directive';
-export { MdcScrollbarResizeDirective } from './components/utility/mdc.scrollbar-resize.directive';
-export { MdcEventRegistry } from './utils/mdc.event.registry';
-
-@NgModule({
-    imports: [
-        CommonModule
-    ],
-    providers: [
-        MDC_EVENT_REGISTRY_PROVIDER,
-        MDC_SNACKBAR_PROVIDER
-    ],
-    declarations: [
-        MdcButtonDirective,
-        MdcCardDirective, MdcCardMediaDirective, MdcCardMediaContentDirective,
-        MdcCardActionButtonsDirective, MdcCardActionIconsDirective, MdcCardActionsDirective, MdcCardPrimaryActionDirective,
-        MdcCheckboxDirective, MdcCheckboxInputDirective,
-        MdcDrawerDirective, MdcDrawerContainerDirective, MdcDrawerToolbarSpacerDirective, MdcDrawerHeaderDirective, MdcDrawerHeaderContentDirective, MdcDrawerContentDirective,
-        MdcElevationDirective,
-        MdcFabDirective, MdcFabIconDirective,
-        MdcFloatingLabelDirective,
-        MdcFormFieldDirective, MdcFormFieldInputDirective, MdcFormFieldLabelDirective,
-        MdcIconDirective,
-        MdcIconToggleDirective, MdcIconToggleIconDirective, MdcFormsIconToggleDirective,
-        MdcLinearProgressDirective,
-        MdcListDividerDirective, MdcListItemDirective, MdcListItemTextDirective, MdcListItemSecondaryTextDirective,
-        MdcListItemGraphicDirective, MdcListItemMetaDirective, MdcListDirective, MdcListGroupSubHeaderDirective, MdcListGroupDirective,
-        MdcMenuAnchorDirective, MdcMenuDirective,
-        MdcRadioDirective, MdcRadioInputDirective,
-        MdcRippleDirective,
-        MdcSelectDirective, MdcSelectControlDirective,
-        MdcSliderDirective, MdcFormsSliderDirective,
-        MdcSwitchInputDirective, MdcSwitchDirective,
-        MdcTabDirective, MdcTabIconDirective, MdcTabIconTextDirective,
-        MdcTabRouterDirective,
-        MdcTabBarDirective,
-        MdcTabBarScrollerDirective, MdcTabBarScrollerInnerDirective, MdcTabBarScrollerBackDirective, MdcTabBarScrollerForwardDirective, MdcTabBarScrollerFrameDirective,
-        MdcTextFieldDirective, MdcTextFieldInputDirective, MdcTextFieldIconDirective, MdcTextFieldHelperTextDirective,
-        MdcToolbarDirective, MdcToolbarRowDirective, MdcToolbarSectionDirective, MdcToolbarTitleDirective, MdcToolbarIcon, MdcToolbarMenuIcon, MdcToolbarFixedAdjustDirective,
-        MdcScrollbarResizeDirective
-    ],
-    exports: [
-        MdcButtonDirective,
-        MdcCardDirective, MdcCardMediaDirective, MdcCardMediaContentDirective,
-        MdcCardActionButtonsDirective, MdcCardActionIconsDirective, MdcCardActionsDirective, MdcCardPrimaryActionDirective,
-        MdcCheckboxDirective, MdcCheckboxInputDirective,
-        MdcDrawerDirective, MdcDrawerContainerDirective, MdcDrawerToolbarSpacerDirective, MdcDrawerHeaderDirective, MdcDrawerHeaderContentDirective, MdcDrawerContentDirective,
-        MdcElevationDirective,
-        MdcFabDirective, MdcFabIconDirective,
-        MdcFloatingLabelDirective,
-        MdcFormFieldDirective, MdcFormFieldInputDirective, MdcFormFieldLabelDirective,
-        MdcIconDirective,
-        MdcIconToggleDirective, MdcIconToggleIconDirective, MdcFormsIconToggleDirective,
-        MdcLinearProgressDirective,
-        MdcListDividerDirective, MdcListItemDirective, MdcListItemTextDirective, MdcListItemSecondaryTextDirective,
-        MdcListItemGraphicDirective, MdcListItemMetaDirective, MdcListDirective, MdcListGroupSubHeaderDirective, MdcListGroupDirective,
-        MdcMenuAnchorDirective, MdcMenuDirective,
-        MdcRadioDirective, MdcRadioInputDirective,
-        MdcRippleDirective,
-        MdcSelectDirective, MdcSelectControlDirective,
-        MdcSliderDirective, MdcFormsSliderDirective,
-        MdcSwitchInputDirective, MdcSwitchDirective,
-        MdcTabDirective, MdcTabIconDirective, MdcTabIconTextDirective,
-        MdcTabRouterDirective,
-        MdcTabBarDirective,
-        MdcTabBarScrollerDirective, MdcTabBarScrollerInnerDirective, MdcTabBarScrollerBackDirective, MdcTabBarScrollerForwardDirective, MdcTabBarScrollerFrameDirective,
-        MdcTextFieldDirective, MdcTextFieldInputDirective, MdcTextFieldIconDirective, MdcTextFieldHelperTextDirective,
-        MdcToolbarDirective, MdcToolbarRowDirective, MdcToolbarSectionDirective, MdcToolbarTitleDirective, MdcToolbarIcon, MdcToolbarMenuIcon, MdcToolbarFixedAdjustDirective,
-        MdcScrollbarResizeDirective
-    ]
-})
-export class MaterialModule {}
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MdcButtonDirective, MdcButtonIconDirective } from './components/button/mdc.button.directive';
+import { MdcCardDirective,
+    MdcCardMediaDirective,
+    MdcCardMediaContentDirective,
+    MdcCardActionButtonsDirective,
+    MdcCardActionIconsDirective,
+    MdcCardActionsDirective,
+    MdcCardPrimaryActionDirective } from './components/card/mdc.card.directive';
+import { MdcCheckboxDirective,
+    MdcCheckboxInputDirective } from './components/checkbox/mdc.checkbox.directive';
+import { MdcDrawerDirective,
+    MdcDrawerContainerDirective,
+    MdcDrawerToolbarSpacerDirective,
+    MdcDrawerHeaderDirective,
+    MdcDrawerHeaderContentDirective,
+    MdcDrawerContentDirective } from './components/drawer/mdc.drawer.directive';
+import { MdcElevationDirective } from './components/elevation/mdc.elevation.directive';
+import { MdcFabDirective,
+    MdcFabIconDirective } from './components/fab/mdc.fab.directive';
+import { MdcFloatingLabelDirective } from './components/floating-label/mdc.floating-label.directive';
+import { MdcFormFieldDirective,
+    MdcFormFieldInputDirective,
+    MdcFormFieldLabelDirective } from './components/form-field/mdc.form-field.directive';
+import { MdcIconDirective } from './components/icon/mdc.icon.directive';
+import { MdcIconToggleDirective,
+    MdcIconToggleIconDirective,
+    MdcFormsIconToggleDirective } from './components/icon-toggle/mdc.icon-toggle.directive';
+import { MdcLinearProgressDirective } from './components/linear-progress/mdc.linear-progress.directive';
+import { MdcListDividerDirective,
+    MdcListItemDirective,
+    MdcListItemTextDirective,
+    MdcListItemSecondaryTextDirective,
+    MdcListItemGraphicDirective,
+    MdcListItemMetaDirective,
+    MdcListDirective,
+    MdcListGroupSubHeaderDirective,
+    MdcListGroupDirective } from './components/list/mdc.list.directive';
+import { MdcMenuAnchorDirective, MdcMenuDirective } from './components/menu/mdc.menu.directive';
+import { MdcRadioDirective,
+    MdcRadioInputDirective } from './components/radio/mdc.radio.directive';
+import { MdcRippleDirective } from './components/ripple/mdc.ripple.directive';
+import { MdcSelectDirective, MdcSelectControlDirective } from './components/select/mdc.select.directive';
+import { MdcSliderDirective,
+    MdcFormsSliderDirective } from './components/slider/mdc.slider.directive';
+import { MdcSnackbarService, MDC_SNACKBAR_PROVIDER } from './components/snackbar/mdc.snackbar.service';
+import { MdcSwitchInputDirective,
+    MdcSwitchDirective } from './components/switch/mdc.switch.directive';    
+import { AbstractMdcTabDirective, MdcTabDirective,
+    MdcTabIconDirective,
+    MdcTabIconTextDirective,
+    MdcTabChange } from './components/tabs/mdc.tab.directive';
+import { MdcTabRouterDirective } from './components/tabs/mdc.tab.router.directive';
+import { MdcTabBarDirective } from './components/tabs/mdc.tab.bar.directive';
+import { MdcTabBarScrollerDirective,
+    MdcTabBarScrollerInnerDirective,
+    MdcTabBarScrollerBackDirective,
+    MdcTabBarScrollerForwardDirective,
+    MdcTabBarScrollerFrameDirective } from './components/tabs/mdc.tab.bar.scroller.directive';
+import { MdcTextFieldDirective,
+    MdcTextFieldInputDirective,
+    MdcTextFieldIconDirective,
+    MdcTextFieldHelperTextDirective } from './components/text-field/mdc.text-field.directive';
+import { MdcToolbarDirective,
+    MdcToolbarRowDirective,
+    MdcToolbarSectionDirective,
+    MdcToolbarTitleDirective,
+    MdcToolbarIcon,
+    MdcToolbarMenuIcon,
+    MdcToolbarFixedAdjustDirective } from './components/toolbar/mdc.toolbar.directive';
+import { MdcScrollbarResizeDirective } from './components/utility/mdc.scrollbar-resize.directive';
+import { MdcEventRegistry, MDC_EVENT_REGISTRY_PROVIDER } from './utils/mdc.event.registry';
+
+export * from './components/button/mdc.button.directive';
+export { MdcCardDirective,
+    MdcCardMediaDirective,
+    MdcCardMediaContentDirective,
+    MdcCardActionButtonsDirective,
+    MdcCardActionIconsDirective,
+    MdcCardActionsDirective,
+    MdcCardPrimaryActionDirective } from './components/card/mdc.card.directive';
+export { MdcCheckboxDirective,
+    MdcCheckboxInputDirective } from './components/checkbox/mdc.checkbox.directive';
+export { MdcDrawerDirective,
+    MdcDrawerContainerDirective,
+    MdcDrawerToolbarSpacerDirective,
+    MdcDrawerHeaderDirective,
+    MdcDrawerHeaderContentDirective,
+    MdcDrawerContentDirective } from './components/drawer/mdc.drawer.directive';
+export { MdcElevationDirective } from './components/elevation/mdc.elevation.directive';
+export { MdcFabDirective,
+    MdcFabIconDirective } from './components/fab/mdc.fab.directive';
+export { MdcFloatingLabelDirective } from './components/floating-label/mdc.floating-label.directive';
+export { MdcFormFieldDirective,
+    MdcFormFieldInputDirective,
+    MdcFormFieldLabelDirective } from './components/form-field/mdc.form-field.directive';
+export { MdcIconDirective } from './components/icon/mdc.icon.directive';
+export { MdcIconToggleDirective,
+    MdcIconToggleIconDirective,
+    MdcFormsIconToggleDirective } from './components/icon-toggle/mdc.icon-toggle.directive';
+export { MdcLinearProgressDirective } from './components/linear-progress/mdc.linear-progress.directive';
+export { MdcListDividerDirective,
+    MdcListItemDirective,
+    MdcListItemTextDirective,
+    MdcListItemSecondaryTextDirective,
+    MdcListItemGraphicDirective,
+    MdcListItemMetaDirective,
+    MdcListDirective,
+    MdcListGroupSubHeaderDirective,
+    MdcListGroupDirective } from './components/list/mdc.list.directive';
+export { MdcMenuAnchorDirective, MdcMenuDirective } from './components/menu/mdc.menu.directive';    
+export { MdcRadioDirective,
+    MdcRadioInputDirective } from './components/radio/mdc.radio.directive';
+export * from './components/ripple/abstract.mdc.ripple';
+export { MdcRippleDirective } from './components/ripple/mdc.ripple.directive';
+export { MdcSelectDirective, MdcSelectControlDirective } from './components/select/mdc.select.directive';
+export { MdcSliderDirective,
+    MdcFormsSliderDirective } from './components/slider/mdc.slider.directive';
+export { MdcSnackbarMessage } from './components/snackbar/mdc.snackbar.message';
+export { MdcSnackbarService } from './components/snackbar/mdc.snackbar.service';
+export { MdcSwitchInputDirective,
+    MdcSwitchDirective } from './components/switch/mdc.switch.directive';
+export { AbstractMdcTabDirective, MdcTabDirective,
+    MdcTabIconDirective,
+    MdcTabIconTextDirective,
+    MdcTabChange } from './components/tabs/mdc.tab.directive';
+export { MdcTabRouterDirective } from './components/tabs/mdc.tab.router.directive';
+export { MdcTabBarDirective } from './components/tabs/mdc.tab.bar.directive';
+export { MdcTabBarScrollerDirective,
+    MdcTabBarScrollerInnerDirective,
+    MdcTabBarScrollerBackDirective,
+    MdcTabBarScrollerForwardDirective,
+    MdcTabBarScrollerFrameDirective }
+export { MdcTextFieldDirective,
+    MdcTextFieldInputDirective,
+    MdcTextFieldIconDirective,
+    MdcTextFieldHelperTextDirective } from './components/text-field/mdc.text-field.directive';
+export { MdcToolbarDirective,
+    MdcToolbarRowDirective,
+    MdcToolbarSectionDirective,
+    MdcToolbarTitleDirective,
+    MdcToolbarIcon,
+    MdcToolbarMenuIcon,
+    MdcToolbarFixedAdjustDirective } from './components/toolbar/mdc.toolbar.directive';
+export { MdcScrollbarResizeDirective } from './components/utility/mdc.scrollbar-resize.directive';
+export { MdcEventRegistry } from './utils/mdc.event.registry';
+
+@NgModule({
+    imports: [
+        CommonModule
+    ],
+    providers: [
+        MDC_EVENT_REGISTRY_PROVIDER,
+        MDC_SNACKBAR_PROVIDER
+    ],
+    declarations: [
+        MdcButtonDirective, MdcButtonIconDirective,
+        MdcCardDirective, MdcCardMediaDirective, MdcCardMediaContentDirective,
+        MdcCardActionButtonsDirective, MdcCardActionIconsDirective, MdcCardActionsDirective, MdcCardPrimaryActionDirective,
+        MdcCheckboxDirective, MdcCheckboxInputDirective,
+        MdcDrawerDirective, MdcDrawerContainerDirective, MdcDrawerToolbarSpacerDirective, MdcDrawerHeaderDirective, MdcDrawerHeaderContentDirective, MdcDrawerContentDirective,
+        MdcElevationDirective,
+        MdcFabDirective, MdcFabIconDirective,
+        MdcFloatingLabelDirective,
+        MdcFormFieldDirective, MdcFormFieldInputDirective, MdcFormFieldLabelDirective,
+        MdcIconDirective,
+        MdcIconToggleDirective, MdcIconToggleIconDirective, MdcFormsIconToggleDirective,
+        MdcLinearProgressDirective,
+        MdcListDividerDirective, MdcListItemDirective, MdcListItemTextDirective, MdcListItemSecondaryTextDirective,
+        MdcListItemGraphicDirective, MdcListItemMetaDirective, MdcListDirective, MdcListGroupSubHeaderDirective, MdcListGroupDirective,
+        MdcMenuAnchorDirective, MdcMenuDirective,
+        MdcRadioDirective, MdcRadioInputDirective,
+        MdcRippleDirective,
+        MdcSelectDirective, MdcSelectControlDirective,
+        MdcSliderDirective, MdcFormsSliderDirective,
+        MdcSwitchInputDirective, MdcSwitchDirective,
+        MdcTabDirective, MdcTabIconDirective, MdcTabIconTextDirective,
+        MdcTabRouterDirective,
+        MdcTabBarDirective,
+        MdcTabBarScrollerDirective, MdcTabBarScrollerInnerDirective, MdcTabBarScrollerBackDirective, MdcTabBarScrollerForwardDirective, MdcTabBarScrollerFrameDirective,
+        MdcTextFieldDirective, MdcTextFieldInputDirective, MdcTextFieldIconDirective, MdcTextFieldHelperTextDirective,
+        MdcToolbarDirective, MdcToolbarRowDirective, MdcToolbarSectionDirective, MdcToolbarTitleDirective, MdcToolbarIcon, MdcToolbarMenuIcon, MdcToolbarFixedAdjustDirective,
+        MdcScrollbarResizeDirective
+    ],
+    exports: [
+        MdcButtonDirective, MdcButtonIconDirective,
+        MdcCardDirective, MdcCardMediaDirective, MdcCardMediaContentDirective,
+        MdcCardActionButtonsDirective, MdcCardActionIconsDirective, MdcCardActionsDirective, MdcCardPrimaryActionDirective,
+        MdcCheckboxDirective, MdcCheckboxInputDirective,
+        MdcDrawerDirective, MdcDrawerContainerDirective, MdcDrawerToolbarSpacerDirective, MdcDrawerHeaderDirective, MdcDrawerHeaderContentDirective, MdcDrawerContentDirective,
+        MdcElevationDirective,
+        MdcFabDirective, MdcFabIconDirective,
+        MdcFloatingLabelDirective,
+        MdcFormFieldDirective, MdcFormFieldInputDirective, MdcFormFieldLabelDirective,
+        MdcIconDirective,
+        MdcIconToggleDirective, MdcIconToggleIconDirective, MdcFormsIconToggleDirective,
+        MdcLinearProgressDirective,
+        MdcListDividerDirective, MdcListItemDirective, MdcListItemTextDirective, MdcListItemSecondaryTextDirective,
+        MdcListItemGraphicDirective, MdcListItemMetaDirective, MdcListDirective, MdcListGroupSubHeaderDirective, MdcListGroupDirective,
+        MdcMenuAnchorDirective, MdcMenuDirective,
+        MdcRadioDirective, MdcRadioInputDirective,
+        MdcRippleDirective,
+        MdcSelectDirective, MdcSelectControlDirective,
+        MdcSliderDirective, MdcFormsSliderDirective,
+        MdcSwitchInputDirective, MdcSwitchDirective,
+        MdcTabDirective, MdcTabIconDirective, MdcTabIconTextDirective,
+        MdcTabRouterDirective,
+        MdcTabBarDirective,
+        MdcTabBarScrollerDirective, MdcTabBarScrollerInnerDirective, MdcTabBarScrollerBackDirective, MdcTabBarScrollerForwardDirective, MdcTabBarScrollerFrameDirective,
+        MdcTextFieldDirective, MdcTextFieldInputDirective, MdcTextFieldIconDirective, MdcTextFieldHelperTextDirective,
+        MdcToolbarDirective, MdcToolbarRowDirective, MdcToolbarSectionDirective, MdcToolbarTitleDirective, MdcToolbarIcon, MdcToolbarMenuIcon, MdcToolbarFixedAdjustDirective,
+        MdcScrollbarResizeDirective
+    ]
+})
+export class MaterialModule {}