From 48627ea8ae5ce85a5697a3dbdf138670f46cd1cc Mon Sep 17 00:00:00 2001
From: Hans Larsen <hans@hansl.ca>
Date: Wed, 3 Aug 2016 13:46:02 -0700
Subject: [PATCH] build: move from angular-cli to gulp

---
 .travis.yml                                   |   1 -
 angular-cli-build.js                          | 111 --------
 angular-cli.json                              |  25 --
 gulpfile.js                                   | 245 ++++++++++++++++++
 package.json                                  |  24 +-
 scripts/ci/build-and-test.sh                  |   3 +-
 scripts/release/inline-resources.js           |  49 ++--
 scripts/serve-dist.js                         |  22 ++
 src/demo-app/environment.ts                   |   7 -
 src/demo-app/index.html                       |  18 +-
 src/demo-app/system-config.ts                 |   6 -
 src/demo-app/tsconfig.json                    |  25 +-
 src/demo-app/typings.d.ts                     |   2 -
 src/e2e-app/index.html                        |  15 +-
 src/e2e-app/system-config.ts                  |  31 ++-
 src/e2e-app/tsconfig.json                     |  28 +-
 src/e2e-app/typings.d.ts                      |   3 -
 .../button-toggle/README.md                   |   0
 .../button-toggle/button-toggle.html          |   0
 .../button-toggle/button-toggle.scss          |   0
 .../button-toggle/button-toggle.spec.ts       |   0
 .../button-toggle/button-toggle.ts            |   9 +-
 .../button-toggle/package.json                |   0
 src/{components => lib}/button/README.md      |   0
 .../button/_button-base.scss                  |   0
 .../button/_button-theme.scss                 |   0
 src/{components => lib}/button/button.html    |   0
 src/{components => lib}/button/button.scss    |   0
 src/{components => lib}/button/button.spec.ts |   0
 src/{components => lib}/button/button.ts      |   2 -
 src/lib/button/index.ts                       |   1 +
 src/{components => lib}/button/package.json   |   0
 src/{components => lib}/card/README.md        |   0
 src/{components => lib}/card/card-header.html |   0
 .../card/card-title-group.html                |   0
 src/{components => lib}/card/card.html        |   0
 src/{components => lib}/card/card.scss        |   0
 src/{components => lib}/card/card.ts          |   3 -
 src/{components => lib}/card/package.json     |   0
 src/{components => lib}/checkbox/README.md    |   0
 .../checkbox/checkbox.html                    |   0
 .../checkbox/checkbox.scss                    |   0
 .../checkbox/checkbox.spec.ts                 |   0
 src/{components => lib}/checkbox/checkbox.ts  |   1 -
 src/{components => lib}/checkbox/package.json |   0
 src/{ => lib}/core/README.md                  |   0
 src/{ => lib}/core/a11y/README.md             |   0
 src/{ => lib}/core/a11y/live-announcer.scss   |   0
 .../core/a11y/live-announcer.spec.ts          |   0
 src/{ => lib}/core/a11y/live-announcer.ts     |   0
 .../core/annotations/field-value.spec.ts      |   0
 src/{ => lib}/core/annotations/field-value.ts |   0
 src/{ => lib}/core/async/promise-completer.ts |   0
 .../unique-selection-dispatcher.ts            |   0
 src/{ => lib}/core/core.ts                    |   0
 src/{ => lib}/core/errors/error.ts            |   0
 .../core/gestures/MdGestureConfig.ts          |   0
 src/{ => lib}/core/line/line.ts               |   0
 .../core/overlay/generic-component-type.ts    |   0
 .../core/overlay/overlay-container.ts         |   0
 .../core/overlay/overlay-directives.spec.ts   |   0
 .../core/overlay/overlay-directives.ts        |   0
 src/{ => lib}/core/overlay/overlay-ref.ts     |   0
 src/{ => lib}/core/overlay/overlay-state.ts   |   0
 src/{ => lib}/core/overlay/overlay.scss       |   0
 src/{ => lib}/core/overlay/overlay.spec.ts    |   0
 src/{ => lib}/core/overlay/overlay.ts         |   0
 .../connected-position-strategy.spec.ts       |   0
 .../position/connected-position-strategy.ts   |   0
 .../overlay/position/connected-position.ts    |   0
 .../position/global-position-strategy.spec.ts |   0
 .../position/global-position-strategy.ts      |   0
 .../position/overlay-position-builder.ts      |   0
 .../overlay/position/position-strategy.ts     |   0
 .../position/relative-position-strategy.ts    |   0
 .../overlay/position/viewport-ruler.spec.ts   |   0
 .../core/overlay/position/viewport-ruler.ts   |   0
 src/{ => lib}/core/package.json               |   0
 src/{ => lib}/core/portal/README.md           |   0
 src/{ => lib}/core/portal/dom-portal-host.ts  |   0
 .../core/portal/portal-directives.ts          |   0
 src/{ => lib}/core/portal/portal-errors.ts    |   0
 src/{ => lib}/core/portal/portal.spec.ts      |   0
 src/{ => lib}/core/portal/portal.ts           |   0
 src/{ => lib}/core/ripple/README.md           |   0
 src/{ => lib}/core/ripple/ripple-renderer.ts  |   0
 src/{ => lib}/core/ripple/ripple.spec.ts      |   0
 src/{ => lib}/core/ripple/ripple.ts           |   0
 src/{ => lib}/core/rtl/dir.ts                 |   0
 src/{ => lib}/core/style/_button-mixins.scss  |   0
 src/{ => lib}/core/style/_default-theme.scss  |   0
 src/{ => lib}/core/style/_elevation.scss      |   0
 src/{ => lib}/core/style/_list-shared.scss    |   0
 src/{ => lib}/core/style/_mixins.scss         |   0
 src/{ => lib}/core/style/_palette.scss        |   0
 src/{ => lib}/core/style/_ripple.scss         |   0
 src/{ => lib}/core/style/_sidenav-mixins.scss |   0
 .../core/style/_theme-functions.scss          |   0
 src/{ => lib}/core/style/_variables.scss      |   0
 src/{ => lib}/core/style/apply-transform.ts   |   0
 src/{ => lib}/core/style/core.scss            |   0
 .../dialog/dialog-config.ts                   |   0
 .../dialog/dialog-container.html              |   0
 .../dialog/dialog-container.scss              |   0
 .../dialog/dialog-container.ts                |   1 -
 .../dialog/dialog-errors.ts                   |   0
 .../dialog/dialog-injector.ts                 |   0
 src/{components => lib}/dialog/dialog-ref.ts  |   0
 src/{components => lib}/dialog/dialog.spec.ts |   0
 src/{components => lib}/dialog/dialog.ts      |   0
 src/{components => lib}/grid-list/README.md   |   0
 .../grid-list/grid-list-errors.ts             |   0
 .../grid-list/grid-list-measure.ts            |   0
 .../grid-list/grid-list.html                  |   0
 .../grid-list/grid-list.scss                  |   0
 .../grid-list/grid-list.spec.ts               |   0
 .../grid-list/grid-list.ts                    |   1 -
 .../grid-list/grid-tile-text.html             |   0
 .../grid-list/grid-tile.html                  |   0
 .../grid-list/grid-tile.ts                    |   2 -
 .../grid-list/package.json                    |   0
 .../grid-list/tile-coordinator.ts             |   0
 .../grid-list/tile-styler.ts                  |   0
 src/{components => lib}/icon/README.md        |   0
 src/{components => lib}/icon/fake-svgs.ts     |   0
 src/{components => lib}/icon/icon-registry.ts |   0
 src/{components => lib}/icon/icon.scss        |   0
 src/{components => lib}/icon/icon.spec.ts     |   0
 src/{components => lib}/icon/icon.ts          |   1 -
 src/{components => lib}/icon/package.json     |   0
 src/{components => lib}/input/README.md       |   0
 src/{components => lib}/input/input.html      |   0
 src/{components => lib}/input/input.scss      |   0
 src/{components => lib}/input/input.spec.ts   |   0
 src/{components => lib}/input/input.ts        |   1 -
 src/{components => lib}/input/package.json    |   0
 src/{components => lib}/list/README.md        |   0
 src/{components => lib}/list/list-item.html   |   0
 src/{components => lib}/list/list.scss        |   0
 src/{components => lib}/list/list.spec.ts     |   0
 src/{components => lib}/list/list.ts          |   2 -
 src/{components => lib}/list/package.json     |   0
 src/{components => lib}/menu/README.md        |   0
 .../menu/menu-directive.ts                    |   1 -
 src/{components => lib}/menu/menu-errors.ts   |   0
 src/{components => lib}/menu/menu-item.ts     |   0
 .../menu/menu-positions.ts                    |   0
 src/{components => lib}/menu/menu-trigger.ts  |   0
 src/{components => lib}/menu/menu.html        |   0
 src/{components => lib}/menu/menu.scss        |   0
 src/{components => lib}/menu/menu.spec.ts     |   0
 src/{components => lib}/menu/menu.ts          |   0
 src/{components => lib}/menu/package.json     |   0
 .../progress-bar/README.md                    |   0
 .../progress-bar/package.json                 |   0
 .../progress-bar/progress-bar.html            |   0
 .../progress-bar/progress-bar.scss            |   0
 .../progress-bar/progress-bar.spec.ts         |   0
 .../progress-bar/progress-bar.ts              |   1 -
 .../progress-circle/README.md                 |   0
 .../progress-circle/package.json              |   0
 .../progress-circle/progress-circle.html      |   0
 .../progress-circle/progress-circle.scss      |   0
 .../progress-circle/progress-circle.spec.ts   |   0
 .../progress-circle/progress-circle.ts        |   2 -
 src/{components => lib}/radio/README.md       |   0
 src/{components => lib}/radio/package.json    |   0
 src/{components => lib}/radio/radio.html      |   0
 src/{components => lib}/radio/radio.scss      |   0
 src/{components => lib}/radio/radio.spec.ts   |   0
 src/{components => lib}/radio/radio.ts        |   9 +-
 src/{components => lib}/sidenav/README.md     |   0
 src/{components => lib}/sidenav/package.json  |   0
 .../sidenav/sidenav-transitions.scss          |   0
 src/{components => lib}/sidenav/sidenav.html  |   0
 src/{components => lib}/sidenav/sidenav.scss  |   0
 .../sidenav/sidenav.spec.ts                   |   0
 src/{components => lib}/sidenav/sidenav.ts    |   1 -
 .../slide-toggle/README.md                    |   0
 .../slide-toggle/package.json                 |   0
 .../slide-toggle/slide-toggle.html            |   0
 .../slide-toggle/slide-toggle.scss            |   0
 .../slide-toggle/slide-toggle.spec.ts         |   0
 .../slide-toggle/slide-toggle.ts              |  11 +-
 src/{components => lib}/slider/slider.html    |   0
 src/{components => lib}/slider/slider.scss    |   0
 src/{components => lib}/slider/slider.spec.ts |   0
 src/{components => lib}/slider/slider.ts      |   3 +-
 .../slider/test-gesture-config.ts             |   0
 src/{components => lib}/tabs/README.md        |   0
 src/{components => lib}/tabs/ink-bar.ts       |   0
 src/{components => lib}/tabs/package.json     |   0
 src/{components => lib}/tabs/tab-content.ts   |   0
 src/{components => lib}/tabs/tab-group.html   |   0
 src/{components => lib}/tabs/tab-group.scss   |   0
 .../tabs/tab-group.spec.ts                    |   0
 .../tabs/tab-label-wrapper.ts                 |   0
 src/{components => lib}/tabs/tab-label.ts     |   0
 src/{components => lib}/tabs/tabs.ts          |   1 -
 src/{components => lib}/toolbar/README.md     |   0
 src/{components => lib}/toolbar/package.json  |   0
 src/{components => lib}/toolbar/toolbar.html  |   0
 src/{components => lib}/toolbar/toolbar.scss  |   0
 .../toolbar/toolbar.spec.ts                   |   0
 src/{components => lib}/toolbar/toolbar.ts    |   1 -
 src/{components => lib}/tooltip/README.md     |   0
 src/{components => lib}/tooltip/tooltip.html  |   0
 src/{components => lib}/tooltip/tooltip.scss  |   0
 .../tooltip/tooltip.spec.ts                   |   3 +-
 src/{components => lib}/tooltip/tooltip.ts    |   1 -
 src/lib/tsconfig.json                         |  36 +++
 typings.json                                  |  12 -
 212 files changed, 423 insertions(+), 298 deletions(-)
 delete mode 100644 angular-cli-build.js
 delete mode 100644 angular-cli.json
 create mode 100644 gulpfile.js
 create mode 100644 scripts/serve-dist.js
 delete mode 100644 src/demo-app/environment.ts
 rename src/{components => lib}/button-toggle/README.md (100%)
 rename src/{components => lib}/button-toggle/button-toggle.html (100%)
 rename src/{components => lib}/button-toggle/button-toggle.scss (100%)
 rename src/{components => lib}/button-toggle/button-toggle.spec.ts (100%)
 rename src/{components => lib}/button-toggle/button-toggle.ts (98%)
 rename src/{components => lib}/button-toggle/package.json (100%)
 rename src/{components => lib}/button/README.md (100%)
 rename src/{components => lib}/button/_button-base.scss (100%)
 rename src/{components => lib}/button/_button-theme.scss (100%)
 rename src/{components => lib}/button/button.html (100%)
 rename src/{components => lib}/button/button.scss (100%)
 rename src/{components => lib}/button/button.spec.ts (100%)
 rename src/{components => lib}/button/button.ts (98%)
 create mode 100644 src/lib/button/index.ts
 rename src/{components => lib}/button/package.json (100%)
 rename src/{components => lib}/card/README.md (100%)
 rename src/{components => lib}/card/card-header.html (100%)
 rename src/{components => lib}/card/card-title-group.html (100%)
 rename src/{components => lib}/card/card.html (100%)
 rename src/{components => lib}/card/card.scss (100%)
 rename src/{components => lib}/card/card.ts (96%)
 rename src/{components => lib}/card/package.json (100%)
 rename src/{components => lib}/checkbox/README.md (100%)
 rename src/{components => lib}/checkbox/checkbox.html (100%)
 rename src/{components => lib}/checkbox/checkbox.scss (100%)
 rename src/{components => lib}/checkbox/checkbox.spec.ts (100%)
 rename src/{components => lib}/checkbox/checkbox.ts (99%)
 rename src/{components => lib}/checkbox/package.json (100%)
 rename src/{ => lib}/core/README.md (100%)
 rename src/{ => lib}/core/a11y/README.md (100%)
 rename src/{ => lib}/core/a11y/live-announcer.scss (100%)
 rename src/{ => lib}/core/a11y/live-announcer.spec.ts (100%)
 rename src/{ => lib}/core/a11y/live-announcer.ts (100%)
 rename src/{ => lib}/core/annotations/field-value.spec.ts (100%)
 rename src/{ => lib}/core/annotations/field-value.ts (100%)
 rename src/{ => lib}/core/async/promise-completer.ts (100%)
 rename src/{ => lib}/core/coordination/unique-selection-dispatcher.ts (100%)
 rename src/{ => lib}/core/core.ts (100%)
 rename src/{ => lib}/core/errors/error.ts (100%)
 rename src/{ => lib}/core/gestures/MdGestureConfig.ts (100%)
 rename src/{ => lib}/core/line/line.ts (100%)
 rename src/{ => lib}/core/overlay/generic-component-type.ts (100%)
 rename src/{ => lib}/core/overlay/overlay-container.ts (100%)
 rename src/{ => lib}/core/overlay/overlay-directives.spec.ts (100%)
 rename src/{ => lib}/core/overlay/overlay-directives.ts (100%)
 rename src/{ => lib}/core/overlay/overlay-ref.ts (100%)
 rename src/{ => lib}/core/overlay/overlay-state.ts (100%)
 rename src/{ => lib}/core/overlay/overlay.scss (100%)
 rename src/{ => lib}/core/overlay/overlay.spec.ts (100%)
 rename src/{ => lib}/core/overlay/overlay.ts (100%)
 rename src/{ => lib}/core/overlay/position/connected-position-strategy.spec.ts (100%)
 rename src/{ => lib}/core/overlay/position/connected-position-strategy.ts (100%)
 rename src/{ => lib}/core/overlay/position/connected-position.ts (100%)
 rename src/{ => lib}/core/overlay/position/global-position-strategy.spec.ts (100%)
 rename src/{ => lib}/core/overlay/position/global-position-strategy.ts (100%)
 rename src/{ => lib}/core/overlay/position/overlay-position-builder.ts (100%)
 rename src/{ => lib}/core/overlay/position/position-strategy.ts (100%)
 rename src/{ => lib}/core/overlay/position/relative-position-strategy.ts (100%)
 rename src/{ => lib}/core/overlay/position/viewport-ruler.spec.ts (100%)
 rename src/{ => lib}/core/overlay/position/viewport-ruler.ts (100%)
 rename src/{ => lib}/core/package.json (100%)
 rename src/{ => lib}/core/portal/README.md (100%)
 rename src/{ => lib}/core/portal/dom-portal-host.ts (100%)
 rename src/{ => lib}/core/portal/portal-directives.ts (100%)
 rename src/{ => lib}/core/portal/portal-errors.ts (100%)
 rename src/{ => lib}/core/portal/portal.spec.ts (100%)
 rename src/{ => lib}/core/portal/portal.ts (100%)
 rename src/{ => lib}/core/ripple/README.md (100%)
 rename src/{ => lib}/core/ripple/ripple-renderer.ts (100%)
 rename src/{ => lib}/core/ripple/ripple.spec.ts (100%)
 rename src/{ => lib}/core/ripple/ripple.ts (100%)
 rename src/{ => lib}/core/rtl/dir.ts (100%)
 rename src/{ => lib}/core/style/_button-mixins.scss (100%)
 rename src/{ => lib}/core/style/_default-theme.scss (100%)
 rename src/{ => lib}/core/style/_elevation.scss (100%)
 rename src/{ => lib}/core/style/_list-shared.scss (100%)
 rename src/{ => lib}/core/style/_mixins.scss (100%)
 rename src/{ => lib}/core/style/_palette.scss (100%)
 rename src/{ => lib}/core/style/_ripple.scss (100%)
 rename src/{ => lib}/core/style/_sidenav-mixins.scss (100%)
 rename src/{ => lib}/core/style/_theme-functions.scss (100%)
 rename src/{ => lib}/core/style/_variables.scss (100%)
 rename src/{ => lib}/core/style/apply-transform.ts (100%)
 rename src/{ => lib}/core/style/core.scss (100%)
 rename src/{components => lib}/dialog/dialog-config.ts (100%)
 rename src/{components => lib}/dialog/dialog-container.html (100%)
 rename src/{components => lib}/dialog/dialog-container.scss (100%)
 rename src/{components => lib}/dialog/dialog-container.ts (99%)
 rename src/{components => lib}/dialog/dialog-errors.ts (100%)
 rename src/{components => lib}/dialog/dialog-injector.ts (100%)
 rename src/{components => lib}/dialog/dialog-ref.ts (100%)
 rename src/{components => lib}/dialog/dialog.spec.ts (100%)
 rename src/{components => lib}/dialog/dialog.ts (100%)
 rename src/{components => lib}/grid-list/README.md (100%)
 rename src/{components => lib}/grid-list/grid-list-errors.ts (100%)
 rename src/{components => lib}/grid-list/grid-list-measure.ts (100%)
 rename src/{components => lib}/grid-list/grid-list.html (100%)
 rename src/{components => lib}/grid-list/grid-list.scss (100%)
 rename src/{components => lib}/grid-list/grid-list.spec.ts (100%)
 rename src/{components => lib}/grid-list/grid-list.ts (99%)
 rename src/{components => lib}/grid-list/grid-tile-text.html (100%)
 rename src/{components => lib}/grid-list/grid-tile.html (100%)
 rename src/{components => lib}/grid-list/grid-tile.ts (97%)
 rename src/{components => lib}/grid-list/package.json (100%)
 rename src/{components => lib}/grid-list/tile-coordinator.ts (100%)
 rename src/{components => lib}/grid-list/tile-styler.ts (100%)
 rename src/{components => lib}/icon/README.md (100%)
 rename src/{components => lib}/icon/fake-svgs.ts (100%)
 rename src/{components => lib}/icon/icon-registry.ts (100%)
 rename src/{components => lib}/icon/icon.scss (100%)
 rename src/{components => lib}/icon/icon.spec.ts (100%)
 rename src/{components => lib}/icon/icon.ts (99%)
 rename src/{components => lib}/icon/package.json (100%)
 rename src/{components => lib}/input/README.md (100%)
 rename src/{components => lib}/input/input.html (100%)
 rename src/{components => lib}/input/input.scss (100%)
 rename src/{components => lib}/input/input.spec.ts (100%)
 rename src/{components => lib}/input/input.ts (99%)
 rename src/{components => lib}/input/package.json (100%)
 rename src/{components => lib}/list/README.md (100%)
 rename src/{components => lib}/list/list-item.html (100%)
 rename src/{components => lib}/list/list.scss (100%)
 rename src/{components => lib}/list/list.spec.ts (100%)
 rename src/{components => lib}/list/list.ts (97%)
 rename src/{components => lib}/list/package.json (100%)
 rename src/{components => lib}/menu/README.md (100%)
 rename src/{components => lib}/menu/menu-directive.ts (99%)
 rename src/{components => lib}/menu/menu-errors.ts (100%)
 rename src/{components => lib}/menu/menu-item.ts (100%)
 rename src/{components => lib}/menu/menu-positions.ts (100%)
 rename src/{components => lib}/menu/menu-trigger.ts (100%)
 rename src/{components => lib}/menu/menu.html (100%)
 rename src/{components => lib}/menu/menu.scss (100%)
 rename src/{components => lib}/menu/menu.spec.ts (100%)
 rename src/{components => lib}/menu/menu.ts (100%)
 rename src/{components => lib}/menu/package.json (100%)
 rename src/{components => lib}/progress-bar/README.md (100%)
 rename src/{components => lib}/progress-bar/package.json (100%)
 rename src/{components => lib}/progress-bar/progress-bar.html (100%)
 rename src/{components => lib}/progress-bar/progress-bar.scss (100%)
 rename src/{components => lib}/progress-bar/progress-bar.spec.ts (100%)
 rename src/{components => lib}/progress-bar/progress-bar.ts (98%)
 rename src/{components => lib}/progress-circle/README.md (100%)
 rename src/{components => lib}/progress-circle/package.json (100%)
 rename src/{components => lib}/progress-circle/progress-circle.html (100%)
 rename src/{components => lib}/progress-circle/progress-circle.scss (100%)
 rename src/{components => lib}/progress-circle/progress-circle.spec.ts (100%)
 rename src/{components => lib}/progress-circle/progress-circle.ts (99%)
 rename src/{components => lib}/radio/README.md (100%)
 rename src/{components => lib}/radio/package.json (100%)
 rename src/{components => lib}/radio/radio.html (100%)
 rename src/{components => lib}/radio/radio.scss (100%)
 rename src/{components => lib}/radio/radio.spec.ts (100%)
 rename src/{components => lib}/radio/radio.ts (99%)
 rename src/{components => lib}/sidenav/README.md (100%)
 rename src/{components => lib}/sidenav/package.json (100%)
 rename src/{components => lib}/sidenav/sidenav-transitions.scss (100%)
 rename src/{components => lib}/sidenav/sidenav.html (100%)
 rename src/{components => lib}/sidenav/sidenav.scss (100%)
 rename src/{components => lib}/sidenav/sidenav.spec.ts (100%)
 rename src/{components => lib}/sidenav/sidenav.ts (99%)
 rename src/{components => lib}/slide-toggle/README.md (100%)
 rename src/{components => lib}/slide-toggle/package.json (100%)
 rename src/{components => lib}/slide-toggle/slide-toggle.html (100%)
 rename src/{components => lib}/slide-toggle/slide-toggle.scss (100%)
 rename src/{components => lib}/slide-toggle/slide-toggle.spec.ts (100%)
 rename src/{components => lib}/slide-toggle/slide-toggle.ts (96%)
 rename src/{components => lib}/slider/slider.html (100%)
 rename src/{components => lib}/slider/slider.scss (100%)
 rename src/{components => lib}/slider/slider.spec.ts (100%)
 rename src/{components => lib}/slider/slider.ts (99%)
 rename src/{components => lib}/slider/test-gesture-config.ts (100%)
 rename src/{components => lib}/tabs/README.md (100%)
 rename src/{components => lib}/tabs/ink-bar.ts (100%)
 rename src/{components => lib}/tabs/package.json (100%)
 rename src/{components => lib}/tabs/tab-content.ts (100%)
 rename src/{components => lib}/tabs/tab-group.html (100%)
 rename src/{components => lib}/tabs/tab-group.scss (100%)
 rename src/{components => lib}/tabs/tab-group.spec.ts (100%)
 rename src/{components => lib}/tabs/tab-label-wrapper.ts (100%)
 rename src/{components => lib}/tabs/tab-label.ts (100%)
 rename src/{components => lib}/tabs/tabs.ts (99%)
 rename src/{components => lib}/toolbar/README.md (100%)
 rename src/{components => lib}/toolbar/package.json (100%)
 rename src/{components => lib}/toolbar/toolbar.html (100%)
 rename src/{components => lib}/toolbar/toolbar.scss (100%)
 rename src/{components => lib}/toolbar/toolbar.spec.ts (100%)
 rename src/{components => lib}/toolbar/toolbar.ts (97%)
 rename src/{components => lib}/tooltip/README.md (100%)
 rename src/{components => lib}/tooltip/tooltip.html (100%)
 rename src/{components => lib}/tooltip/tooltip.scss (100%)
 rename src/{components => lib}/tooltip/tooltip.spec.ts (96%)
 rename src/{components => lib}/tooltip/tooltip.ts (99%)
 create mode 100644 src/lib/tsconfig.json
 delete mode 100644 typings.json

