diff --git a/demos/component-docs/buttons/block/pages.ts b/demos/component-docs/buttons/block/pages.ts
index 5cfebde02e..2c41355afe 100644
--- a/demos/component-docs/buttons/block/pages.ts
+++ b/demos/component-docs/buttons/block/pages.ts
@@ -3,7 +3,7 @@ import {forwardRef} from 'angular2/angular2';
 import {AndroidAttribute} from '../../helpers';
 
 @Page({
-  templateUrl: 'buttons/block.html',
+  templateUrl: 'buttons/block/block.html',
   directives: [forwardRef(() => AndroidAttribute)]
 })
 export class BlockPage {
diff --git a/demos/component-docs/buttons/clear/pages.ts b/demos/component-docs/buttons/clear/pages.ts
index 2622ddbf26..09eb6393b8 100644
--- a/demos/component-docs/buttons/clear/pages.ts
+++ b/demos/component-docs/buttons/clear/pages.ts
@@ -3,7 +3,7 @@ import {forwardRef} from 'angular2/angular2';
 import {AndroidAttribute} from '../../helpers';
 
 @Page({
-  templateUrl: 'buttons/clear.html',
+  templateUrl: 'buttons/clear/clear.html',
   directives: [forwardRef(() => AndroidAttribute)]
 })
 export class ClearPage {
diff --git a/demos/component-docs/buttons/components/pages.ts b/demos/component-docs/buttons/components/pages.ts
index 4fd151ef1a..4cdef689f8 100644
--- a/demos/component-docs/buttons/components/pages.ts
+++ b/demos/component-docs/buttons/components/pages.ts
@@ -3,7 +3,7 @@ import {forwardRef} from 'angular2/angular2';
 import {AndroidAttribute} from '../../helpers';
 
 @Page({
-  templateUrl: 'buttons/components.html',
+  templateUrl: 'buttons/components/components.html',
   directives: [forwardRef(() => AndroidAttribute)]
 })
 export class ComponentsPage {
diff --git a/demos/component-docs/buttons/fab/pages.ts b/demos/component-docs/buttons/fab/pages.ts
index 93c01d1804..41fd39cf8e 100644
--- a/demos/component-docs/buttons/fab/pages.ts
+++ b/demos/component-docs/buttons/fab/pages.ts
@@ -3,7 +3,7 @@ import {forwardRef} from 'angular2/angular2';
 import {AndroidAttribute} from '../../helpers';
 
 @Page({
-  templateUrl: 'buttons/fab.html',
+  templateUrl: 'buttons/fab/fab.html',
   directives: [forwardRef(() => AndroidAttribute)]
 })
 export class FabPage {
diff --git a/demos/component-docs/buttons/full/pages.ts b/demos/component-docs/buttons/full/pages.ts
index aadf415638..022adcb9b0 100644
--- a/demos/component-docs/buttons/full/pages.ts
+++ b/demos/component-docs/buttons/full/pages.ts
@@ -3,7 +3,7 @@ import {forwardRef} from 'angular2/angular2';
 import {AndroidAttribute} from '../../helpers';
 
 @Page({
-  templateUrl: 'buttons/full.html',
+  templateUrl: 'buttons/full/full.html',
   directives: [forwardRef(() => AndroidAttribute)]
 })
 export class FullPage {
diff --git a/demos/component-docs/buttons/icons/pages.ts b/demos/component-docs/buttons/icons/pages.ts
index f2f247e34c..05075f5dc7 100644
--- a/demos/component-docs/buttons/icons/pages.ts
+++ b/demos/component-docs/buttons/icons/pages.ts
@@ -3,7 +3,7 @@ import {forwardRef} from 'angular2/angular2';
 import {AndroidAttribute} from '../../helpers';
 
 @Page({
-  templateUrl: 'buttons/icons.html',
+  templateUrl: 'buttons/icons/icons.html',
   directives: [forwardRef(() => AndroidAttribute)]
 })
 export class IconsPage {
diff --git a/demos/component-docs/buttons/outline/pages.ts b/demos/component-docs/buttons/outline/pages.ts
index 5f74737ab6..a3b3561b83 100644
--- a/demos/component-docs/buttons/outline/pages.ts
+++ b/demos/component-docs/buttons/outline/pages.ts
@@ -3,7 +3,7 @@ import {forwardRef} from 'angular2/angular2';
 import {AndroidAttribute} from '../../helpers';
 
 @Page({
-  templateUrl: 'buttons/outline.html',
+  templateUrl: 'buttons/outline/outline.html',
   directives: [forwardRef(() => AndroidAttribute)]
 })
 export class OutlinePage {
diff --git a/demos/component-docs/buttons/round/pages.ts b/demos/component-docs/buttons/round/pages.ts
index fad823f814..a19ac56610 100644
--- a/demos/component-docs/buttons/round/pages.ts
+++ b/demos/component-docs/buttons/round/pages.ts
@@ -3,7 +3,7 @@ import {forwardRef} from 'angular2/angular2';
 import {AndroidAttribute} from '../../helpers';
 
 @Page({
-  templateUrl: 'buttons/round.html',
+  templateUrl: 'buttons/round/round.html',
   directives: [forwardRef(() => AndroidAttribute)]
 })
 export class RoundPage {
diff --git a/demos/component-docs/buttons/sizes/pages.ts b/demos/component-docs/buttons/sizes/pages.ts
index a60e3decea..02c89c246d 100644
--- a/demos/component-docs/buttons/sizes/pages.ts
+++ b/demos/component-docs/buttons/sizes/pages.ts
@@ -3,7 +3,7 @@ import {forwardRef} from 'angular2/angular2';
 import {AndroidAttribute} from '../../helpers';
 
 @Page({
-  templateUrl: 'buttons/sizes.html',
+  templateUrl: 'buttons/sizes/sizes.html',
   directives: [forwardRef(() => AndroidAttribute)]
 })
 export class SizesPage {