diff --git a/packages/ionic-vanilla/demos/button/basic.html b/packages/ionic-vanilla/demos/components/button/basic.html
similarity index 98%
rename from packages/ionic-vanilla/demos/button/basic.html
rename to packages/ionic-vanilla/demos/components/button/basic.html
index 4c78d084db..a032836a71 100644
--- a/packages/ionic-vanilla/demos/button/basic.html
+++ b/packages/ionic-vanilla/demos/components/button/basic.html
@@ -2,7 +2,7 @@
- Ionic Slides Basic
+ Ionic Buttons
diff --git a/packages/ionic-vanilla/demos/button/toolbar.html b/packages/ionic-vanilla/demos/components/button/toolbar.html
similarity index 99%
rename from packages/ionic-vanilla/demos/button/toolbar.html
rename to packages/ionic-vanilla/demos/components/button/toolbar.html
index 6cb1243e3a..4d432ac016 100644
--- a/packages/ionic-vanilla/demos/button/toolbar.html
+++ b/packages/ionic-vanilla/demos/components/button/toolbar.html
@@ -2,7 +2,7 @@
- Ionic Slides Basic
+ Ionic Toolbar Buttons
diff --git a/packages/ionic-vanilla/demos/components/grid/basic.html b/packages/ionic-vanilla/demos/components/grid/basic.html
new file mode 100644
index 0000000000..43709fea7d
--- /dev/null
+++ b/packages/ionic-vanilla/demos/components/grid/basic.html
@@ -0,0 +1,271 @@
+
+
+
+
+ Ionic Grid
+
+
+
+
+
+
+
+
+
+
+ ion-col
+
+
+
+
+ ion-col
+
+
+
+
+ ion-col
+
+
+
+
+ ion-col
+
+
+
+
+
+
+
+ ion-col[width-50]
+
+
+
+
+ ion-col
+
+
+
+
+ ion-col
+
+
+
+
+
+
+
+ ion-col[width-25]
+
+
+
+
+ ion-col
+
+
+
+
+ ion-col[width-25]
+
+
+
+
+
+
+
+ ion-col[width-25]
+
+
+
+
+ ion-col[width-25][offset-25]
+
+
+
+
+
+
+
+ ion-col
+
+
+
+
+ ion-col
#
+
+
+
+
+ ion-col
#
#
+
+
+
+
+ ion-col
#
#
#
+
+
+
+
+
+
+
+ ion-col[top]
+
+
+
+
+ ion-col[center]
+
+
+
+
+ ion-col[bottom]
+
+
+
+
+ ion-col
#
#
+
+
+
+
+
+
+
+ [top] ion-col
+
+
+
+
+ [top] ion-col
+
+
+
+
+ [top] ion-col[bottom]
+
+
+
+
+ ion-col
#
#
+
+
+
+
+
+
+
+ [center] ion-col
+
+
+
+
+ [center] ion-col
+
+
+
+
+ [center] ion-col
+
+
+
+
+ ion-col
#
#
+
+
+
+
+
+
+
+ [bottom] ion-col
+
+
+
+
+ [bottom] ion-col[top]
+
+
+
+
+ [bottom] ion-col
+
+
+
+
+ ion-col
#
#
+
+
+
+
+
+
+
+ [responsive-sm] ion-col
+
+
+
+
+ [responsive-sm] ion-col
+
+
+
+
+ [responsive-sm] ion-col
+
+
+
+
+ [responsive-sm] ion-col
+
+
+
+
+
+
+
+ [responsive-md] ion-col
+
+
+
+
+ [responsive-md] ion-col
+
+
+
+
+ [responsive-md] ion-col
+
+
+
+
+ [responsive-md] ion-col
+
+
+
+
+
+
+
+ [responsive-lg] ion-col[width-50][offset-25]
+
+
+
+
+ [responsive-lg] ion-col[width-25]
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/ionic-vanilla/demos/components/icon/basic.html b/packages/ionic-vanilla/demos/components/icon/basic.html
new file mode 100644
index 0000000000..ead9f8d810
--- /dev/null
+++ b/packages/ionic-vanilla/demos/components/icon/basic.html
@@ -0,0 +1,91 @@
+
+
+
+
+ Ionic Icons
+
+
+
+
+
+
+
+
+ Icon
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/ionic-vanilla/demos/components/segment/basic.html b/packages/ionic-vanilla/demos/components/segment/basic.html
new file mode 100644
index 0000000000..e13bd18e0f
--- /dev/null
+++ b/packages/ionic-vanilla/demos/components/segment/basic.html
@@ -0,0 +1,123 @@
+
+
+
+
+ Ionic Segment
+
+
+
+
+
+
+
+
+
+ Paid
+
+
+ Free
+
+
+ Top
+
+
+
+
+
+
+
+ Sunny
+
+
+ Rainy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Bookmarks
+
+
+ Reading List
+
+
+ Shared Links
+
+
+
+
+
+ Active
+
+
+ Disabled
+
+
+ Inactive
+
+
+
+
+
+ Toggle Disabled
+
+
+ Toggle Value
+
+
+
+
+
+
+
+
+