diff --git a/.travis.yml b/.travis.yml
index dc3f4e01dfe6..3dfb1d1c9941 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,6 @@ matrix:
 
 install:
   - npm install
-  - npm run typings
 
 before_script:
   - mkdir -p $LOGS_DIR
diff --git a/angular-cli-build.js b/angular-cli-build.js
deleted file mode 100644
index f7225769f49c..000000000000
--- a/angular-cli-build.js
+++ /dev/null
@@ -1,111 +0,0 @@
-'use strict';
-const fs = require('fs');
-const path = require('path');
-
-// Import the require hook. Enables us to require TS files natively.
-require('ts-node/register');
-
-const Angular2App = require('angular-cli/lib/broccoli/angular2-app');
-const Funnel = require('broccoli-funnel');
-const MergeTree = require('broccoli-merge-trees');
-const autoPrefixerTree = require('broccoli-autoprefixer');
-
-
-module.exports = function(defaults) {
-  // The Angular Application tree.
-  const appTree = _buildAppTree(defaults);
-
-  // The CSS tree that is auto prefixed with browser support.
-  const cssAutoprefixed = autoPrefixerTree(new Funnel(appTree, {
-    include: [ '**/*.css' ]
-  }));
-
-  // Include the scss sources in the output for when we publish.
-  const scssSources = new Funnel('src', {include: ['**/*.scss']});
-
-  return new MergeTree([appTree, cssAutoprefixed, scssSources], { overwrite: true });
-};
-
-
-/**
- * Build the Broccoli Tree containing all the files used as the input to the Demo Angular2App.
- */
-function _buildDemoAppInputTree() {
-  return new MergeTree([
-    new Funnel('typings', {
-      destDir: 'typings'
-    }),
-    new Funnel('src', {
-      include: ['components/**/*', 'core/**/*'],
-      destDir: 'src/demo-app'
-    }),
-    new Funnel('src/demo-app', {
-      destDir: 'src/demo-app'
-    })
-  ]);
-}
-
-
-/**
- * Build the Broccoli Tree containing all the files used as the input to the e2e Angular2App.
- */
-function _buildE2EAppInputTree() {
-  return new MergeTree([
-    new Funnel('typings', {
-      destDir: 'typings'
-    }),
-    new Funnel('src', {
-      include: ['components/**/*', 'core/**/*'],
-      destDir: 'src/e2e-app'
-    }),
-    new Funnel('src/e2e-app', {
-      destDir: 'src/e2e-app'
-    })
-  ]);
-}
-
-
-/**
- * Build the Broccoli Tree that contains the Angular2 App. This picks between E2E, Example or Demo
- * app.
- * @param defaults The default objects from AngularCLI (deprecated).
- * @returns {Angular2App}
- */
-function _buildAppTree(defaults) {
-  let inputNode;
-  let sourceDir;
-  switch(process.env['MD_APP']) {
-    case 'e2e':
-      inputNode = _buildE2EAppInputTree();
-      sourceDir = 'src/e2e-app';
-      break;
-    default:
-      inputNode = _buildDemoAppInputTree();
-      sourceDir = 'src/demo-app';
-  }
-
-  return new Angular2App(defaults, inputNode, {
-    sourceDir: sourceDir,
-    polyfills: [
-      'vendor/core-js/client/core.js',
-      'vendor/systemjs/dist/system.src.js',
-      'vendor/zone.js/dist/zone.js',
-      'vendor/hammerjs/hammer.min.js'
-    ],
-    tsCompiler: {},
-    sassCompiler: {
-      includePaths: [
-        'src/core/style'
-      ]
-    },
-    vendorNpmFiles: [
-      'systemjs/dist/system-polyfills.js',
-      'systemjs/dist/system.src.js',
-      'zone.js/dist/*.+(js|js.map)',
-      'core-js/client/core.js',
-      'rxjs/**/*.+(js|js.map)',
-      '@angular/**/*.+(js|js.map)',
-      'hammerjs/*.min.+(js|js.map)'
-    ]
-  });
-}
diff --git a/angular-cli.json b/angular-cli.json
deleted file mode 100644
index b416b34f14ee..000000000000
--- a/angular-cli.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "project": {
-    "version": "0.0.37",
-    "name": "material2"
-  },
-  "apps": [
-    {"main": "src/main.ts", "tsconfig": "src/tsconfig.json"}
-  ],
-  "addons": [],
-  "packages": [],
-  "e2e": {
-    "protractor": {
-      "config": "test/protractor.conf.js"
-    }
-  },
-  "test": {
-    "karma": {
-      "config": "test/karma.conf.js"
-    }
-  },
-  "defaults": {
-    "prefix": "",
-    "sourceDir": "src"
-  }
-}
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 000000000000..ebd584d730fa
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,245 @@
+'use strict';
+/**
+ * This file needs to be JavaScript and is read by gulp.
+ */
+// Global imports.
+const fs = require('fs');
+const gulp = require('gulp');
+const path = require('path');
+
+// Other imports.
+const inlineResources = require('./scripts/release/inline-resources');
+
+// Gulp plugins.
+const gulpClean = require('gulp-clean');
+const gulpTs = require('gulp-typescript');
+const gulpMerge = require('merge2');
+const gulpSass = require('gulp-sass');
+const gulpSourcemaps = require('gulp-sourcemaps');
+const gulpLiveServer = require('gulp-live-server');
+
+
+// Directories.
+const srcDir = path.join(__dirname, 'src');
+const componentsDir = path.join(srcDir, 'lib');
+const devAppDir = path.join(srcDir, 'demo-app');
+const e2eAppDir = path.join(srcDir, 'e2e-app');
+
+const outDir = 'dist';
+const outLibDir = path.join(outDir, '@angular2-material');
+
+
+/**
+ * Create a TS Build Task, based on the options.
+ */
+function makeTsBuildTask(options) {
+  const tsConfigDir = options.tsConfigPath;
+  const tsConfigPath = path.join(tsConfigDir, 'tsconfig.json');
+  const tsConfig = JSON.parse(fs.readFileSync(tsConfigPath, 'utf-8'));
+  const dest = path.join(tsConfigDir, tsConfig.compilerOptions.outDir);
+
+  return function() {
+    const tsProject = gulpTs.createProject(tsConfigPath, {
+      typescript: require('typescript')
+    });
+
+    let pipe = tsProject.src()
+      .pipe(gulpSourcemaps.init())
+      .pipe(gulpTs(tsProject));
+    let dts = pipe.dts.pipe(gulp.dest(dest));
+
+    if (tsConfig.compilerOptions.sourceMap) {
+      if (!tsConfig.compilerOptions.inlineSources) {
+        pipe = pipe.pipe(gulpSourcemaps.write(dest));
+      } else {
+        pipe = pipe.pipe(gulpSourcemaps.write());
+      }
+    }
+
+    return gulpMerge([dts, pipe.pipe(gulp.dest(dest))]);
+  };
+}
+
+/**
+ * Create a SASS Build Task.
+ */
+function makeSassBuildTask(options) {
+  const dest = options.dest;
+  const glob = path.join(options.root, '**/*.scss');
+  const sassOptions = {
+    includePaths: options.includePaths
+  };
+
+  return function() {
+    return gulp.src(glob)
+      .pipe(gulpSourcemaps.init())
+      .pipe(gulpSass(sassOptions).on('error', gulpSass.logError))
+      .pipe(gulpSourcemaps.write(dest))
+      .pipe(gulp.dest(dest));
+  };
+}
+
+
+/***************************************************************************************************
+ * Components Build Tasks.
+ */
+gulp.task('build:components:ts', makeTsBuildTask({ tsConfigPath: componentsDir }));
+gulp.task('build:components:assets', function() {
+  return gulp.src(path.join(componentsDir, '*/**/*.!(ts|spec.ts)'))
+    .pipe(gulp.dest(outLibDir));
+});
+gulp.task('build:components:scss', function() {
+  const cssTask = makeSassBuildTask({
+    dest: outLibDir,
+    root: componentsDir,
+    includePaths: path.join(componentsDir, 'core/style')
+  });
+  // Also copy over the SCSS for the components.
+  return gulpMerge([
+    cssTask(),
+    gulp.src(path.join(componentsDir, '**/*.scss'))
+      .pipe(gulp.dest(outLibDir))
+  ]);
+});
+gulp.task('build:components', [
+  'build:components:ts',
+  'build:components:assets',
+  'build:components:scss'
+], function() {
+  inlineResources([outLibDir]);
+});
+
+/***************************************************************************************************
+ * DevApp Build Tasks.
+ */
+gulp.task('build:devapp:ts', ['build:components:ts'], makeTsBuildTask({ tsConfigPath: devAppDir }));
+gulp.task('build:devapp:scss', ['build:components:scss'], makeSassBuildTask({
+  dest: outDir,
+  root: devAppDir,
+  // Change this once we have a better strategy for releasing SCSS files.
+  includePaths: [
+    path.join(componentsDir, 'core/style'),
+    componentsDir
+  ]
+}));
+gulp.task('build:devapp:assets', function() {
+  return gulp.src(path.join(devAppDir, '**/*'))
+    .pipe(gulp.dest(outDir));
+});
+gulp.task('build:devapp:vendor', function() {
+  const npmVendorFiles = [
+    'core-js/client', 'zone.js/dist', 'hammerjs', 'systemjs/dist', 'rxjs', '@angular', 'hammerjs'
+  ];
+
+  return gulpMerge(
+    npmVendorFiles.map(function(root) {
+      const glob = path.join(root, '**/*.+(js|js.map)');
+      return gulp.src(path.join('node_modules', glob))
+        .pipe(gulp.dest(path.join('dist/vendor', root)));
+    }));
+});
+
+gulp.task('build:devapp', [
+  'build:components',
+  'build:devapp:vendor',
+  'build:devapp:ts',
+  'build:devapp:scss',
+  'build:devapp:assets'
+]);
+
+/***************************************************************************************************
+ * DevApp Build Tasks.
+ */
+gulp.task('build:e2eapp:ts', ['build:components:ts'], makeTsBuildTask({ tsConfigPath: e2eAppDir }));
+gulp.task('build:e2eapp:scss', ['build:components:scss'], makeSassBuildTask({
+  dest: outDir,
+  root: e2eAppDir,
+  // Change this once we have a better strategy for releasing SCSS files.
+  includePaths: [
+    path.join(componentsDir, 'core/style'),
+    componentsDir
+  ]
+}));
+gulp.task('build:e2eapp:assets', function() {
+  return gulp.src(path.join(e2eAppDir, '**/*'))
+    .pipe(gulp.dest(outDir));
+});
+gulp.task('build:e2eapp:vendor', function() {
+  const npmVendorFiles = [
+    'core-js/client', 'zone.js/dist', 'hammerjs', 'systemjs/dist', 'rxjs', '@angular', 'hammerjs'
+  ];
+
+  return gulpMerge(
+    npmVendorFiles.map(function(root) {
+      const glob = path.join(root, '**/*.+(js|js.map)');
+      return gulp.src(path.join('node_modules', glob))
+        .pipe(gulp.dest(path.join('dist/vendor', root)));
+    }));
+});
+
+gulp.task('build:e2eapp', [
+  'build:components',
+  'build:e2eapp:vendor',
+  'build:e2eapp:ts',
+  'build:e2eapp:scss',
+  'build:e2eapp:assets'
+]);
+
+
+/***************************************************************************************************
+ * Global tasks.
+ */
+gulp.task('build', ['build:devapp']);
+
+gulp.task('clean', function () {
+  return gulp.src('dist', { read: false })
+    .pipe(gulpClean());
+});
+
+
+/***************************************************************************************************
+ * Watch Tasks.
+ */
+gulp.task('watch:components', ['build:components'], function() {
+  gulp.watch(path.join(componentsDir, '**/*'), ['build:components']);
+});
+
+gulp.task('watch:devapp', ['watch:components', 'build:devapp'], function() {
+  gulp.watch(path.join(devAppDir, '**/*'), ['build:devapp']);
+});
+
+
+/***************************************************************************************************
+ * Serve Tasks.
+ */
+gulp.task('serve:devapp', ['build:devapp'], function() {
+  const server = gulpLiveServer('scripts/serve-dist.js');
+
+  server.start();
+  function reload(file) {
+    server.notify(file);
+  }
+
+  gulp.watch(path.join(componentsDir, '**/*.ts'), ['build:components:ts'], reload);
+  gulp.watch(path.join(componentsDir, '**/*.scss'), ['build:components:scss'], reload);
+  gulp.watch(path.join(componentsDir, '**/*.html'), ['build:components:assets'], reload);
+  gulp.watch(path.join(devAppDir, '**/*.ts'), ['build:devapp:ts'], reload);
+  gulp.watch(path.join(devAppDir, '**/*.scss'), ['build:devapp:scss'], reload);
+  gulp.watch(path.join(devAppDir, '**/*.html'), ['build:devapp:assets'], reload);
+});
+
+gulp.task('serve:e2eapp', ['build:e2eapp'], function() {
+  const server = gulpLiveServer('scripts/serve-dist.js');
+
+  server.start();
+  function reload(file) {
+    server.notify.apply(server, [file]);
+  }
+
+  gulp.watch(path.join(componentsDir, '**/*.ts'), ['build:components:ts'], reload);
+  gulp.watch(path.join(componentsDir, '**/*.scss'), ['build:components:scss'], reload);
+  gulp.watch(path.join(componentsDir, '**/*.html'), ['build:components:assets'], reload);
+  gulp.watch(path.join(e2eAppDir, '**/*.ts'), ['build:e2eapp:ts'], reload);
+  gulp.watch(path.join(e2eAppDir, '**/*.scss'), ['build:e2eapp:scss'], reload);
+  gulp.watch(path.join(e2eAppDir, '**/*.html'), ['build:e2eapp:assets'], reload);
+});
diff --git a/package.json b/package.json
index 1d50ce46ca9f..5089c5358511 100644
--- a/package.json
+++ b/package.json
@@ -9,16 +9,14 @@
   },
   "scripts": {
     "ci:forbidden-identifiers": "node ./scripts/ci/forbidden-identifiers.js",
-    "build": "ng build",
-    "demo-app": "ng serve",
+    "build": "gulp build",
+    "demo-app": "gulp serve:devapp",
     "test": "karma start test/karma.conf.js",
     "tslint": "tslint -c tslint.json 'src/**/*.ts'",
     "stylelint": "stylelint 'src/**/*.scss' --config stylelint-config.json --syntax scss",
     "check-circular-deps": "madge --circular ./dist",
-    "typings": "typings install --global",
-    "postinstall": "npm run typings",
     "e2e": "protractor",
-    "inline-resources": "node ./scripts/release/inline-resources.js ./dist/components",
+    "inline-resources": "",
     "deploy": "firebase deploy",
     "webdriver-manager": "webdriver-manager"
   },
@@ -31,11 +29,11 @@
     "@angular/common": "2.0.0-rc.4",
     "@angular/compiler": "2.0.0-rc.4",
     "@angular/core": "2.0.0-rc.4",
+    "@angular/forms": "^0.2.0",
     "@angular/http": "2.0.0-rc.4",
     "@angular/platform-browser": "2.0.0-rc.4",
     "@angular/platform-browser-dynamic": "2.0.0-rc.4",
     "@angular/router": "v3.0.0-alpha.8",
-    "@angular/forms": "^0.2.0",
     "core-js": "^2.4.0",
     "hammerjs": "^2.0.8",
     "rxjs": "5.0.0-beta.6",
@@ -44,17 +42,22 @@
   },
   "devDependencies": {
     "@angular/compiler-cli": "^0.4.1",
+    "@types/hammerjs": "^2.0.30",
+    "@types/jasmine": "^2.2.31",
     "add-stream": "^1.0.0",
-    "angular-cli": "^1.0.0-beta.9",
-    "broccoli-autoprefixer": "^4.1.0",
-    "broccoli-funnel": "^1.0.1",
-    "broccoli-merge-trees": "^1.1.1",
     "browserstacktunnel-wrapper": "^1.4.2",
     "conventional-changelog": "^1.1.0",
     "ember-cli-inject-live-reload": "^1.4.0",
     "firebase-tools": "^2.2.1",
     "fs-extra": "^0.26.5",
     "glob": "^6.0.4",
+    "gulp": "^3.9.1",
+    "gulp-clean": "^0.3.2",
+    "gulp-live-server": "0.0.30",
+    "gulp-sass": "^2.3.2",
+    "gulp-shell": "^0.5.2",
+    "gulp-sourcemaps": "^1.6.0",
+    "gulp-typescript": "^2.13.6",
     "jasmine-core": "^2.4.1",
     "js-yaml": "^3.5.2",
     "karma": "^1.1.1",
@@ -64,6 +67,7 @@
     "karma-jasmine": "^1.0.2",
     "karma-sauce-launcher": "^1.0.0",
     "madge": "^0.6.0",
+    "merge2": "^1.0.2",
     "node-sass": "^3.4.2",
     "protractor": "^3.3.0",
     "protractor-accessibility-plugin": "0.1.1",
diff --git a/scripts/ci/build-and-test.sh b/scripts/ci/build-and-test.sh
index 969cba5a68ed..f006f27055fd 100755
--- a/scripts/ci/build-and-test.sh
+++ b/scripts/ci/build-and-test.sh
@@ -14,7 +14,7 @@ start_tunnel
 
 wait_for_tunnel
 if is_lint; then
-  npm run tslint  
+  npm run tslint
   npm run ci:forbidden-identifiers
   npm run stylelint
 elif is_circular_deps_check; then
@@ -43,6 +43,7 @@ elif is_e2e; then
   ng e2e
 elif is_extract_metadata; then
   # Run `tsc` first so that the directory structure in dist/ matches what ngc expects.
+  ./node_modules/.bin/tsc -p ./src/lib/
   ./node_modules/.bin/tsc -p ./src/demo-app/
   ./node_modules/.bin/ngc -p ./src/demo-app/
 else
diff --git a/scripts/release/inline-resources.js b/scripts/release/inline-resources.js
index 697612ffb47a..fb4bc16171ec 100644
--- a/scripts/release/inline-resources.js
+++ b/scripts/release/inline-resources.js
@@ -29,28 +29,34 @@ const readFile = promiseify(fs.readFile);
 const writeFile = promiseify(fs.writeFile);
 
 
-/**
- * For every argument, inline the templates and styles under it and write the new file.
- */
-for (let arg of process.argv.slice(2)) {
-  if (arg.indexOf('*') < 0) {
-    // Argument is a directory target, add glob patterns to include every files.
-    arg = path.join(arg, '**', '*');
-  }
+function inlineResources(globs) {
+  /**
+   * For every argument, inline the templates and styles under it and write the new file.
+   */
+  for (let pattern of globs) {
+    if (pattern.indexOf('*') < 0) {
+      // Argument is a directory target, add glob patterns to include every files.
+      pattern = path.join(pattern, '**', '*');
+    }
 
-  const files = glob.sync(arg, {})
-    .filter(name => /\.js$/.test(name));  // Matches only JavaScript files.
+    const files = glob.sync(pattern, {})
+      .filter(name => /\.js$/.test(name));  // Matches only JavaScript files.
 
-  // Generate all files content with inlined templates.
-  files.forEach(filePath => {
-    readFile(filePath, 'utf-8')
-      .then(content => inlineTemplate(filePath, content))
-      .then(content => inlineStyle(filePath, content))
-      .then(content => writeFile(filePath, content))
-      .catch(err => {
-        console.error('An error occured: ', err);
-      });
-  });
+    // Generate all files content with inlined templates.
+    files.forEach(filePath => {
+      readFile(filePath, 'utf-8')
+        .then(content => inlineTemplate(filePath, content))
+        .then(content => inlineStyle(filePath, content))
+        .then(content => writeFile(filePath, content))
+        .catch(err => {
+          console.error('An error occured: ', err);
+        });
+    });
+  }
+}
+
+if (require.main === module) {
+  inlineResources(process.argv.slice(2));
 }
 
 
@@ -96,3 +102,6 @@ function inlineStyle(filePath, content) {
       + ']';
   });
 }
+
+
+module.exports = inlineResources;
diff --git a/scripts/serve-dist.js b/scripts/serve-dist.js
new file mode 100644
index 000000000000..3327ff39ec04
--- /dev/null
+++ b/scripts/serve-dist.js
@@ -0,0 +1,22 @@
+var app = require('connect')();
+var express = require('express');
+var path = require('path');
+var connect_livereload = require('connect-livereload');
+var serve_static = require('serve-static');
+
+var root = 'dist/';
+var port = 4200;
+
+app.use(connect_livereload());
+app.use(serve_static(path.join(process.cwd(), root)));
+
+// Add a fallback that serves index.html
+const defaultRoute = express();
+defaultRoute.all("/*", function(req, res) { res.sendFile("index.html", { root: root }); });
+app.use(defaultRoute);
+
+app.listen(port, function () {
+  var host = 'localhost';
+
+  console.log('folder "%s" serving at http://%s:%s', root, host, port);
+});
diff --git a/src/demo-app/environment.ts b/src/demo-app/environment.ts
deleted file mode 100644
index 79ee96fdfdbd..000000000000
--- a/src/demo-app/environment.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// The file for the current environment will overwrite this one during build
-// Different environments can be found in config/environment.{dev|prod}.ts
-// The build system defaults to the dev environment
-
-export const environment = {
-  production: false
-};
diff --git a/src/demo-app/index.html b/src/demo-app/index.html
index d2ee30b106b5..b285fa35fada 100644
--- a/src/demo-app/index.html
+++ b/src/demo-app/index.html
@@ -1,20 +1,14 @@
 <!doctype html>
-{{!-- This file is an handlebar file that gets filled at build time. --}}
 <html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Material2</title>
-  <base href=".">
-
-  {{!-- Add live-reload support, only in development. --}}
-  {{#unless environment.production}}
-  <script src="/ember-cli-live-reload.js" type="text/javascript"></script>
-  {{/unless}}
+  <base href="/">
 
   <link rel="icon" type="image/x-icon" href="favicon.ico">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-  <link href="core/style/core.css" rel="stylesheet">
+  <link href="@angular2-material/core/style/core.css" rel="stylesheet">
   <link href="main.css" rel="stylesheet">
 
   <!-- FontAwesome for md-icon demo. -->
@@ -23,10 +17,10 @@
 <body>
   <demo-app>Loading...</demo-app>
 
-  {{!-- Add all polyfill scripts. --}}
-  {{#each scripts.polyfills}}
-  <script src="{{.}}"></script>
-  {{/each}}
+  <script src="vendor/core-js/client/core.js"></script>
+  <script src="vendor/systemjs/dist/system.src.js"></script>
+  <script src="vendor/zone.js/dist/zone.js"></script>
+  <script src="vendor/hammerjs/hammer.min.js"></script>
 
   <script>
     System.import('system-config.js').then(function () {
diff --git a/src/demo-app/system-config.ts b/src/demo-app/system-config.ts
index ef20dee089dc..aa2a6483d6d4 100644
--- a/src/demo-app/system-config.ts
+++ b/src/demo-app/system-config.ts
@@ -24,12 +24,6 @@ const components = [
   'tooltip',
 ];
 
-/** Map relative paths to URLs. */
-const map: any = {
-  '@angular2-material/core': 'core',
-};
-components.forEach(name => map[`@angular2-material/${name}`] = `components/${name}`);
-
 
 /** User packages configuration. */
 const packages: any = {
diff --git a/src/demo-app/tsconfig.json b/src/demo-app/tsconfig.json
index e7f03b00d9c9..9adf574b20fb 100644
--- a/src/demo-app/tsconfig.json
+++ b/src/demo-app/tsconfig.json
@@ -3,36 +3,33 @@
     "declaration": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "lib": ["es6", "es2015", "dom"],
     "mapRoot": "/",
     "module": "commonjs",
     "moduleResolution": "node",
     "noEmitOnError": true,
     "noImplicitAny": true,
     "outDir": "../../dist/",
-    "rootDir": "..",
     "sourceMap": true,
     "target": "es5",
-    "inlineSources": true,
     "stripInternal": true,
     "baseUrl": "",
+    "typeRoots": [
+      "../../node_modules/@types",
+      "../../node_modules"
+    ],
     "paths": {
-      "@angular2-material/core/*": [
-        "./core/*",
-        "../core/*"
-      ],
       "@angular2-material/*": [
-        "./components/*",
-        "../components/*"
+        "../../dist/@angular2-material/*"
       ]
-    }
+    },
+    "types": [
+      "hammerjs"
+    ]
   },
   "angularCompilerOptions": {
     "genDir": "../../dist",
     "skipTemplateCodegen": true,
     "debug": true
-  },
-  "files": [
-    "main.ts",
-    "typings.d.ts"
-  ]
+  }
 }
diff --git a/src/demo-app/typings.d.ts b/src/demo-app/typings.d.ts
index a72d8afb0e26..1c32e621291f 100644
--- a/src/demo-app/typings.d.ts
+++ b/src/demo-app/typings.d.ts
@@ -1,3 +1 @@
-/// <reference path="../../typings/index.d.ts" />
-
 declare var module: { id: string };
diff --git a/src/e2e-app/index.html b/src/e2e-app/index.html
index eab5c7d2f1cb..7136adec484f 100644
--- a/src/e2e-app/index.html
+++ b/src/e2e-app/index.html
@@ -1,18 +1,14 @@
 <!doctype html>
-{{!-- This file is an handlebar file that gets filled at build time. --}}
 <html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Material2</title>
-  <base href=".">
-
-  {{#unless environment.production}}
-  <script src="/ember-cli-live-reload.js" type="text/javascript"></script>
-  {{/unless}}
+  <base href="/">
 
   <link rel="icon" type="image/x-icon" href="favicon.ico">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+  <link href="@angular2-material/core/style/core.css" rel="stylesheet">
   <link href="main.css" rel="stylesheet">
 
   <!-- FontAwesome for md-icon demo. -->
@@ -21,9 +17,10 @@
 <body>
   <e2e-app>Loading...</e2e-app>
 
-  {{#each scripts.polyfills}}
-  <script src="{{.}}"></script>
-  {{/each}}
+  <script src="vendor/core-js/client/core.js"></script>
+  <script src="vendor/systemjs/dist/system.src.js"></script>
+  <script src="vendor/zone.js/dist/zone.js"></script>
+  <script src="vendor/hammerjs/hammer.min.js"></script>
 
   <script>
     System.import('system-config.js').then(function () {
diff --git a/src/e2e-app/system-config.ts b/src/e2e-app/system-config.ts
index 8fd9e804f4f5..8dc82d9485ac 100644
--- a/src/e2e-app/system-config.ts
+++ b/src/e2e-app/system-config.ts
@@ -2,13 +2,11 @@
  * User Configuration.
  **********************************************************************************************/
 
-System.defaultJSExtensions = true;
-
-
 const components = [
   'button',
   'card',
   'checkbox',
+  'dialog',
   'grid-list',
   'icon',
   'input',
@@ -18,25 +16,25 @@ const components = [
   'progress-circle',
   'radio',
   'sidenav',
+  'slider',
   'slide-toggle',
+  'button-toggle',
   'tabs',
   'toolbar',
   'tooltip',
 ];
 
 
-/** Map relative paths to URLs. */
-const map: any = {
-  '@angular2-material/core': 'core',
-};
-components.forEach(name => map[`@angular2-material/${name}`] = `components/${name}`);
-
-
 /** User packages configuration. */
 const packages: any = {
   '@angular2-material/core': {
     format: 'cjs',
     defaultExtension: 'js'
+  },
+  // Set the default extension for the root package, because otherwise the demo-app can't
+  // be built within the production mode. Due to missing file extensions.
+  '.': {
+    defaultExtension: 'js'
   }
 };
 components.forEach(name => {
@@ -46,6 +44,7 @@ components.forEach(name => {
   };
 });
 
+
 ////////////////////////////////////////////////////////////////////////////////////////////////
 /***********************************************************************************************
  * Everything underneath this line is managed by the CLI.
@@ -54,9 +53,9 @@ const barrels: string[] = [
   // Angular specific barrels.
   '@angular/core',
   '@angular/common',
-  '@angular/forms',
   '@angular/compiler',
   '@angular/http',
+  '@angular/forms',
   '@angular/router',
   '@angular/platform-browser',
   '@angular/platform-browser-dynamic',
@@ -65,7 +64,13 @@ const barrels: string[] = [
   'rxjs',
 
   // App specific barrels.
-  'e2e-app',
+  'demo-app',
+  'button-toggle',
+  'gestures',
+  'live-announcer',
+  'portal',
+  'overlay',
+  ...components
   /** @cli-barrel */
 ];
 
@@ -88,4 +93,4 @@ System.config({
 });
 
 // Apply the user's configuration.
-System.config({ map, packages });
+System.config({ packages });
diff --git a/src/e2e-app/tsconfig.json b/src/e2e-app/tsconfig.json
index e5e1c4d8eea7..c1db83cd29fb 100644
--- a/src/e2e-app/tsconfig.json
+++ b/src/e2e-app/tsconfig.json
@@ -3,31 +3,33 @@
     "declaration": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "lib": ["es6", "es2015", "dom"],
     "mapRoot": "",
     "module": "commonjs",
     "moduleResolution": "node",
     "noEmitOnError": true,
     "noImplicitAny": true,
     "outDir": "../../dist/",
-    "rootDir": "..",
     "sourceMap": true,
     "target": "es5",
-    "inlineSources": true,
     "stripInternal": true,
     "baseUrl": "",
+    "typeRoots": [
+      "../../node_modules/@types",
+      "../../node_modules"
+    ],
     "paths": {
-      "@angular2-material/core/*": [
-        "./core/*",
-        "../core/*"
-      ],
       "@angular2-material/*": [
-        "./components/*",
-        "../components/*"
+        "../../dist/@angular2-material/*"
       ]
-    }
+    },
+    "types": [
+      "hammerjs"
+    ]
   },
-  "files": [
-    "main.ts",
-    "typings.d.ts"
-  ]
+  "angularCompilerOptions": {
+    "genDir": "../../dist",
+    "skipTemplateCodegen": true,
+    "debug": true
+  }
 }
diff --git a/src/e2e-app/typings.d.ts b/src/e2e-app/typings.d.ts
index 8676c6a33a7a..1c32e621291f 100644
--- a/src/e2e-app/typings.d.ts
+++ b/src/e2e-app/typings.d.ts
@@ -1,4 +1 @@
-/// <reference path="../../typings/index.d.ts" />
-
 declare var module: { id: string };
-
diff --git a/src/components/button-toggle/README.md b/src/lib/button-toggle/README.md
similarity index 100%
rename from src/components/button-toggle/README.md
rename to src/lib/button-toggle/README.md
diff --git a/src/components/button-toggle/button-toggle.html b/src/lib/button-toggle/button-toggle.html
similarity index 100%
rename from src/components/button-toggle/button-toggle.html
rename to src/lib/button-toggle/button-toggle.html
diff --git a/src/components/button-toggle/button-toggle.scss b/src/lib/button-toggle/button-toggle.scss
similarity index 100%
rename from src/components/button-toggle/button-toggle.scss
rename to src/lib/button-toggle/button-toggle.scss
diff --git a/src/components/button-toggle/button-toggle.spec.ts b/src/lib/button-toggle/button-toggle.spec.ts
similarity index 100%
rename from src/components/button-toggle/button-toggle.spec.ts
rename to src/lib/button-toggle/button-toggle.spec.ts
diff --git a/src/components/button-toggle/button-toggle.ts b/src/lib/button-toggle/button-toggle.ts
similarity index 98%
rename from src/components/button-toggle/button-toggle.ts
rename to src/lib/button-toggle/button-toggle.ts
index aeaf7e9795cd..77305f87dafa 100644
--- a/src/components/button-toggle/button-toggle.ts
+++ b/src/lib/button-toggle/button-toggle.ts
@@ -130,9 +130,11 @@ export class MdButtonToggleGroup implements ControlValueAccessor {
   }
 
   private _updateButtonToggleNames(): void {
-    (this._buttonToggles || []).forEach((toggle) => {
-      toggle.name = this._name;
-    });
+    if (this._buttonToggles) {
+      this._buttonToggles.forEach((toggle) => {
+        toggle.name = this._name;
+      });
+    }
   }
 
   // TODO: Refactor into shared code with radio.
@@ -207,7 +209,6 @@ export class MdButtonToggleGroupMultiple {
 }
 
 @Component({
-  moduleId: module.id,
   selector: 'md-button-toggle',
   templateUrl: 'button-toggle.html',
   styleUrls: ['button-toggle.css'],
diff --git a/src/components/button-toggle/package.json b/src/lib/button-toggle/package.json
similarity index 100%
rename from src/components/button-toggle/package.json
rename to src/lib/button-toggle/package.json
diff --git a/src/components/button/README.md b/src/lib/button/README.md
similarity index 100%
rename from src/components/button/README.md
rename to src/lib/button/README.md
diff --git a/src/components/button/_button-base.scss b/src/lib/button/_button-base.scss
similarity index 100%
rename from src/components/button/_button-base.scss
rename to src/lib/button/_button-base.scss
diff --git a/src/components/button/_button-theme.scss b/src/lib/button/_button-theme.scss
similarity index 100%
rename from src/components/button/_button-theme.scss
rename to src/lib/button/_button-theme.scss
diff --git a/src/components/button/button.html b/src/lib/button/button.html
similarity index 100%
rename from src/components/button/button.html
rename to src/lib/button/button.html
diff --git a/src/components/button/button.scss b/src/lib/button/button.scss
similarity index 100%
rename from src/components/button/button.scss
rename to src/lib/button/button.scss
diff --git a/src/components/button/button.spec.ts b/src/lib/button/button.spec.ts
similarity index 100%
rename from src/components/button/button.spec.ts
rename to src/lib/button/button.spec.ts
diff --git a/src/components/button/button.ts b/src/lib/button/button.ts
similarity index 98%
rename from src/components/button/button.ts
rename to src/lib/button/button.ts
index 495d687758dc..639f03d95fce 100644
--- a/src/components/button/button.ts
+++ b/src/lib/button/button.ts
@@ -15,7 +15,6 @@ import {
 
 
 @Component({
-  moduleId: module.id,
   selector: 'button[md-button], button[md-raised-button], button[md-icon-button], ' +
             'button[md-fab], button[md-mini-fab]',
   inputs: ['color'],
@@ -85,7 +84,6 @@ export class MdButton {
 }
 
 @Component({
-  moduleId: module.id,
   selector: 'a[md-button], a[md-raised-button], a[md-icon-button], a[md-fab], a[md-mini-fab]',
   inputs: ['color'],
   host: {
diff --git a/src/lib/button/index.ts b/src/lib/button/index.ts
new file mode 100644
index 000000000000..eaf5eea7f1c1
--- /dev/null
+++ b/src/lib/button/index.ts
@@ -0,0 +1 @@
+export * from './button';
diff --git a/src/components/button/package.json b/src/lib/button/package.json
similarity index 100%
rename from src/components/button/package.json
rename to src/lib/button/package.json
diff --git a/src/components/card/README.md b/src/lib/card/README.md
similarity index 100%
rename from src/components/card/README.md
rename to src/lib/card/README.md
diff --git a/src/components/card/card-header.html b/src/lib/card/card-header.html
similarity index 100%
rename from src/components/card/card-header.html
rename to src/lib/card/card-header.html
diff --git a/src/components/card/card-title-group.html b/src/lib/card/card-title-group.html
similarity index 100%
rename from src/components/card/card-title-group.html
rename to src/lib/card/card-title-group.html
diff --git a/src/components/card/card.html b/src/lib/card/card.html
similarity index 100%
rename from src/components/card/card.html
rename to src/lib/card/card.html
diff --git a/src/components/card/card.scss b/src/lib/card/card.scss
similarity index 100%
rename from src/components/card/card.scss
rename to src/lib/card/card.scss
diff --git a/src/components/card/card.ts b/src/lib/card/card.ts
similarity index 96%
rename from src/components/card/card.ts
rename to src/lib/card/card.ts
index 2dc60f610b9f..e1dec4244104 100644
--- a/src/components/card/card.ts
+++ b/src/lib/card/card.ts
@@ -21,7 +21,6 @@ it also provides a number of preset styles for common card sections, including:
 */
 
 @Component({
-  moduleId: module.id,
   selector: 'md-card',
   templateUrl: 'card.html',
   styleUrls: ['card.css'],
@@ -46,7 +45,6 @@ TODO(kara): update link to demo site when it exists
 */
 
 @Component({
-  moduleId: module.id,
   selector: 'md-card-header',
   templateUrl: 'card-header.html',
   encapsulation: ViewEncapsulation.None,
@@ -66,7 +64,6 @@ TODO(kara): update link to demo site when it exists
 */
 
 @Component({
-  moduleId: module.id,
   selector: 'md-card-title-group',
   templateUrl: 'card-title-group.html',
   encapsulation: ViewEncapsulation.None,
diff --git a/src/components/card/package.json b/src/lib/card/package.json
similarity index 100%
rename from src/components/card/package.json
rename to src/lib/card/package.json
diff --git a/src/components/checkbox/README.md b/src/lib/checkbox/README.md
similarity index 100%
rename from src/components/checkbox/README.md
rename to src/lib/checkbox/README.md
diff --git a/src/components/checkbox/checkbox.html b/src/lib/checkbox/checkbox.html
similarity index 100%
rename from src/components/checkbox/checkbox.html
rename to src/lib/checkbox/checkbox.html
diff --git a/src/components/checkbox/checkbox.scss b/src/lib/checkbox/checkbox.scss
similarity index 100%
rename from src/components/checkbox/checkbox.scss
rename to src/lib/checkbox/checkbox.scss
diff --git a/src/components/checkbox/checkbox.spec.ts b/src/lib/checkbox/checkbox.spec.ts
similarity index 100%
rename from src/components/checkbox/checkbox.spec.ts
rename to src/lib/checkbox/checkbox.spec.ts
diff --git a/src/components/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
similarity index 99%
rename from src/components/checkbox/checkbox.ts
rename to src/lib/checkbox/checkbox.ts
index 0a615e84c2b8..df5a5e8926bd 100644
--- a/src/components/checkbox/checkbox.ts
+++ b/src/lib/checkbox/checkbox.ts
@@ -55,7 +55,6 @@ export class MdCheckboxChange {
  * See: https://www.google.com/design/spec/components/selection-controls.html
  */
 @Component({
-  moduleId: module.id,
   selector: 'md-checkbox',
   templateUrl: 'checkbox.html',
   styleUrls: ['checkbox.css'],
diff --git a/src/components/checkbox/package.json b/src/lib/checkbox/package.json
similarity index 100%
rename from src/components/checkbox/package.json
rename to src/lib/checkbox/package.json
diff --git a/src/core/README.md b/src/lib/core/README.md
similarity index 100%
rename from src/core/README.md
rename to src/lib/core/README.md
diff --git a/src/core/a11y/README.md b/src/lib/core/a11y/README.md
similarity index 100%
rename from src/core/a11y/README.md
rename to src/lib/core/a11y/README.md
diff --git a/src/core/a11y/live-announcer.scss b/src/lib/core/a11y/live-announcer.scss
similarity index 100%
rename from src/core/a11y/live-announcer.scss
rename to src/lib/core/a11y/live-announcer.scss
diff --git a/src/core/a11y/live-announcer.spec.ts b/src/lib/core/a11y/live-announcer.spec.ts
similarity index 100%
rename from src/core/a11y/live-announcer.spec.ts
rename to src/lib/core/a11y/live-announcer.spec.ts
diff --git a/src/core/a11y/live-announcer.ts b/src/lib/core/a11y/live-announcer.ts
similarity index 100%
rename from src/core/a11y/live-announcer.ts
rename to src/lib/core/a11y/live-announcer.ts
diff --git a/src/core/annotations/field-value.spec.ts b/src/lib/core/annotations/field-value.spec.ts
similarity index 100%
rename from src/core/annotations/field-value.spec.ts
rename to src/lib/core/annotations/field-value.spec.ts
diff --git a/src/core/annotations/field-value.ts b/src/lib/core/annotations/field-value.ts
similarity index 100%
rename from src/core/annotations/field-value.ts
rename to src/lib/core/annotations/field-value.ts
diff --git a/src/core/async/promise-completer.ts b/src/lib/core/async/promise-completer.ts
similarity index 100%
rename from src/core/async/promise-completer.ts
rename to src/lib/core/async/promise-completer.ts
diff --git a/src/core/coordination/unique-selection-dispatcher.ts b/src/lib/core/coordination/unique-selection-dispatcher.ts
similarity index 100%
rename from src/core/coordination/unique-selection-dispatcher.ts
rename to src/lib/core/coordination/unique-selection-dispatcher.ts
diff --git a/src/core/core.ts b/src/lib/core/core.ts
similarity index 100%
rename from src/core/core.ts
rename to src/lib/core/core.ts
diff --git a/src/core/errors/error.ts b/src/lib/core/errors/error.ts
similarity index 100%
rename from src/core/errors/error.ts
rename to src/lib/core/errors/error.ts
diff --git a/src/core/gestures/MdGestureConfig.ts b/src/lib/core/gestures/MdGestureConfig.ts
similarity index 100%
rename from src/core/gestures/MdGestureConfig.ts
rename to src/lib/core/gestures/MdGestureConfig.ts
diff --git a/src/core/line/line.ts b/src/lib/core/line/line.ts
similarity index 100%
rename from src/core/line/line.ts
rename to src/lib/core/line/line.ts
diff --git a/src/core/overlay/generic-component-type.ts b/src/lib/core/overlay/generic-component-type.ts
similarity index 100%
rename from src/core/overlay/generic-component-type.ts
rename to src/lib/core/overlay/generic-component-type.ts
diff --git a/src/core/overlay/overlay-container.ts b/src/lib/core/overlay/overlay-container.ts
similarity index 100%
rename from src/core/overlay/overlay-container.ts
rename to src/lib/core/overlay/overlay-container.ts
diff --git a/src/core/overlay/overlay-directives.spec.ts b/src/lib/core/overlay/overlay-directives.spec.ts
similarity index 100%
rename from src/core/overlay/overlay-directives.spec.ts
rename to src/lib/core/overlay/overlay-directives.spec.ts
diff --git a/src/core/overlay/overlay-directives.ts b/src/lib/core/overlay/overlay-directives.ts
similarity index 100%
rename from src/core/overlay/overlay-directives.ts
rename to src/lib/core/overlay/overlay-directives.ts
diff --git a/src/core/overlay/overlay-ref.ts b/src/lib/core/overlay/overlay-ref.ts
similarity index 100%
rename from src/core/overlay/overlay-ref.ts
rename to src/lib/core/overlay/overlay-ref.ts
diff --git a/src/core/overlay/overlay-state.ts b/src/lib/core/overlay/overlay-state.ts
similarity index 100%
rename from src/core/overlay/overlay-state.ts
rename to src/lib/core/overlay/overlay-state.ts
diff --git a/src/core/overlay/overlay.scss b/src/lib/core/overlay/overlay.scss
similarity index 100%
rename from src/core/overlay/overlay.scss
rename to src/lib/core/overlay/overlay.scss
diff --git a/src/core/overlay/overlay.spec.ts b/src/lib/core/overlay/overlay.spec.ts
similarity index 100%
rename from src/core/overlay/overlay.spec.ts
rename to src/lib/core/overlay/overlay.spec.ts
diff --git a/src/core/overlay/overlay.ts b/src/lib/core/overlay/overlay.ts
similarity index 100%
rename from src/core/overlay/overlay.ts
rename to src/lib/core/overlay/overlay.ts
diff --git a/src/core/overlay/position/connected-position-strategy.spec.ts b/src/lib/core/overlay/position/connected-position-strategy.spec.ts
similarity index 100%
rename from src/core/overlay/position/connected-position-strategy.spec.ts
rename to src/lib/core/overlay/position/connected-position-strategy.spec.ts
diff --git a/src/core/overlay/position/connected-position-strategy.ts b/src/lib/core/overlay/position/connected-position-strategy.ts
similarity index 100%
rename from src/core/overlay/position/connected-position-strategy.ts
rename to src/lib/core/overlay/position/connected-position-strategy.ts
diff --git a/src/core/overlay/position/connected-position.ts b/src/lib/core/overlay/position/connected-position.ts
similarity index 100%
rename from src/core/overlay/position/connected-position.ts
rename to src/lib/core/overlay/position/connected-position.ts
diff --git a/src/core/overlay/position/global-position-strategy.spec.ts b/src/lib/core/overlay/position/global-position-strategy.spec.ts
similarity index 100%
rename from src/core/overlay/position/global-position-strategy.spec.ts
rename to src/lib/core/overlay/position/global-position-strategy.spec.ts
diff --git a/src/core/overlay/position/global-position-strategy.ts b/src/lib/core/overlay/position/global-position-strategy.ts
similarity index 100%
rename from src/core/overlay/position/global-position-strategy.ts
rename to src/lib/core/overlay/position/global-position-strategy.ts
diff --git a/src/core/overlay/position/overlay-position-builder.ts b/src/lib/core/overlay/position/overlay-position-builder.ts
similarity index 100%
rename from src/core/overlay/position/overlay-position-builder.ts
rename to src/lib/core/overlay/position/overlay-position-builder.ts
diff --git a/src/core/overlay/position/position-strategy.ts b/src/lib/core/overlay/position/position-strategy.ts
similarity index 100%
rename from src/core/overlay/position/position-strategy.ts
rename to src/lib/core/overlay/position/position-strategy.ts
diff --git a/src/core/overlay/position/relative-position-strategy.ts b/src/lib/core/overlay/position/relative-position-strategy.ts
similarity index 100%
rename from src/core/overlay/position/relative-position-strategy.ts
rename to src/lib/core/overlay/position/relative-position-strategy.ts
diff --git a/src/core/overlay/position/viewport-ruler.spec.ts b/src/lib/core/overlay/position/viewport-ruler.spec.ts
similarity index 100%
rename from src/core/overlay/position/viewport-ruler.spec.ts
rename to src/lib/core/overlay/position/viewport-ruler.spec.ts
diff --git a/src/core/overlay/position/viewport-ruler.ts b/src/lib/core/overlay/position/viewport-ruler.ts
similarity index 100%
rename from src/core/overlay/position/viewport-ruler.ts
rename to src/lib/core/overlay/position/viewport-ruler.ts
diff --git a/src/core/package.json b/src/lib/core/package.json
similarity index 100%
rename from src/core/package.json
rename to src/lib/core/package.json
diff --git a/src/core/portal/README.md b/src/lib/core/portal/README.md
similarity index 100%
rename from src/core/portal/README.md
rename to src/lib/core/portal/README.md
diff --git a/src/core/portal/dom-portal-host.ts b/src/lib/core/portal/dom-portal-host.ts
similarity index 100%
rename from src/core/portal/dom-portal-host.ts
rename to src/lib/core/portal/dom-portal-host.ts
diff --git a/src/core/portal/portal-directives.ts b/src/lib/core/portal/portal-directives.ts
similarity index 100%
rename from src/core/portal/portal-directives.ts
rename to src/lib/core/portal/portal-directives.ts
diff --git a/src/core/portal/portal-errors.ts b/src/lib/core/portal/portal-errors.ts
similarity index 100%
rename from src/core/portal/portal-errors.ts
rename to src/lib/core/portal/portal-errors.ts
diff --git a/src/core/portal/portal.spec.ts b/src/lib/core/portal/portal.spec.ts
similarity index 100%
rename from src/core/portal/portal.spec.ts
rename to src/lib/core/portal/portal.spec.ts
diff --git a/src/core/portal/portal.ts b/src/lib/core/portal/portal.ts
similarity index 100%
rename from src/core/portal/portal.ts
rename to src/lib/core/portal/portal.ts
diff --git a/src/core/ripple/README.md b/src/lib/core/ripple/README.md
similarity index 100%
rename from src/core/ripple/README.md
rename to src/lib/core/ripple/README.md
diff --git a/src/core/ripple/ripple-renderer.ts b/src/lib/core/ripple/ripple-renderer.ts
similarity index 100%
rename from src/core/ripple/ripple-renderer.ts
rename to src/lib/core/ripple/ripple-renderer.ts
diff --git a/src/core/ripple/ripple.spec.ts b/src/lib/core/ripple/ripple.spec.ts
similarity index 100%
rename from src/core/ripple/ripple.spec.ts
rename to src/lib/core/ripple/ripple.spec.ts
diff --git a/src/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts
similarity index 100%
rename from src/core/ripple/ripple.ts
rename to src/lib/core/ripple/ripple.ts
diff --git a/src/core/rtl/dir.ts b/src/lib/core/rtl/dir.ts
similarity index 100%
rename from src/core/rtl/dir.ts
rename to src/lib/core/rtl/dir.ts
diff --git a/src/core/style/_button-mixins.scss b/src/lib/core/style/_button-mixins.scss
similarity index 100%
rename from src/core/style/_button-mixins.scss
rename to src/lib/core/style/_button-mixins.scss
diff --git a/src/core/style/_default-theme.scss b/src/lib/core/style/_default-theme.scss
similarity index 100%
rename from src/core/style/_default-theme.scss
rename to src/lib/core/style/_default-theme.scss
diff --git a/src/core/style/_elevation.scss b/src/lib/core/style/_elevation.scss
similarity index 100%
rename from src/core/style/_elevation.scss
rename to src/lib/core/style/_elevation.scss
diff --git a/src/core/style/_list-shared.scss b/src/lib/core/style/_list-shared.scss
similarity index 100%
rename from src/core/style/_list-shared.scss
rename to src/lib/core/style/_list-shared.scss
diff --git a/src/core/style/_mixins.scss b/src/lib/core/style/_mixins.scss
similarity index 100%
rename from src/core/style/_mixins.scss
rename to src/lib/core/style/_mixins.scss
diff --git a/src/core/style/_palette.scss b/src/lib/core/style/_palette.scss
similarity index 100%
rename from src/core/style/_palette.scss
rename to src/lib/core/style/_palette.scss
diff --git a/src/core/style/_ripple.scss b/src/lib/core/style/_ripple.scss
similarity index 100%
rename from src/core/style/_ripple.scss
rename to src/lib/core/style/_ripple.scss
diff --git a/src/core/style/_sidenav-mixins.scss b/src/lib/core/style/_sidenav-mixins.scss
similarity index 100%
rename from src/core/style/_sidenav-mixins.scss
rename to src/lib/core/style/_sidenav-mixins.scss
diff --git a/src/core/style/_theme-functions.scss b/src/lib/core/style/_theme-functions.scss
similarity index 100%
rename from src/core/style/_theme-functions.scss
rename to src/lib/core/style/_theme-functions.scss
diff --git a/src/core/style/_variables.scss b/src/lib/core/style/_variables.scss
similarity index 100%
rename from src/core/style/_variables.scss
rename to src/lib/core/style/_variables.scss
diff --git a/src/core/style/apply-transform.ts b/src/lib/core/style/apply-transform.ts
similarity index 100%
rename from src/core/style/apply-transform.ts
rename to src/lib/core/style/apply-transform.ts
diff --git a/src/core/style/core.scss b/src/lib/core/style/core.scss
similarity index 100%
rename from src/core/style/core.scss
rename to src/lib/core/style/core.scss
diff --git a/src/components/dialog/dialog-config.ts b/src/lib/dialog/dialog-config.ts
similarity index 100%
rename from src/components/dialog/dialog-config.ts
rename to src/lib/dialog/dialog-config.ts
diff --git a/src/components/dialog/dialog-container.html b/src/lib/dialog/dialog-container.html
similarity index 100%
rename from src/components/dialog/dialog-container.html
rename to src/lib/dialog/dialog-container.html
diff --git a/src/components/dialog/dialog-container.scss b/src/lib/dialog/dialog-container.scss
similarity index 100%
rename from src/components/dialog/dialog-container.scss
rename to src/lib/dialog/dialog-container.scss
diff --git a/src/components/dialog/dialog-container.ts b/src/lib/dialog/dialog-container.ts
similarity index 99%
rename from src/components/dialog/dialog-container.ts
rename to src/lib/dialog/dialog-container.ts
index 62c54764d2d0..e33bb1d6461a 100644
--- a/src/components/dialog/dialog-container.ts
+++ b/src/lib/dialog/dialog-container.ts
@@ -14,7 +14,6 @@ import {MdDialogContentAlreadyAttachedError} from './dialog-errors';
  * Internal component that wraps user-provided dialog content.
  */
 @Component({
-  moduleId: module.id,
   selector: 'md-dialog-container',
   templateUrl: 'dialog-container.html',
   styleUrls: ['dialog-container.css'],
diff --git a/src/components/dialog/dialog-errors.ts b/src/lib/dialog/dialog-errors.ts
similarity index 100%
rename from src/components/dialog/dialog-errors.ts
rename to src/lib/dialog/dialog-errors.ts
diff --git a/src/components/dialog/dialog-injector.ts b/src/lib/dialog/dialog-injector.ts
similarity index 100%
rename from src/components/dialog/dialog-injector.ts
rename to src/lib/dialog/dialog-injector.ts
diff --git a/src/components/dialog/dialog-ref.ts b/src/lib/dialog/dialog-ref.ts
similarity index 100%
rename from src/components/dialog/dialog-ref.ts
rename to src/lib/dialog/dialog-ref.ts
diff --git a/src/components/dialog/dialog.spec.ts b/src/lib/dialog/dialog.spec.ts
similarity index 100%
rename from src/components/dialog/dialog.spec.ts
rename to src/lib/dialog/dialog.spec.ts
diff --git a/src/components/dialog/dialog.ts b/src/lib/dialog/dialog.ts
similarity index 100%
rename from src/components/dialog/dialog.ts
rename to src/lib/dialog/dialog.ts
diff --git a/src/components/grid-list/README.md b/src/lib/grid-list/README.md
similarity index 100%
rename from src/components/grid-list/README.md
rename to src/lib/grid-list/README.md
diff --git a/src/components/grid-list/grid-list-errors.ts b/src/lib/grid-list/grid-list-errors.ts
similarity index 100%
rename from src/components/grid-list/grid-list-errors.ts
rename to src/lib/grid-list/grid-list-errors.ts
diff --git a/src/components/grid-list/grid-list-measure.ts b/src/lib/grid-list/grid-list-measure.ts
similarity index 100%
rename from src/components/grid-list/grid-list-measure.ts
rename to src/lib/grid-list/grid-list-measure.ts
diff --git a/src/components/grid-list/grid-list.html b/src/lib/grid-list/grid-list.html
similarity index 100%
rename from src/components/grid-list/grid-list.html
rename to src/lib/grid-list/grid-list.html
diff --git a/src/components/grid-list/grid-list.scss b/src/lib/grid-list/grid-list.scss
similarity index 100%
rename from src/components/grid-list/grid-list.scss
rename to src/lib/grid-list/grid-list.scss
diff --git a/src/components/grid-list/grid-list.spec.ts b/src/lib/grid-list/grid-list.spec.ts
similarity index 100%
rename from src/components/grid-list/grid-list.spec.ts
rename to src/lib/grid-list/grid-list.spec.ts
diff --git a/src/components/grid-list/grid-list.ts b/src/lib/grid-list/grid-list.ts
similarity index 99%
rename from src/components/grid-list/grid-list.ts
rename to src/lib/grid-list/grid-list.ts
index f5683c457ece..678e469e9c98 100644
--- a/src/components/grid-list/grid-list.ts
+++ b/src/lib/grid-list/grid-list.ts
@@ -30,7 +30,6 @@ import {coerceToString, coerceToNumber} from './grid-list-measure';
 const MD_FIT_MODE = 'fit';
 
 @Component({
-  moduleId: module.id,
   selector: 'md-grid-list',
   templateUrl: 'grid-list.html',
   styleUrls: ['grid-list.css'],
diff --git a/src/components/grid-list/grid-tile-text.html b/src/lib/grid-list/grid-tile-text.html
similarity index 100%
rename from src/components/grid-list/grid-tile-text.html
rename to src/lib/grid-list/grid-tile-text.html
diff --git a/src/components/grid-list/grid-tile.html b/src/lib/grid-list/grid-tile.html
similarity index 100%
rename from src/components/grid-list/grid-tile.html
rename to src/lib/grid-list/grid-tile.html
diff --git a/src/components/grid-list/grid-tile.ts b/src/lib/grid-list/grid-tile.ts
similarity index 97%
rename from src/components/grid-list/grid-tile.ts
rename to src/lib/grid-list/grid-tile.ts
index f6e5aa00577d..97de4cd25c55 100644
--- a/src/components/grid-list/grid-tile.ts
+++ b/src/lib/grid-list/grid-tile.ts
@@ -12,7 +12,6 @@ import { MdLine, MdLineSetter } from '@angular2-material/core/line/line';
 import {coerceToNumber} from './grid-list-measure';
 
 @Component({
-  moduleId: module.id,
   selector: 'md-grid-tile',
   host: { 'role': 'listitem' },
   templateUrl: 'grid-tile.html',
@@ -54,7 +53,6 @@ export class MdGridTile {
 }
 
 @Component({
-  moduleId: module.id,
   selector: 'md-grid-tile-header, md-grid-tile-footer',
   templateUrl: 'grid-tile-text.html'
 })
diff --git a/src/components/grid-list/package.json b/src/lib/grid-list/package.json
similarity index 100%
rename from src/components/grid-list/package.json
rename to src/lib/grid-list/package.json
diff --git a/src/components/grid-list/tile-coordinator.ts b/src/lib/grid-list/tile-coordinator.ts
similarity index 100%
rename from src/components/grid-list/tile-coordinator.ts
rename to src/lib/grid-list/tile-coordinator.ts
diff --git a/src/components/grid-list/tile-styler.ts b/src/lib/grid-list/tile-styler.ts
similarity index 100%
rename from src/components/grid-list/tile-styler.ts
rename to src/lib/grid-list/tile-styler.ts
diff --git a/src/components/icon/README.md b/src/lib/icon/README.md
similarity index 100%
rename from src/components/icon/README.md
rename to src/lib/icon/README.md
diff --git a/src/components/icon/fake-svgs.ts b/src/lib/icon/fake-svgs.ts
similarity index 100%
rename from src/components/icon/fake-svgs.ts
rename to src/lib/icon/fake-svgs.ts
diff --git a/src/components/icon/icon-registry.ts b/src/lib/icon/icon-registry.ts
similarity index 100%
rename from src/components/icon/icon-registry.ts
rename to src/lib/icon/icon-registry.ts
diff --git a/src/components/icon/icon.scss b/src/lib/icon/icon.scss
similarity index 100%
rename from src/components/icon/icon.scss
rename to src/lib/icon/icon.scss
diff --git a/src/components/icon/icon.spec.ts b/src/lib/icon/icon.spec.ts
similarity index 100%
rename from src/components/icon/icon.spec.ts
rename to src/lib/icon/icon.spec.ts
diff --git a/src/components/icon/icon.ts b/src/lib/icon/icon.ts
similarity index 99%
rename from src/components/icon/icon.ts
rename to src/lib/icon/icon.ts
index a21974a608b8..af11d8d1b3f2 100644
--- a/src/components/icon/icon.ts
+++ b/src/lib/icon/icon.ts
@@ -56,7 +56,6 @@ export class MdIconInvalidNameError extends MdError {
  *     <md-icon fontSet="fa" fontIcon="alarm"></md-icon>
  */
 @Component({
-  moduleId: module.id,
   template: '<ng-content></ng-content>',
   selector: 'md-icon',
   styleUrls: ['icon.css'],
diff --git a/src/components/icon/package.json b/src/lib/icon/package.json
similarity index 100%
rename from src/components/icon/package.json
rename to src/lib/icon/package.json
diff --git a/src/components/input/README.md b/src/lib/input/README.md
similarity index 100%
rename from src/components/input/README.md
rename to src/lib/input/README.md
diff --git a/src/components/input/input.html b/src/lib/input/input.html
similarity index 100%
rename from src/components/input/input.html
rename to src/lib/input/input.html
diff --git a/src/components/input/input.scss b/src/lib/input/input.scss
similarity index 100%
rename from src/components/input/input.scss
rename to src/lib/input/input.scss
diff --git a/src/components/input/input.spec.ts b/src/lib/input/input.spec.ts
similarity index 100%
rename from src/components/input/input.spec.ts
rename to src/lib/input/input.spec.ts
diff --git a/src/components/input/input.ts b/src/lib/input/input.ts
similarity index 99%
rename from src/components/input/input.ts
rename to src/lib/input/input.ts
index f8b6b91409ec..581e0023b110 100644
--- a/src/components/input/input.ts
+++ b/src/lib/input/input.ts
@@ -95,7 +95,6 @@ export class MdHint {
  * improve on its behaviour, along with styling it according to the Material Design.
  */
 @Component({
-  moduleId: module.id,
   selector: 'md-input',
   templateUrl: 'input.html',
   styleUrls: ['input.css'],
diff --git a/src/components/input/package.json b/src/lib/input/package.json
similarity index 100%
rename from src/components/input/package.json
rename to src/lib/input/package.json
diff --git a/src/components/list/README.md b/src/lib/list/README.md
similarity index 100%
rename from src/components/list/README.md
rename to src/lib/list/README.md
diff --git a/src/components/list/list-item.html b/src/lib/list/list-item.html
similarity index 100%
rename from src/components/list/list-item.html
rename to src/lib/list/list-item.html
diff --git a/src/components/list/list.scss b/src/lib/list/list.scss
similarity index 100%
rename from src/components/list/list.scss
rename to src/lib/list/list.scss
diff --git a/src/components/list/list.spec.ts b/src/lib/list/list.spec.ts
similarity index 100%
rename from src/components/list/list.spec.ts
rename to src/lib/list/list.spec.ts
diff --git a/src/components/list/list.ts b/src/lib/list/list.ts
similarity index 97%
rename from src/components/list/list.ts
rename to src/lib/list/list.ts
index d021d0cf6014..a2c895ade7a9 100644
--- a/src/components/list/list.ts
+++ b/src/lib/list/list.ts
@@ -12,7 +12,6 @@ import {
 import { MdLine, MdLineSetter } from '@angular2-material/core/line/line';
 
 @Component({
-  moduleId: module.id,
   selector: 'md-list, md-nav-list',
   host: {'role': 'list'},
   template: '<ng-content></ng-content>',
@@ -26,7 +25,6 @@ export class MdList {}
 export class MdListAvatar {}
 
 @Component({
-  moduleId: module.id,
   selector: 'md-list-item, a[md-list-item]',
   host: {
     'role': 'listitem',
diff --git a/src/components/list/package.json b/src/lib/list/package.json
similarity index 100%
rename from src/components/list/package.json
rename to src/lib/list/package.json
diff --git a/src/components/menu/README.md b/src/lib/menu/README.md
similarity index 100%
rename from src/components/menu/README.md
rename to src/lib/menu/README.md
diff --git a/src/components/menu/menu-directive.ts b/src/lib/menu/menu-directive.ts
similarity index 99%
rename from src/components/menu/menu-directive.ts
rename to src/lib/menu/menu-directive.ts
index bac6f9181a1c..7c8062e39d0f 100644
--- a/src/components/menu/menu-directive.ts
+++ b/src/lib/menu/menu-directive.ts
@@ -15,7 +15,6 @@ import {MenuPositionX, MenuPositionY} from './menu-positions';
 import {MdMenuInvalidPositionX, MdMenuInvalidPositionY} from './menu-errors';
 
 @Component({
-  moduleId: module.id,
   selector: 'md-menu',
   host: {'role': 'menu'},
   templateUrl: 'menu.html',
diff --git a/src/components/menu/menu-errors.ts b/src/lib/menu/menu-errors.ts
similarity index 100%
rename from src/components/menu/menu-errors.ts
rename to src/lib/menu/menu-errors.ts
diff --git a/src/components/menu/menu-item.ts b/src/lib/menu/menu-item.ts
similarity index 100%
rename from src/components/menu/menu-item.ts
rename to src/lib/menu/menu-item.ts
diff --git a/src/components/menu/menu-positions.ts b/src/lib/menu/menu-positions.ts
similarity index 100%
rename from src/components/menu/menu-positions.ts
rename to src/lib/menu/menu-positions.ts
diff --git a/src/components/menu/menu-trigger.ts b/src/lib/menu/menu-trigger.ts
similarity index 100%
rename from src/components/menu/menu-trigger.ts
rename to src/lib/menu/menu-trigger.ts
diff --git a/src/components/menu/menu.html b/src/lib/menu/menu.html
similarity index 100%
rename from src/components/menu/menu.html
rename to src/lib/menu/menu.html
diff --git a/src/components/menu/menu.scss b/src/lib/menu/menu.scss
similarity index 100%
rename from src/components/menu/menu.scss
rename to src/lib/menu/menu.scss
diff --git a/src/components/menu/menu.spec.ts b/src/lib/menu/menu.spec.ts
similarity index 100%
rename from src/components/menu/menu.spec.ts
rename to src/lib/menu/menu.spec.ts
diff --git a/src/components/menu/menu.ts b/src/lib/menu/menu.ts
similarity index 100%
rename from src/components/menu/menu.ts
rename to src/lib/menu/menu.ts
diff --git a/src/components/menu/package.json b/src/lib/menu/package.json
similarity index 100%
rename from src/components/menu/package.json
rename to src/lib/menu/package.json
diff --git a/src/components/progress-bar/README.md b/src/lib/progress-bar/README.md
similarity index 100%
rename from src/components/progress-bar/README.md
rename to src/lib/progress-bar/README.md
diff --git a/src/components/progress-bar/package.json b/src/lib/progress-bar/package.json
similarity index 100%
rename from src/components/progress-bar/package.json
rename to src/lib/progress-bar/package.json
diff --git a/src/components/progress-bar/progress-bar.html b/src/lib/progress-bar/progress-bar.html
similarity index 100%
rename from src/components/progress-bar/progress-bar.html
rename to src/lib/progress-bar/progress-bar.html
diff --git a/src/components/progress-bar/progress-bar.scss b/src/lib/progress-bar/progress-bar.scss
similarity index 100%
rename from src/components/progress-bar/progress-bar.scss
rename to src/lib/progress-bar/progress-bar.scss
diff --git a/src/components/progress-bar/progress-bar.spec.ts b/src/lib/progress-bar/progress-bar.spec.ts
similarity index 100%
rename from src/components/progress-bar/progress-bar.spec.ts
rename to src/lib/progress-bar/progress-bar.spec.ts
diff --git a/src/components/progress-bar/progress-bar.ts b/src/lib/progress-bar/progress-bar.ts
similarity index 98%
rename from src/components/progress-bar/progress-bar.ts
rename to src/lib/progress-bar/progress-bar.ts
index c5fa27471155..d5747fae2057 100644
--- a/src/components/progress-bar/progress-bar.ts
+++ b/src/lib/progress-bar/progress-bar.ts
@@ -14,7 +14,6 @@ import {NgStyle} from '@angular/common';
  * <md-progress-bar> component.
  */
 @Component({
-  moduleId: module.id,
   selector: 'md-progress-bar',
   host: {
     'role': 'progressbar',
diff --git a/src/components/progress-circle/README.md b/src/lib/progress-circle/README.md
similarity index 100%
rename from src/components/progress-circle/README.md
rename to src/lib/progress-circle/README.md
diff --git a/src/components/progress-circle/package.json b/src/lib/progress-circle/package.json
similarity index 100%
rename from src/components/progress-circle/package.json
rename to src/lib/progress-circle/package.json
diff --git a/src/components/progress-circle/progress-circle.html b/src/lib/progress-circle/progress-circle.html
similarity index 100%
rename from src/components/progress-circle/progress-circle.html
rename to src/lib/progress-circle/progress-circle.html
diff --git a/src/components/progress-circle/progress-circle.scss b/src/lib/progress-circle/progress-circle.scss
similarity index 100%
rename from src/components/progress-circle/progress-circle.scss
rename to src/lib/progress-circle/progress-circle.scss
diff --git a/src/components/progress-circle/progress-circle.spec.ts b/src/lib/progress-circle/progress-circle.spec.ts
similarity index 100%
rename from src/components/progress-circle/progress-circle.spec.ts
rename to src/lib/progress-circle/progress-circle.spec.ts
diff --git a/src/components/progress-circle/progress-circle.ts b/src/lib/progress-circle/progress-circle.ts
similarity index 99%
rename from src/components/progress-circle/progress-circle.ts
rename to src/lib/progress-circle/progress-circle.ts
index 5daa83ec4738..df230247a564 100644
--- a/src/components/progress-circle/progress-circle.ts
+++ b/src/lib/progress-circle/progress-circle.ts
@@ -31,7 +31,6 @@ type EasingFn = (currentTime: number, startValue: number,
  * <md-progress-circle> component.
  */
 @Component({
-  moduleId: module.id,
   selector: 'md-progress-circle',
   host: {
     'role': 'progressbar',
@@ -218,7 +217,6 @@ export class MdProgressCircle implements OnDestroy {
  * indeterminate <md-progress-circle> instance.
  */
 @Component({
-  moduleId: module.id,
   selector: 'md-spinner',
   host: {
     'role': 'progressbar',
diff --git a/src/components/radio/README.md b/src/lib/radio/README.md
similarity index 100%
rename from src/components/radio/README.md
rename to src/lib/radio/README.md
diff --git a/src/components/radio/package.json b/src/lib/radio/package.json
similarity index 100%
rename from src/components/radio/package.json
rename to src/lib/radio/package.json
diff --git a/src/components/radio/radio.html b/src/lib/radio/radio.html
similarity index 100%
rename from src/components/radio/radio.html
rename to src/lib/radio/radio.html
diff --git a/src/components/radio/radio.scss b/src/lib/radio/radio.scss
similarity index 100%
rename from src/components/radio/radio.scss
rename to src/lib/radio/radio.scss
diff --git a/src/components/radio/radio.spec.ts b/src/lib/radio/radio.spec.ts
similarity index 100%
rename from src/components/radio/radio.spec.ts
rename to src/lib/radio/radio.spec.ts
diff --git a/src/components/radio/radio.ts b/src/lib/radio/radio.ts
similarity index 99%
rename from src/components/radio/radio.ts
rename to src/lib/radio/radio.ts
index 03544b24f7b3..624f9cf4a2ee 100644
--- a/src/components/radio/radio.ts
+++ b/src/lib/radio/radio.ts
@@ -175,9 +175,11 @@ export class MdRadioGroup implements AfterContentInit, ControlValueAccessor {
   }
 
   private _updateRadioButtonNames(): void {
-    (this._radios || []).forEach(radio => {
-      radio.name = this.name;
-    });
+    if (this._radios) {
+      this._radios.forEach(radio => {
+        radio.name = this.name;
+      });
+    }
   }
 
   /** Updates the `selected` radio button from the internal _value state. */
@@ -233,7 +235,6 @@ export class MdRadioGroup implements AfterContentInit, ControlValueAccessor {
 
 
 @Component({
-  moduleId: module.id,
   selector: 'md-radio-button',
   templateUrl: 'radio.html',
   styleUrls: ['radio.css'],
diff --git a/src/components/sidenav/README.md b/src/lib/sidenav/README.md
similarity index 100%
rename from src/components/sidenav/README.md
rename to src/lib/sidenav/README.md
diff --git a/src/components/sidenav/package.json b/src/lib/sidenav/package.json
similarity index 100%
rename from src/components/sidenav/package.json
rename to src/lib/sidenav/package.json
diff --git a/src/components/sidenav/sidenav-transitions.scss b/src/lib/sidenav/sidenav-transitions.scss
similarity index 100%
rename from src/components/sidenav/sidenav-transitions.scss
rename to src/lib/sidenav/sidenav-transitions.scss
diff --git a/src/components/sidenav/sidenav.html b/src/lib/sidenav/sidenav.html
similarity index 100%
rename from src/components/sidenav/sidenav.html
rename to src/lib/sidenav/sidenav.html
diff --git a/src/components/sidenav/sidenav.scss b/src/lib/sidenav/sidenav.scss
similarity index 100%
rename from src/components/sidenav/sidenav.scss
rename to src/lib/sidenav/sidenav.scss
diff --git a/src/components/sidenav/sidenav.spec.ts b/src/lib/sidenav/sidenav.spec.ts
similarity index 100%
rename from src/components/sidenav/sidenav.spec.ts
rename to src/lib/sidenav/sidenav.spec.ts
diff --git a/src/components/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
similarity index 99%
rename from src/components/sidenav/sidenav.ts
rename to src/lib/sidenav/sidenav.ts
index ce9a343fe94b..cb97d4066528 100644
--- a/src/components/sidenav/sidenav.ts
+++ b/src/lib/sidenav/sidenav.ts
@@ -221,7 +221,6 @@ export class MdSidenav {
  * and coordinate the backdrop and content styling.
  */
 @Component({
-  moduleId: module.id,
   selector: 'md-sidenav-layout',
   // Do not use ChangeDetectionStrategy.OnPush. It does not work for this component because
   // technically it is a sibling of MdSidenav (on the content tree) and isn't updated when MdSidenav
diff --git a/src/components/slide-toggle/README.md b/src/lib/slide-toggle/README.md
similarity index 100%
rename from src/components/slide-toggle/README.md
rename to src/lib/slide-toggle/README.md
diff --git a/src/components/slide-toggle/package.json b/src/lib/slide-toggle/package.json
similarity index 100%
rename from src/components/slide-toggle/package.json
rename to src/lib/slide-toggle/package.json
diff --git a/src/components/slide-toggle/slide-toggle.html b/src/lib/slide-toggle/slide-toggle.html
similarity index 100%
rename from src/components/slide-toggle/slide-toggle.html
rename to src/lib/slide-toggle/slide-toggle.html
diff --git a/src/components/slide-toggle/slide-toggle.scss b/src/lib/slide-toggle/slide-toggle.scss
similarity index 100%
rename from src/components/slide-toggle/slide-toggle.scss
rename to src/lib/slide-toggle/slide-toggle.scss
diff --git a/src/components/slide-toggle/slide-toggle.spec.ts b/src/lib/slide-toggle/slide-toggle.spec.ts
similarity index 100%
rename from src/components/slide-toggle/slide-toggle.spec.ts
rename to src/lib/slide-toggle/slide-toggle.spec.ts
diff --git a/src/components/slide-toggle/slide-toggle.ts b/src/lib/slide-toggle/slide-toggle.ts
similarity index 96%
rename from src/components/slide-toggle/slide-toggle.ts
rename to src/lib/slide-toggle/slide-toggle.ts
index 999cc5f69ec0..831d5a62c51a 100644
--- a/src/components/slide-toggle/slide-toggle.ts
+++ b/src/lib/slide-toggle/slide-toggle.ts
@@ -33,7 +33,6 @@ export class MdSlideToggleChange {
 let nextId = 0;
 
 @Component({
-  moduleId: module.id,
   selector: 'md-slide-toggle',
   host: {
     '[class.md-checked]': 'checked',
@@ -94,11 +93,11 @@ export class MdSlideToggle implements AfterContentInit, ControlValueAccessor {
     // Once a drag is currently in progress, we do not want to toggle the slide-toggle on a click.
     if (!this.disabled && !this._slideRenderer.isDragging()) {
       this.toggle();
-
-      // Emit our custom change event if the native input emitted one.
-      // It is important to only emit it, if the native input triggered one, because
-      // we don't want to trigger a change event, when the `checked` variable changes for example.
-      this._emitChangeEvent();
+
+      // Emit our custom change event if the native input emitted one.
+      // It is important to only emit it, if the native input triggered one, because
+      // we don't want to trigger a change event, when the `checked` variable changes for example.
+      this._emitChangeEvent();
     }
   }
 
diff --git a/src/components/slider/slider.html b/src/lib/slider/slider.html
similarity index 100%
rename from src/components/slider/slider.html
rename to src/lib/slider/slider.html
diff --git a/src/components/slider/slider.scss b/src/lib/slider/slider.scss
similarity index 100%
rename from src/components/slider/slider.scss
rename to src/lib/slider/slider.scss
diff --git a/src/components/slider/slider.spec.ts b/src/lib/slider/slider.spec.ts
similarity index 100%
rename from src/components/slider/slider.spec.ts
rename to src/lib/slider/slider.spec.ts
diff --git a/src/components/slider/slider.ts b/src/lib/slider/slider.ts
similarity index 99%
rename from src/components/slider/slider.ts
rename to src/lib/slider/slider.ts
index 8b2591fc6cc3..f919e52cf17d 100644
--- a/src/components/slider/slider.ts
+++ b/src/lib/slider/slider.ts
@@ -8,9 +8,10 @@ import {
 } from '@angular/core';
 import {BooleanFieldValue} from '@angular2-material/core/annotations/field-value';
 import {applyCssTransform} from '@angular2-material/core/style/apply-transform';
+import {Input as HammerInput} from 'hammerjs';
+
 
 @Component({
-  moduleId: module.id,
   selector: 'md-slider',
   host: {
     'tabindex': '0',
diff --git a/src/components/slider/test-gesture-config.ts b/src/lib/slider/test-gesture-config.ts
similarity index 100%
rename from src/components/slider/test-gesture-config.ts
rename to src/lib/slider/test-gesture-config.ts
diff --git a/src/components/tabs/README.md b/src/lib/tabs/README.md
similarity index 100%
rename from src/components/tabs/README.md
rename to src/lib/tabs/README.md
diff --git a/src/components/tabs/ink-bar.ts b/src/lib/tabs/ink-bar.ts
similarity index 100%
rename from src/components/tabs/ink-bar.ts
rename to src/lib/tabs/ink-bar.ts
diff --git a/src/components/tabs/package.json b/src/lib/tabs/package.json
similarity index 100%
rename from src/components/tabs/package.json
rename to src/lib/tabs/package.json
diff --git a/src/components/tabs/tab-content.ts b/src/lib/tabs/tab-content.ts
similarity index 100%
rename from src/components/tabs/tab-content.ts
rename to src/lib/tabs/tab-content.ts
diff --git a/src/components/tabs/tab-group.html b/src/lib/tabs/tab-group.html
similarity index 100%
rename from src/components/tabs/tab-group.html
rename to src/lib/tabs/tab-group.html
diff --git a/src/components/tabs/tab-group.scss b/src/lib/tabs/tab-group.scss
similarity index 100%
rename from src/components/tabs/tab-group.scss
rename to src/lib/tabs/tab-group.scss
diff --git a/src/components/tabs/tab-group.spec.ts b/src/lib/tabs/tab-group.spec.ts
similarity index 100%
rename from src/components/tabs/tab-group.spec.ts
rename to src/lib/tabs/tab-group.spec.ts
diff --git a/src/components/tabs/tab-label-wrapper.ts b/src/lib/tabs/tab-label-wrapper.ts
similarity index 100%
rename from src/components/tabs/tab-label-wrapper.ts
rename to src/lib/tabs/tab-label-wrapper.ts
diff --git a/src/components/tabs/tab-label.ts b/src/lib/tabs/tab-label.ts
similarity index 100%
rename from src/components/tabs/tab-label.ts
rename to src/lib/tabs/tab-label.ts
diff --git a/src/components/tabs/tabs.ts b/src/lib/tabs/tabs.ts
similarity index 99%
rename from src/components/tabs/tabs.ts
rename to src/lib/tabs/tabs.ts
index 7c7772107490..3be9c160af39 100644
--- a/src/components/tabs/tabs.ts
+++ b/src/lib/tabs/tabs.ts
@@ -50,7 +50,6 @@ export class MdTab {
  * See: https://www.google.com/design/spec/components/tabs.html
  */
 @Component({
-  moduleId: module.id,
   selector: 'md-tab-group',
   templateUrl: 'tab-group.html',
   styleUrls: ['tab-group.css'],
diff --git a/src/components/toolbar/README.md b/src/lib/toolbar/README.md
similarity index 100%
rename from src/components/toolbar/README.md
rename to src/lib/toolbar/README.md
diff --git a/src/components/toolbar/package.json b/src/lib/toolbar/package.json
similarity index 100%
rename from src/components/toolbar/package.json
rename to src/lib/toolbar/package.json
diff --git a/src/components/toolbar/toolbar.html b/src/lib/toolbar/toolbar.html
similarity index 100%
rename from src/components/toolbar/toolbar.html
rename to src/lib/toolbar/toolbar.html
diff --git a/src/components/toolbar/toolbar.scss b/src/lib/toolbar/toolbar.scss
similarity index 100%
rename from src/components/toolbar/toolbar.scss
rename to src/lib/toolbar/toolbar.scss
diff --git a/src/components/toolbar/toolbar.spec.ts b/src/lib/toolbar/toolbar.spec.ts
similarity index 100%
rename from src/components/toolbar/toolbar.spec.ts
rename to src/lib/toolbar/toolbar.spec.ts
diff --git a/src/components/toolbar/toolbar.ts b/src/lib/toolbar/toolbar.ts
similarity index 97%
rename from src/components/toolbar/toolbar.ts
rename to src/lib/toolbar/toolbar.ts
index 35d710f6df60..cc0b6867e7db 100644
--- a/src/components/toolbar/toolbar.ts
+++ b/src/lib/toolbar/toolbar.ts
@@ -8,7 +8,6 @@ import {Renderer} from '@angular/core';
 import {ElementRef} from '@angular/core';
 
 @Component({
-  moduleId: module.id,
   selector: 'md-toolbar',
   templateUrl: 'toolbar.html',
   styleUrls: ['toolbar.css'],
diff --git a/src/components/tooltip/README.md b/src/lib/tooltip/README.md
similarity index 100%
rename from src/components/tooltip/README.md
rename to src/lib/tooltip/README.md
diff --git a/src/components/tooltip/tooltip.html b/src/lib/tooltip/tooltip.html
similarity index 100%
rename from src/components/tooltip/tooltip.html
rename to src/lib/tooltip/tooltip.html
diff --git a/src/components/tooltip/tooltip.scss b/src/lib/tooltip/tooltip.scss
similarity index 100%
rename from src/components/tooltip/tooltip.scss
rename to src/lib/tooltip/tooltip.scss
diff --git a/src/components/tooltip/tooltip.spec.ts b/src/lib/tooltip/tooltip.spec.ts
similarity index 96%
rename from src/components/tooltip/tooltip.spec.ts
rename to src/lib/tooltip/tooltip.spec.ts
index d6cb38d1c0c5..b7ff9c105c76 100644
--- a/src/components/tooltip/tooltip.spec.ts
+++ b/src/lib/tooltip/tooltip.spec.ts
@@ -10,8 +10,7 @@ import {
 import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
 import {Component, DebugElement} from '@angular/core';
 import {By} from '@angular/platform-browser';
-import {MD_TOOLTIP_DIRECTIVES, TooltipPosition, MdTooltip} from
-    '@angular2-material/tooltip/tooltip';
+import {MD_TOOLTIP_DIRECTIVES, TooltipPosition, MdTooltip} from './tooltip';
 import {OVERLAY_PROVIDERS} from '@angular2-material/core/overlay/overlay';
 import {OverlayContainer} from '@angular2-material/core/overlay/overlay-container';
 
diff --git a/src/components/tooltip/tooltip.ts b/src/lib/tooltip/tooltip.ts
similarity index 99%
rename from src/components/tooltip/tooltip.ts
rename to src/lib/tooltip/tooltip.ts
index 99d168dcf170..d0abce358a90 100644
--- a/src/components/tooltip/tooltip.ts
+++ b/src/lib/tooltip/tooltip.ts
@@ -171,7 +171,6 @@ export class MdTooltip {
 }
 
 @Component({
-  moduleId: module.id,
   selector: 'md-tooltip-component',
   template: `<div class="md-tooltip">{{message}}</div>`,
   styleUrls: ['tooltip.css'],
diff --git a/src/lib/tsconfig.json b/src/lib/tsconfig.json
new file mode 100644
index 000000000000..28503b4588ae
--- /dev/null
+++ b/src/lib/tsconfig.json
@@ -0,0 +1,36 @@
+{
+  "compilerOptions": {
+    "declaration": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": ["es6", "es2015", "dom"],
+    "mapRoot": "",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noEmitOnError": true,
+    "noImplicitAny": true,
+    "outDir": "../../dist/@angular2-material",
+    "rootDir": ".",
+    "sourceMap": true,
+    "target": "es5",
+    "inlineSources": true,
+    "stripInternal": true,
+    "baseUrl": "",
+    "paths": {
+      "@angular2-material/core/*": [
+        "./core/*"
+      ]
+    },
+    "typeRoots": [
+      "../../node_modules/@types"
+    ],
+    "types": [
+      "jasmine"
+    ]
+  },
+  "angularCompilerOptions": {
+    "genDir": "../dist",
+    "skipTemplateCodegen": true,
+    "debug": true
+  }
+}
diff --git a/typings.json b/typings.json
deleted file mode 100644
index 56838d905d35..000000000000
--- a/typings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "name": "material2",
-  "dependencies": {},
-  "devDependencies": {},
-  "globalDevDependencies": {
-    "jasmine": "registry:dt/jasmine#2.2.0+20160505161446"
-  },
-  "globalDependencies": {
-    "core-js": "registry:dt/core-js#0.0.0+20160317120654",
-    "hammerjs": "registry:dt/hammerjs#2.0.4+20160417130828"
-  }
-}