Call it Flutter Gallery (#3801)
diff --git a/examples/README.md b/examples/README.md
index 4cbd73a..3182f74 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -13,7 +13,7 @@
 - **Hello, world** The [hello world app](hello_world) is a basic app that shows
   the text "hello, world."
 
-- **Material Gallery** The [material gallery app](material_gallery) showcases
+- **Flutter gallery** The [flutter gallery app](flutter_gallery) showcases
   Flutter's implementation of [material design](https://www.google.com/design/spec/material-design/introduction.html).
 
 - **Layers** The [layers vignettes](layers) show how to use the various layers
diff --git a/examples/material_gallery/.gitignore b/examples/flutter_gallery/.gitignore
similarity index 100%
rename from examples/material_gallery/.gitignore
rename to examples/flutter_gallery/.gitignore
diff --git a/examples/material_gallery/README.md b/examples/flutter_gallery/README.md
similarity index 80%
rename from examples/material_gallery/README.md
rename to examples/flutter_gallery/README.md
index bb62601..0d13d4d 100644
--- a/examples/material_gallery/README.md
+++ b/examples/flutter_gallery/README.md
@@ -1,6 +1,6 @@
-# Flutter Material Gallery
+# Flutter gallery
 
-Demo app for the Material Design widgets implemented in Flutter.
+Demo app for the Material Design widgets and other features provided by Flutter.
 
 ## Icon
 
diff --git a/examples/material_gallery/android/AndroidManifest.xml b/examples/flutter_gallery/android/AndroidManifest.xml
similarity index 82%
copy from examples/material_gallery/android/AndroidManifest.xml
copy to examples/flutter_gallery/android/AndroidManifest.xml
index 3e7f58d..2024e84 100644
--- a/examples/material_gallery/android/AndroidManifest.xml
+++ b/examples/flutter_gallery/android/AndroidManifest.xml
@@ -8,8 +8,8 @@
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application android:icon="@mipmap/ic_launcher" android:label="Flutter Material" android:name="org.domokit.sky.shell.SkyApplication">
-        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTop" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
+    <application android:icon="@mipmap/ic_launcher" android:label="Flutter gallery" android:name="org.domokit.sky.shell.SkyApplication">
+        <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTask" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/examples/material_gallery/android/res/mipmap-hdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from examples/material_gallery/android/res/mipmap-hdpi/ic_launcher.png
rename to examples/flutter_gallery/android/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/examples/material_gallery/android/res/mipmap-mdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from examples/material_gallery/android/res/mipmap-mdpi/ic_launcher.png
rename to examples/flutter_gallery/android/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/examples/material_gallery/android/res/mipmap-xhdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from examples/material_gallery/android/res/mipmap-xhdpi/ic_launcher.png
rename to examples/flutter_gallery/android/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/examples/material_gallery/android/res/mipmap-xxhdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from examples/material_gallery/android/res/mipmap-xxhdpi/ic_launcher.png
rename to examples/flutter_gallery/android/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/examples/material_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from examples/material_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png
rename to examples/flutter_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/examples/material_gallery/assets/flutter_logo.png b/examples/flutter_gallery/assets/flutter_logo.png
similarity index 100%
rename from examples/material_gallery/assets/flutter_logo.png
rename to examples/flutter_gallery/assets/flutter_logo.png
Binary files differ
diff --git a/examples/material_gallery/assets/section_animation.png b/examples/flutter_gallery/assets/section_animation.png
similarity index 100%
rename from examples/material_gallery/assets/section_animation.png
rename to examples/flutter_gallery/assets/section_animation.png
Binary files differ
diff --git a/examples/material_gallery/assets/section_components.png b/examples/flutter_gallery/assets/section_components.png
similarity index 100%
rename from examples/material_gallery/assets/section_components.png
rename to examples/flutter_gallery/assets/section_components.png
Binary files differ
diff --git a/examples/material_gallery/assets/section_layout.png b/examples/flutter_gallery/assets/section_layout.png
similarity index 100%
rename from examples/material_gallery/assets/section_layout.png
rename to examples/flutter_gallery/assets/section_layout.png
Binary files differ
diff --git a/examples/material_gallery/assets/section_patterns.png b/examples/flutter_gallery/assets/section_patterns.png
similarity index 100%
rename from examples/material_gallery/assets/section_patterns.png
rename to examples/flutter_gallery/assets/section_patterns.png
Binary files differ
diff --git a/examples/material_gallery/assets/section_style.png b/examples/flutter_gallery/assets/section_style.png
similarity index 100%
rename from examples/material_gallery/assets/section_style.png
rename to examples/flutter_gallery/assets/section_style.png
Binary files differ
diff --git a/examples/material_gallery/assets/section_usability.png b/examples/flutter_gallery/assets/section_usability.png
similarity index 100%
rename from examples/material_gallery/assets/section_usability.png
rename to examples/flutter_gallery/assets/section_usability.png
Binary files differ
diff --git a/examples/material_gallery/flutter.yaml b/examples/flutter_gallery/flutter.yaml
similarity index 98%
rename from examples/material_gallery/flutter.yaml
rename to examples/flutter_gallery/flutter.yaml
index 9639d3b..7a2ca11 100644
--- a/examples/material_gallery/flutter.yaml
+++ b/examples/flutter_gallery/flutter.yaml
@@ -1,4 +1,4 @@
-name: material_gallery
+name: flutter_gallery
 uses-material-design: true
 assets:
   - assets/flutter_logo.png
diff --git a/examples/material_gallery/ios/.gitignore b/examples/flutter_gallery/ios/.gitignore
similarity index 100%
rename from examples/material_gallery/ios/.gitignore
rename to examples/flutter_gallery/ios/.gitignore
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
similarity index 100%
rename from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
rename to examples/flutter_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Info.plist b/examples/flutter_gallery/ios/Info.plist
similarity index 97%
rename from examples/material_gallery/ios/Info.plist
rename to examples/flutter_gallery/ios/Info.plist
index 6934157..c89ab01 100644
--- a/examples/material_gallery/ios/Info.plist
+++ b/examples/flutter_gallery/ios/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Material Gallery</string>
+	<string>Flutter gallery</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/examples/material_gallery/ios/LaunchScreen.storyboard b/examples/flutter_gallery/ios/LaunchScreen.storyboard
similarity index 100%
rename from examples/material_gallery/ios/LaunchScreen.storyboard
rename to examples/flutter_gallery/ios/LaunchScreen.storyboard
diff --git a/examples/material_gallery/lib/demo/all.dart b/examples/flutter_gallery/lib/demo/all.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/all.dart
rename to examples/flutter_gallery/lib/demo/all.dart
diff --git a/examples/material_gallery/lib/demo/buttons_demo.dart b/examples/flutter_gallery/lib/demo/buttons_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/buttons_demo.dart
rename to examples/flutter_gallery/lib/demo/buttons_demo.dart
diff --git a/examples/material_gallery/lib/demo/cards_demo.dart b/examples/flutter_gallery/lib/demo/cards_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/cards_demo.dart
rename to examples/flutter_gallery/lib/demo/cards_demo.dart
diff --git a/examples/material_gallery/lib/demo/chip_demo.dart b/examples/flutter_gallery/lib/demo/chip_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/chip_demo.dart
rename to examples/flutter_gallery/lib/demo/chip_demo.dart
diff --git a/examples/material_gallery/lib/demo/colors_demo.dart b/examples/flutter_gallery/lib/demo/colors_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/colors_demo.dart
rename to examples/flutter_gallery/lib/demo/colors_demo.dart
diff --git a/examples/material_gallery/lib/demo/data_table_demo.dart b/examples/flutter_gallery/lib/demo/data_table_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/data_table_demo.dart
rename to examples/flutter_gallery/lib/demo/data_table_demo.dart
diff --git a/examples/material_gallery/lib/demo/date_picker_demo.dart b/examples/flutter_gallery/lib/demo/date_picker_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/date_picker_demo.dart
rename to examples/flutter_gallery/lib/demo/date_picker_demo.dart
diff --git a/examples/material_gallery/lib/demo/dialog_demo.dart b/examples/flutter_gallery/lib/demo/dialog_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/dialog_demo.dart
rename to examples/flutter_gallery/lib/demo/dialog_demo.dart
diff --git a/examples/material_gallery/lib/demo/drawing_demo.dart b/examples/flutter_gallery/lib/demo/drawing_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/drawing_demo.dart
rename to examples/flutter_gallery/lib/demo/drawing_demo.dart
diff --git a/examples/material_gallery/lib/demo/drop_down_demo.dart b/examples/flutter_gallery/lib/demo/drop_down_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/drop_down_demo.dart
rename to examples/flutter_gallery/lib/demo/drop_down_demo.dart
diff --git a/examples/flutter_gallery/lib/demo/fail.dart b/examples/flutter_gallery/lib/demo/fail.dart
new file mode 100644
index 0000000..049a1b1
--- /dev/null
+++ b/examples/flutter_gallery/lib/demo/fail.dart
@@ -0,0 +1,24 @@
+
+import 'package:flutter/material.dart';
+
+class LimitDemo extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return new Scaffold(
+      appBar: new AppBar(
+        title: new Text('LimitedBox test')
+      ),
+      body: new Block(
+        children: <Widget>[
+          new LimitedBox(
+            maxWidth: 100.0,
+            maxHeight: 100.0,
+            child: new Container(
+              decoration: new BoxDecoration(backgroundColor: const Color(0xFF00FF00))
+            )
+          )
+        ]
+      )
+    );
+  }
+}
diff --git a/examples/material_gallery/lib/demo/fitness_demo.dart b/examples/flutter_gallery/lib/demo/fitness_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/fitness_demo.dart
rename to examples/flutter_gallery/lib/demo/fitness_demo.dart
diff --git a/examples/material_gallery/lib/demo/flexible_space_demo.dart b/examples/flutter_gallery/lib/demo/flexible_space_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/flexible_space_demo.dart
rename to examples/flutter_gallery/lib/demo/flexible_space_demo.dart
diff --git a/examples/material_gallery/lib/demo/full_screen_dialog_demo.dart b/examples/flutter_gallery/lib/demo/full_screen_dialog_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/full_screen_dialog_demo.dart
rename to examples/flutter_gallery/lib/demo/full_screen_dialog_demo.dart
diff --git a/examples/material_gallery/lib/demo/grid_list_demo.dart b/examples/flutter_gallery/lib/demo/grid_list_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/grid_list_demo.dart
rename to examples/flutter_gallery/lib/demo/grid_list_demo.dart
diff --git a/examples/material_gallery/lib/demo/icons_demo.dart b/examples/flutter_gallery/lib/demo/icons_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/icons_demo.dart
rename to examples/flutter_gallery/lib/demo/icons_demo.dart
diff --git a/examples/material_gallery/lib/demo/leave_behind_demo.dart b/examples/flutter_gallery/lib/demo/leave_behind_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/leave_behind_demo.dart
rename to examples/flutter_gallery/lib/demo/leave_behind_demo.dart
diff --git a/examples/material_gallery/lib/demo/list_demo.dart b/examples/flutter_gallery/lib/demo/list_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/list_demo.dart
rename to examples/flutter_gallery/lib/demo/list_demo.dart
diff --git a/examples/material_gallery/lib/demo/menu_demo.dart b/examples/flutter_gallery/lib/demo/menu_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/menu_demo.dart
rename to examples/flutter_gallery/lib/demo/menu_demo.dart
diff --git a/examples/material_gallery/lib/demo/modal_bottom_sheet_demo.dart b/examples/flutter_gallery/lib/demo/modal_bottom_sheet_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/modal_bottom_sheet_demo.dart
rename to examples/flutter_gallery/lib/demo/modal_bottom_sheet_demo.dart
diff --git a/examples/material_gallery/lib/demo/overscroll_demo.dart b/examples/flutter_gallery/lib/demo/overscroll_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/overscroll_demo.dart
rename to examples/flutter_gallery/lib/demo/overscroll_demo.dart
diff --git a/examples/material_gallery/lib/demo/page_selector_demo.dart b/examples/flutter_gallery/lib/demo/page_selector_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/page_selector_demo.dart
rename to examples/flutter_gallery/lib/demo/page_selector_demo.dart
diff --git a/examples/material_gallery/lib/demo/persistent_bottom_sheet_demo.dart b/examples/flutter_gallery/lib/demo/persistent_bottom_sheet_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/persistent_bottom_sheet_demo.dart
rename to examples/flutter_gallery/lib/demo/persistent_bottom_sheet_demo.dart
diff --git a/examples/material_gallery/lib/demo/progress_indicator_demo.dart b/examples/flutter_gallery/lib/demo/progress_indicator_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/progress_indicator_demo.dart
rename to examples/flutter_gallery/lib/demo/progress_indicator_demo.dart
diff --git a/examples/material_gallery/lib/demo/scrollable_tabs_demo.dart b/examples/flutter_gallery/lib/demo/scrollable_tabs_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/scrollable_tabs_demo.dart
rename to examples/flutter_gallery/lib/demo/scrollable_tabs_demo.dart
diff --git a/examples/material_gallery/lib/demo/scrolling_techniques_demo.dart b/examples/flutter_gallery/lib/demo/scrolling_techniques_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/scrolling_techniques_demo.dart
rename to examples/flutter_gallery/lib/demo/scrolling_techniques_demo.dart
diff --git a/examples/material_gallery/lib/demo/selection_controls_demo.dart b/examples/flutter_gallery/lib/demo/selection_controls_demo.dart
similarity index 99%
rename from examples/material_gallery/lib/demo/selection_controls_demo.dart
rename to examples/flutter_gallery/lib/demo/selection_controls_demo.dart
index 69936fd..29213d7 100644
--- a/examples/material_gallery/lib/demo/selection_controls_demo.dart
+++ b/examples/flutter_gallery/lib/demo/selection_controls_demo.dart
@@ -60,7 +60,7 @@
     ];
 
     return new TabbedComponentDemoScaffold(
-      title: 'Selection Controls',
+      title: 'Selection controls',
       demos: demos
     );
   }
diff --git a/examples/material_gallery/lib/demo/slider_demo.dart b/examples/flutter_gallery/lib/demo/slider_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/slider_demo.dart
rename to examples/flutter_gallery/lib/demo/slider_demo.dart
diff --git a/examples/material_gallery/lib/demo/snack_bar_demo.dart b/examples/flutter_gallery/lib/demo/snack_bar_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/snack_bar_demo.dart
rename to examples/flutter_gallery/lib/demo/snack_bar_demo.dart
diff --git a/examples/material_gallery/lib/demo/tabs_demo.dart b/examples/flutter_gallery/lib/demo/tabs_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/tabs_demo.dart
rename to examples/flutter_gallery/lib/demo/tabs_demo.dart
diff --git a/examples/material_gallery/lib/demo/tabs_fab_demo.dart b/examples/flutter_gallery/lib/demo/tabs_fab_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/tabs_fab_demo.dart
rename to examples/flutter_gallery/lib/demo/tabs_fab_demo.dart
diff --git a/examples/material_gallery/lib/demo/text_field_demo.dart b/examples/flutter_gallery/lib/demo/text_field_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/text_field_demo.dart
rename to examples/flutter_gallery/lib/demo/text_field_demo.dart
diff --git a/examples/material_gallery/lib/demo/time_picker_demo.dart b/examples/flutter_gallery/lib/demo/time_picker_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/time_picker_demo.dart
rename to examples/flutter_gallery/lib/demo/time_picker_demo.dart
diff --git a/examples/material_gallery/lib/demo/tooltip_demo.dart b/examples/flutter_gallery/lib/demo/tooltip_demo.dart
similarity index 95%
rename from examples/material_gallery/lib/demo/tooltip_demo.dart
rename to examples/flutter_gallery/lib/demo/tooltip_demo.dart
index 8151864..b9b41cb 100644
--- a/examples/material_gallery/lib/demo/tooltip_demo.dart
+++ b/examples/flutter_gallery/lib/demo/tooltip_demo.dart
@@ -11,14 +11,14 @@
 
 class TooltipDemo extends StatelessWidget {
 
-  static const String routeName = '/tooltip';
+  static const String routeName = '/tooltips';
 
   @override
   Widget build(BuildContext context) {
     final ThemeData theme = Theme.of(context);
     return new Scaffold(
       appBar: new AppBar(
-        title: new Text('Tooltip')
+        title: new Text('Tooltips')
       ),
       body: new Builder(
         builder: (BuildContext context) {
diff --git a/examples/material_gallery/lib/demo/two_level_list_demo.dart b/examples/flutter_gallery/lib/demo/two_level_list_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/two_level_list_demo.dart
rename to examples/flutter_gallery/lib/demo/two_level_list_demo.dart
diff --git a/examples/material_gallery/lib/demo/typography_demo.dart b/examples/flutter_gallery/lib/demo/typography_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/typography_demo.dart
rename to examples/flutter_gallery/lib/demo/typography_demo.dart
diff --git a/examples/material_gallery/lib/demo/weather_demo.dart b/examples/flutter_gallery/lib/demo/weather_demo.dart
similarity index 100%
rename from examples/material_gallery/lib/demo/weather_demo.dart
rename to examples/flutter_gallery/lib/demo/weather_demo.dart
diff --git a/examples/material_gallery/lib/gallery/app.dart b/examples/flutter_gallery/lib/gallery/app.dart
similarity index 98%
rename from examples/material_gallery/lib/gallery/app.dart
rename to examples/flutter_gallery/lib/gallery/app.dart
index 0fb4dac..10b8758 100644
--- a/examples/material_gallery/lib/gallery/app.dart
+++ b/examples/flutter_gallery/lib/gallery/app.dart
@@ -68,7 +68,7 @@
   @override
   Widget build(BuildContext context) {
     return new MaterialApp(
-      title: 'Flutter Material Gallery',
+      title: 'Flutter Gallery',
       theme: _useLightTheme ? _kGalleryLightTheme : _kGalleryDarkTheme,
       showPerformanceOverlay: _showPerformanceOverlay,
       routes: kRoutes,
diff --git a/examples/material_gallery/lib/gallery/demo.dart b/examples/flutter_gallery/lib/gallery/demo.dart
similarity index 99%
rename from examples/material_gallery/lib/gallery/demo.dart
rename to examples/flutter_gallery/lib/gallery/demo.dart
index b619910..5ce8e0f 100644
--- a/examples/material_gallery/lib/gallery/demo.dart
+++ b/examples/flutter_gallery/lib/gallery/demo.dart
@@ -270,7 +270,7 @@
           icon: Icons.clear,
           onPressed: () { Navigator.pop(context); }
         ),
-        title: new Text('Example Code')
+        title: new Text('Example code')
       ),
       body: body
     );
diff --git a/examples/material_gallery/lib/gallery/drawer.dart b/examples/flutter_gallery/lib/gallery/drawer.dart
similarity index 97%
rename from examples/material_gallery/lib/gallery/drawer.dart
rename to examples/flutter_gallery/lib/gallery/drawer.dart
index 8b99e38..a5acc12 100644
--- a/examples/material_gallery/lib/gallery/drawer.dart
+++ b/examples/flutter_gallery/lib/gallery/drawer.dart
@@ -32,7 +32,7 @@
     return new Drawer(
       child: new Block(
         children: <Widget>[
-          new DrawerHeader(child: new Text('Flutter Gallery')),
+          new DrawerHeader(child: new Text('Flutter gallery')),
           new DrawerItem(
             icon: Icons.brightness_5,
             onPressed: () { onThemeChanged(true); },
diff --git a/examples/material_gallery/lib/gallery/example_code.dart b/examples/flutter_gallery/lib/gallery/example_code.dart
similarity index 100%
rename from examples/material_gallery/lib/gallery/example_code.dart
rename to examples/flutter_gallery/lib/gallery/example_code.dart
diff --git a/examples/material_gallery/lib/gallery/example_code_parser.dart b/examples/flutter_gallery/lib/gallery/example_code_parser.dart
similarity index 100%
rename from examples/material_gallery/lib/gallery/example_code_parser.dart
rename to examples/flutter_gallery/lib/gallery/example_code_parser.dart
diff --git a/examples/material_gallery/lib/gallery/header.dart b/examples/flutter_gallery/lib/gallery/header.dart
similarity index 100%
rename from examples/material_gallery/lib/gallery/header.dart
rename to examples/flutter_gallery/lib/gallery/header.dart
diff --git a/examples/material_gallery/lib/gallery/home.dart b/examples/flutter_gallery/lib/gallery/home.dart
similarity index 100%
rename from examples/material_gallery/lib/gallery/home.dart
rename to examples/flutter_gallery/lib/gallery/home.dart
diff --git a/examples/material_gallery/lib/gallery/item.dart b/examples/flutter_gallery/lib/gallery/item.dart
similarity index 100%
rename from examples/material_gallery/lib/gallery/item.dart
rename to examples/flutter_gallery/lib/gallery/item.dart
diff --git a/examples/material_gallery/lib/gallery/syntax_highlighter.dart b/examples/flutter_gallery/lib/gallery/syntax_highlighter.dart
similarity index 100%
rename from examples/material_gallery/lib/gallery/syntax_highlighter.dart
rename to examples/flutter_gallery/lib/gallery/syntax_highlighter.dart
diff --git a/examples/material_gallery/lib/main.dart b/examples/flutter_gallery/lib/main.dart
similarity index 100%
rename from examples/material_gallery/lib/main.dart
rename to examples/flutter_gallery/lib/main.dart
diff --git a/examples/material_gallery/.gitignore b/examples/flutter_gallery/material_gallery/.gitignore
similarity index 100%
copy from examples/material_gallery/.gitignore
copy to examples/flutter_gallery/material_gallery/.gitignore
diff --git a/examples/material_gallery/README.md b/examples/flutter_gallery/material_gallery/README.md
similarity index 80%
copy from examples/material_gallery/README.md
copy to examples/flutter_gallery/material_gallery/README.md
index bb62601..0d13d4d 100644
--- a/examples/material_gallery/README.md
+++ b/examples/flutter_gallery/material_gallery/README.md
@@ -1,6 +1,6 @@
-# Flutter Material Gallery
+# Flutter gallery
 
-Demo app for the Material Design widgets implemented in Flutter.
+Demo app for the Material Design widgets and other features provided by Flutter.
 
 ## Icon
 
diff --git a/examples/material_gallery/android/AndroidManifest.xml b/examples/flutter_gallery/material_gallery/android/AndroidManifest.xml
similarity index 93%
rename from examples/material_gallery/android/AndroidManifest.xml
rename to examples/flutter_gallery/material_gallery/android/AndroidManifest.xml
index 3e7f58d..b76c2b4 100644
--- a/examples/material_gallery/android/AndroidManifest.xml
+++ b/examples/flutter_gallery/material_gallery/android/AndroidManifest.xml
@@ -8,7 +8,7 @@
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application android:icon="@mipmap/ic_launcher" android:label="Flutter Material" android:name="org.domokit.sky.shell.SkyApplication">
+    <application android:icon="@mipmap/ic_launcher" android:label="Flutter gallery" android:name="org.domokit.sky.shell.SkyApplication">
         <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize" android:hardwareAccelerated="true" android:launchMode="singleTop" android:name="org.domokit.sky.shell.SkyActivity" android:theme="@android:style/Theme.Black.NoTitleBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/examples/material_gallery/android/res/mipmap-hdpi/ic_launcher.png b/examples/flutter_gallery/material_gallery/android/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
copy from examples/material_gallery/android/res/mipmap-hdpi/ic_launcher.png
copy to examples/flutter_gallery/material_gallery/android/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/examples/material_gallery/android/res/mipmap-mdpi/ic_launcher.png b/examples/flutter_gallery/material_gallery/android/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
copy from examples/material_gallery/android/res/mipmap-mdpi/ic_launcher.png
copy to examples/flutter_gallery/material_gallery/android/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/examples/material_gallery/android/res/mipmap-xhdpi/ic_launcher.png b/examples/flutter_gallery/material_gallery/android/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
copy from examples/material_gallery/android/res/mipmap-xhdpi/ic_launcher.png
copy to examples/flutter_gallery/material_gallery/android/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/examples/material_gallery/android/res/mipmap-xxhdpi/ic_launcher.png b/examples/flutter_gallery/material_gallery/android/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
copy from examples/material_gallery/android/res/mipmap-xxhdpi/ic_launcher.png
copy to examples/flutter_gallery/material_gallery/android/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/examples/material_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png b/examples/flutter_gallery/material_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
copy from examples/material_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png
copy to examples/flutter_gallery/material_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/examples/material_gallery/assets/flutter_logo.png b/examples/flutter_gallery/material_gallery/assets/flutter_logo.png
similarity index 100%
copy from examples/material_gallery/assets/flutter_logo.png
copy to examples/flutter_gallery/material_gallery/assets/flutter_logo.png
Binary files differ
diff --git a/examples/material_gallery/assets/section_animation.png b/examples/flutter_gallery/material_gallery/assets/section_animation.png
similarity index 100%
copy from examples/material_gallery/assets/section_animation.png
copy to examples/flutter_gallery/material_gallery/assets/section_animation.png
Binary files differ
diff --git a/examples/material_gallery/assets/section_components.png b/examples/flutter_gallery/material_gallery/assets/section_components.png
similarity index 100%
copy from examples/material_gallery/assets/section_components.png
copy to examples/flutter_gallery/material_gallery/assets/section_components.png
Binary files differ
diff --git a/examples/material_gallery/assets/section_layout.png b/examples/flutter_gallery/material_gallery/assets/section_layout.png
similarity index 100%
copy from examples/material_gallery/assets/section_layout.png
copy to examples/flutter_gallery/material_gallery/assets/section_layout.png
Binary files differ
diff --git a/examples/material_gallery/assets/section_patterns.png b/examples/flutter_gallery/material_gallery/assets/section_patterns.png
similarity index 100%
copy from examples/material_gallery/assets/section_patterns.png
copy to examples/flutter_gallery/material_gallery/assets/section_patterns.png
Binary files differ
diff --git a/examples/material_gallery/assets/section_style.png b/examples/flutter_gallery/material_gallery/assets/section_style.png
similarity index 100%
copy from examples/material_gallery/assets/section_style.png
copy to examples/flutter_gallery/material_gallery/assets/section_style.png
Binary files differ
diff --git a/examples/material_gallery/assets/section_usability.png b/examples/flutter_gallery/material_gallery/assets/section_usability.png
similarity index 100%
copy from examples/material_gallery/assets/section_usability.png
copy to examples/flutter_gallery/material_gallery/assets/section_usability.png
Binary files differ
diff --git a/examples/material_gallery/flutter.yaml b/examples/flutter_gallery/material_gallery/flutter.yaml
similarity index 98%
copy from examples/material_gallery/flutter.yaml
copy to examples/flutter_gallery/material_gallery/flutter.yaml
index 9639d3b..7a2ca11 100644
--- a/examples/material_gallery/flutter.yaml
+++ b/examples/flutter_gallery/material_gallery/flutter.yaml
@@ -1,4 +1,4 @@
-name: material_gallery
+name: flutter_gallery
 uses-material-design: true
 assets:
   - assets/flutter_logo.png
diff --git a/examples/material_gallery/ios/.gitignore b/examples/flutter_gallery/material_gallery/ios/.gitignore
similarity index 100%
copy from examples/material_gallery/ios/.gitignore
copy to examples/flutter_gallery/material_gallery/ios/.gitignore
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512.png
Binary files differ
diff --git a/examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
similarity index 100%
copy from examples/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
copy to examples/flutter_gallery/material_gallery/ios/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
Binary files differ
diff --git a/examples/material_gallery/ios/Info.plist b/examples/flutter_gallery/material_gallery/ios/Info.plist
similarity index 97%
copy from examples/material_gallery/ios/Info.plist
copy to examples/flutter_gallery/material_gallery/ios/Info.plist
index 6934157..c89ab01 100644
--- a/examples/material_gallery/ios/Info.plist
+++ b/examples/flutter_gallery/material_gallery/ios/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Material Gallery</string>
+	<string>Flutter gallery</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/examples/material_gallery/ios/LaunchScreen.storyboard b/examples/flutter_gallery/material_gallery/ios/LaunchScreen.storyboard
similarity index 100%
copy from examples/material_gallery/ios/LaunchScreen.storyboard
copy to examples/flutter_gallery/material_gallery/ios/LaunchScreen.storyboard
diff --git a/examples/material_gallery/lib/demo/all.dart b/examples/flutter_gallery/material_gallery/lib/demo/all.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/all.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/all.dart
diff --git a/examples/material_gallery/lib/demo/buttons_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/buttons_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/buttons_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/buttons_demo.dart
diff --git a/examples/material_gallery/lib/demo/cards_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/cards_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/cards_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/cards_demo.dart
diff --git a/examples/material_gallery/lib/demo/chip_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/chip_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/chip_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/chip_demo.dart
diff --git a/examples/material_gallery/lib/demo/colors_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/colors_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/colors_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/colors_demo.dart
diff --git a/examples/material_gallery/lib/demo/data_table_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/data_table_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/data_table_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/data_table_demo.dart
diff --git a/examples/material_gallery/lib/demo/date_picker_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/date_picker_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/date_picker_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/date_picker_demo.dart
diff --git a/examples/material_gallery/lib/demo/dialog_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/dialog_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/dialog_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/dialog_demo.dart
diff --git a/examples/material_gallery/lib/demo/drawing_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/drawing_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/drawing_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/drawing_demo.dart
diff --git a/examples/material_gallery/lib/demo/drop_down_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/drop_down_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/drop_down_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/drop_down_demo.dart
diff --git a/examples/material_gallery/lib/demo/fitness_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/fitness_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/fitness_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/fitness_demo.dart
diff --git a/examples/material_gallery/lib/demo/flexible_space_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/flexible_space_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/flexible_space_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/flexible_space_demo.dart
diff --git a/examples/material_gallery/lib/demo/full_screen_dialog_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/full_screen_dialog_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/full_screen_dialog_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/full_screen_dialog_demo.dart
diff --git a/examples/material_gallery/lib/demo/grid_list_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/grid_list_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/grid_list_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/grid_list_demo.dart
diff --git a/examples/material_gallery/lib/demo/icons_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/icons_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/icons_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/icons_demo.dart
diff --git a/examples/material_gallery/lib/demo/leave_behind_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/leave_behind_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/leave_behind_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/leave_behind_demo.dart
diff --git a/examples/material_gallery/lib/demo/list_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/list_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/list_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/list_demo.dart
diff --git a/examples/material_gallery/lib/demo/menu_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/menu_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/menu_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/menu_demo.dart
diff --git a/examples/material_gallery/lib/demo/modal_bottom_sheet_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/modal_bottom_sheet_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/modal_bottom_sheet_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/modal_bottom_sheet_demo.dart
diff --git a/examples/material_gallery/lib/demo/overscroll_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/overscroll_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/overscroll_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/overscroll_demo.dart
diff --git a/examples/material_gallery/lib/demo/page_selector_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/page_selector_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/page_selector_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/page_selector_demo.dart
diff --git a/examples/material_gallery/lib/demo/persistent_bottom_sheet_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/persistent_bottom_sheet_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/persistent_bottom_sheet_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/persistent_bottom_sheet_demo.dart
diff --git a/examples/material_gallery/lib/demo/progress_indicator_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/progress_indicator_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/progress_indicator_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/progress_indicator_demo.dart
diff --git a/examples/material_gallery/lib/demo/scrollable_tabs_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/scrollable_tabs_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/scrollable_tabs_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/scrollable_tabs_demo.dart
diff --git a/examples/material_gallery/lib/demo/scrolling_techniques_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/scrolling_techniques_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/scrolling_techniques_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/scrolling_techniques_demo.dart
diff --git a/examples/material_gallery/lib/demo/selection_controls_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/selection_controls_demo.dart
similarity index 98%
copy from examples/material_gallery/lib/demo/selection_controls_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/selection_controls_demo.dart
index 69936fd..29213d7 100644
--- a/examples/material_gallery/lib/demo/selection_controls_demo.dart
+++ b/examples/flutter_gallery/material_gallery/lib/demo/selection_controls_demo.dart
@@ -60,7 +60,7 @@
     ];
 
     return new TabbedComponentDemoScaffold(
-      title: 'Selection Controls',
+      title: 'Selection controls',
       demos: demos
     );
   }
diff --git a/examples/material_gallery/lib/demo/slider_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/slider_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/slider_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/slider_demo.dart
diff --git a/examples/material_gallery/lib/demo/snack_bar_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/snack_bar_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/snack_bar_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/snack_bar_demo.dart
diff --git a/examples/material_gallery/lib/demo/tabs_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/tabs_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/tabs_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/tabs_demo.dart
diff --git a/examples/material_gallery/lib/demo/tabs_fab_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/tabs_fab_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/tabs_fab_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/tabs_fab_demo.dart
diff --git a/examples/material_gallery/lib/demo/text_field_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/text_field_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/text_field_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/text_field_demo.dart
diff --git a/examples/material_gallery/lib/demo/time_picker_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/time_picker_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/time_picker_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/time_picker_demo.dart
diff --git a/examples/material_gallery/lib/demo/tooltip_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/tooltip_demo.dart
similarity index 95%
copy from examples/material_gallery/lib/demo/tooltip_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/tooltip_demo.dart
index 8151864..b9b41cb 100644
--- a/examples/material_gallery/lib/demo/tooltip_demo.dart
+++ b/examples/flutter_gallery/material_gallery/lib/demo/tooltip_demo.dart
@@ -11,14 +11,14 @@
 
 class TooltipDemo extends StatelessWidget {
 
-  static const String routeName = '/tooltip';
+  static const String routeName = '/tooltips';
 
   @override
   Widget build(BuildContext context) {
     final ThemeData theme = Theme.of(context);
     return new Scaffold(
       appBar: new AppBar(
-        title: new Text('Tooltip')
+        title: new Text('Tooltips')
       ),
       body: new Builder(
         builder: (BuildContext context) {
diff --git a/examples/material_gallery/lib/demo/two_level_list_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/two_level_list_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/two_level_list_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/two_level_list_demo.dart
diff --git a/examples/material_gallery/lib/demo/typography_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/typography_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/typography_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/typography_demo.dart
diff --git a/examples/material_gallery/lib/demo/weather_demo.dart b/examples/flutter_gallery/material_gallery/lib/demo/weather_demo.dart
similarity index 100%
copy from examples/material_gallery/lib/demo/weather_demo.dart
copy to examples/flutter_gallery/material_gallery/lib/demo/weather_demo.dart
diff --git a/examples/material_gallery/lib/gallery/app.dart b/examples/flutter_gallery/material_gallery/lib/gallery/app.dart
similarity index 98%
copy from examples/material_gallery/lib/gallery/app.dart
copy to examples/flutter_gallery/material_gallery/lib/gallery/app.dart
index 0fb4dac..10b8758 100644
--- a/examples/material_gallery/lib/gallery/app.dart
+++ b/examples/flutter_gallery/material_gallery/lib/gallery/app.dart
@@ -68,7 +68,7 @@
   @override
   Widget build(BuildContext context) {
     return new MaterialApp(
-      title: 'Flutter Material Gallery',
+      title: 'Flutter Gallery',
       theme: _useLightTheme ? _kGalleryLightTheme : _kGalleryDarkTheme,
       showPerformanceOverlay: _showPerformanceOverlay,
       routes: kRoutes,
diff --git a/examples/material_gallery/lib/gallery/demo.dart b/examples/flutter_gallery/material_gallery/lib/gallery/demo.dart
similarity index 99%
copy from examples/material_gallery/lib/gallery/demo.dart
copy to examples/flutter_gallery/material_gallery/lib/gallery/demo.dart
index b619910..5ce8e0f 100644
--- a/examples/material_gallery/lib/gallery/demo.dart
+++ b/examples/flutter_gallery/material_gallery/lib/gallery/demo.dart
@@ -270,7 +270,7 @@
           icon: Icons.clear,
           onPressed: () { Navigator.pop(context); }
         ),
-        title: new Text('Example Code')
+        title: new Text('Example code')
       ),
       body: body
     );
diff --git a/examples/material_gallery/lib/gallery/drawer.dart b/examples/flutter_gallery/material_gallery/lib/gallery/drawer.dart
similarity index 97%
copy from examples/material_gallery/lib/gallery/drawer.dart
copy to examples/flutter_gallery/material_gallery/lib/gallery/drawer.dart
index 8b99e38..a5acc12 100644
--- a/examples/material_gallery/lib/gallery/drawer.dart
+++ b/examples/flutter_gallery/material_gallery/lib/gallery/drawer.dart
@@ -32,7 +32,7 @@
     return new Drawer(
       child: new Block(
         children: <Widget>[
-          new DrawerHeader(child: new Text('Flutter Gallery')),
+          new DrawerHeader(child: new Text('Flutter gallery')),
           new DrawerItem(
             icon: Icons.brightness_5,
             onPressed: () { onThemeChanged(true); },
diff --git a/examples/material_gallery/lib/gallery/example_code.dart b/examples/flutter_gallery/material_gallery/lib/gallery/example_code.dart
similarity index 100%
copy from examples/material_gallery/lib/gallery/example_code.dart
copy to examples/flutter_gallery/material_gallery/lib/gallery/example_code.dart
diff --git a/examples/material_gallery/lib/gallery/example_code_parser.dart b/examples/flutter_gallery/material_gallery/lib/gallery/example_code_parser.dart
similarity index 100%
copy from examples/material_gallery/lib/gallery/example_code_parser.dart
copy to examples/flutter_gallery/material_gallery/lib/gallery/example_code_parser.dart
diff --git a/examples/material_gallery/lib/gallery/header.dart b/examples/flutter_gallery/material_gallery/lib/gallery/header.dart
similarity index 100%
copy from examples/material_gallery/lib/gallery/header.dart
copy to examples/flutter_gallery/material_gallery/lib/gallery/header.dart
diff --git a/examples/material_gallery/lib/gallery/home.dart b/examples/flutter_gallery/material_gallery/lib/gallery/home.dart
similarity index 100%
copy from examples/material_gallery/lib/gallery/home.dart
copy to examples/flutter_gallery/material_gallery/lib/gallery/home.dart
diff --git a/examples/material_gallery/lib/gallery/item.dart b/examples/flutter_gallery/material_gallery/lib/gallery/item.dart
similarity index 100%
copy from examples/material_gallery/lib/gallery/item.dart
copy to examples/flutter_gallery/material_gallery/lib/gallery/item.dart
diff --git a/examples/material_gallery/lib/gallery/syntax_highlighter.dart b/examples/flutter_gallery/material_gallery/lib/gallery/syntax_highlighter.dart
similarity index 100%
copy from examples/material_gallery/lib/gallery/syntax_highlighter.dart
copy to examples/flutter_gallery/material_gallery/lib/gallery/syntax_highlighter.dart
diff --git a/examples/material_gallery/lib/main.dart b/examples/flutter_gallery/material_gallery/lib/main.dart
similarity index 100%
copy from examples/material_gallery/lib/main.dart
copy to examples/flutter_gallery/material_gallery/lib/main.dart
diff --git a/examples/material_gallery/pubspec.yaml b/examples/flutter_gallery/material_gallery/pubspec.yaml
similarity index 95%
rename from examples/material_gallery/pubspec.yaml
rename to examples/flutter_gallery/material_gallery/pubspec.yaml
index dc9e63e..5756ac4 100644
--- a/examples/material_gallery/pubspec.yaml
+++ b/examples/flutter_gallery/material_gallery/pubspec.yaml
@@ -1,4 +1,4 @@
-name: material_gallery
+name: flutter_gallery
 dependencies:
   intl: '>=0.12.4+2 <0.13.0'
   collection: '>=1.4.0 <2.0.0'
diff --git a/examples/material_gallery/test/example_code_parser_test.dart b/examples/flutter_gallery/material_gallery/test/example_code_parser_test.dart
similarity index 89%
rename from examples/material_gallery/test/example_code_parser_test.dart
rename to examples/flutter_gallery/material_gallery/test/example_code_parser_test.dart
index ffe5d25..ca4b757 100644
--- a/examples/material_gallery/test/example_code_parser_test.dart
+++ b/examples/flutter_gallery/material_gallery/test/example_code_parser_test.dart
@@ -5,12 +5,12 @@
 import 'dart:async';
 
 import 'package:flutter/services.dart';
-import 'package:material_gallery/gallery/example_code_parser.dart';
+import 'package:flutter_gallery/gallery/example_code_parser.dart';
 import 'package:mojo/core.dart' as core;
 import 'package:test/test.dart';
 
 void main() {
-  test('Material Gallery example code parser test', () async {
+  test('Flutter gallery example code parser test', () async {
     TestAssetBundle bundle = new TestAssetBundle();
 
     String codeSnippet0 = await getExampleCode('test_0', bundle);
diff --git a/examples/material_gallery/test/smoke_test.dart b/examples/flutter_gallery/material_gallery/test/smoke_test.dart
similarity index 86%
rename from examples/material_gallery/test/smoke_test.dart
rename to examples/flutter_gallery/material_gallery/test/smoke_test.dart
index d2ab42e..f8f398f 100644
--- a/examples/material_gallery/test/smoke_test.dart
+++ b/examples/flutter_gallery/material_gallery/test/smoke_test.dart
@@ -4,9 +4,9 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:material_gallery/gallery/app.dart' as material_gallery_app;
-import 'package:material_gallery/gallery/item.dart' as material_gallery_item;
-import 'package:material_gallery/main.dart' as material_gallery_main;
+import 'package:flutter_gallery/gallery/app.dart' as flutter_gallery_app;
+import 'package:flutter_gallery/gallery/item.dart' as flutter_gallery_item;
+import 'package:flutter_gallery/main.dart' as flutter_gallery_main;
 import 'package:test/test.dart';
 
 // Warning: the following strings must be kept in sync with GalleryHome.
@@ -14,7 +14,7 @@
 
 Finder findGalleryItemByRouteName(WidgetTester tester, String routeName) {
   return find.byWidgetPredicate((Widget widget) {
-    return widget is material_gallery_item.GalleryItem
+    return widget is flutter_gallery_item.GalleryItem
         && widget.routeName == routeName;
   });
 }
@@ -50,8 +50,8 @@
 }
 
 void main() {
-  testWidgets('Material Gallery app smoke test', (WidgetTester tester) {
-    material_gallery_main.main(); // builds the app and schedules a frame but doesn't trigger one
+  testWidgets('Flutter gallery app smoke test', (WidgetTester tester) {
+    flutter_gallery_main.main(); // builds the app and schedules a frame but doesn't trigger one
     tester.pump(); // see https://github.com/flutter/flutter/issues/1865
     tester.pump(); // triggers a frame
 
@@ -64,7 +64,7 @@
 
     final List<double> scrollDeltas = new List<double>();
     double previousY = tester.getTopRight(find.text(demoCategories[0])).y;
-    final List<String> routeNames = material_gallery_app.kRoutes.keys.toList();
+    final List<String> routeNames = flutter_gallery_app.kRoutes.keys.toList();
     for (String routeName in routeNames) {
       final double y = tester.getTopRight(findGalleryItemByRouteName(tester, routeName)).y;
       scrollDeltas.add(previousY - y);
diff --git a/examples/material_gallery/test_driver/scroll_perf.dart b/examples/flutter_gallery/material_gallery/test_driver/scroll_perf.dart
similarity index 84%
rename from examples/material_gallery/test_driver/scroll_perf.dart
rename to examples/flutter_gallery/material_gallery/test_driver/scroll_perf.dart
index 1b0b033..c0010d0 100644
--- a/examples/material_gallery/test_driver/scroll_perf.dart
+++ b/examples/flutter_gallery/material_gallery/test_driver/scroll_perf.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter_driver/driver_extension.dart';
-import 'package:material_gallery/main.dart' as app;
+import 'package:flutter_gallery/main.dart' as app;
 
 void main() {
   enableFlutterDriverExtension();
diff --git a/examples/material_gallery/test_driver/scroll_perf_test.dart b/examples/flutter_gallery/material_gallery/test_driver/scroll_perf_test.dart
similarity index 100%
copy from examples/material_gallery/test_driver/scroll_perf_test.dart
copy to examples/flutter_gallery/material_gallery/test_driver/scroll_perf_test.dart
diff --git a/examples/material_gallery/test_driver/scroll_perf.dart b/examples/flutter_gallery/material_gallery/test_driver/transitions_perf.dart
similarity index 84%
copy from examples/material_gallery/test_driver/scroll_perf.dart
copy to examples/flutter_gallery/material_gallery/test_driver/transitions_perf.dart
index 1b0b033..c0010d0 100644
--- a/examples/material_gallery/test_driver/scroll_perf.dart
+++ b/examples/flutter_gallery/material_gallery/test_driver/transitions_perf.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter_driver/driver_extension.dart';
-import 'package:material_gallery/main.dart' as app;
+import 'package:flutter_gallery/main.dart' as app;
 
 void main() {
   enableFlutterDriverExtension();
diff --git a/examples/material_gallery/test_driver/transitions_perf_test.dart b/examples/flutter_gallery/material_gallery/test_driver/transitions_perf_test.dart
similarity index 100%
copy from examples/material_gallery/test_driver/transitions_perf_test.dart
copy to examples/flutter_gallery/material_gallery/test_driver/transitions_perf_test.dart
diff --git a/examples/material_gallery/pubspec.yaml b/examples/flutter_gallery/pubspec.yaml
similarity index 95%
copy from examples/material_gallery/pubspec.yaml
copy to examples/flutter_gallery/pubspec.yaml
index dc9e63e..5756ac4 100644
--- a/examples/material_gallery/pubspec.yaml
+++ b/examples/flutter_gallery/pubspec.yaml
@@ -1,4 +1,4 @@
-name: material_gallery
+name: flutter_gallery
 dependencies:
   intl: '>=0.12.4+2 <0.13.0'
   collection: '>=1.4.0 <2.0.0'
diff --git a/examples/material_gallery/test/example_code_parser_test.dart b/examples/flutter_gallery/test/example_code_parser_test.dart
similarity index 89%
copy from examples/material_gallery/test/example_code_parser_test.dart
copy to examples/flutter_gallery/test/example_code_parser_test.dart
index ffe5d25..ca4b757 100644
--- a/examples/material_gallery/test/example_code_parser_test.dart
+++ b/examples/flutter_gallery/test/example_code_parser_test.dart
@@ -5,12 +5,12 @@
 import 'dart:async';
 
 import 'package:flutter/services.dart';
-import 'package:material_gallery/gallery/example_code_parser.dart';
+import 'package:flutter_gallery/gallery/example_code_parser.dart';
 import 'package:mojo/core.dart' as core;
 import 'package:test/test.dart';
 
 void main() {
-  test('Material Gallery example code parser test', () async {
+  test('Flutter gallery example code parser test', () async {
     TestAssetBundle bundle = new TestAssetBundle();
 
     String codeSnippet0 = await getExampleCode('test_0', bundle);
diff --git a/examples/material_gallery/test/smoke_test.dart b/examples/flutter_gallery/test/smoke_test.dart
similarity index 86%
copy from examples/material_gallery/test/smoke_test.dart
copy to examples/flutter_gallery/test/smoke_test.dart
index d2ab42e..f8f398f 100644
--- a/examples/material_gallery/test/smoke_test.dart
+++ b/examples/flutter_gallery/test/smoke_test.dart
@@ -4,9 +4,9 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:material_gallery/gallery/app.dart' as material_gallery_app;
-import 'package:material_gallery/gallery/item.dart' as material_gallery_item;
-import 'package:material_gallery/main.dart' as material_gallery_main;
+import 'package:flutter_gallery/gallery/app.dart' as flutter_gallery_app;
+import 'package:flutter_gallery/gallery/item.dart' as flutter_gallery_item;
+import 'package:flutter_gallery/main.dart' as flutter_gallery_main;
 import 'package:test/test.dart';
 
 // Warning: the following strings must be kept in sync with GalleryHome.
@@ -14,7 +14,7 @@
 
 Finder findGalleryItemByRouteName(WidgetTester tester, String routeName) {
   return find.byWidgetPredicate((Widget widget) {
-    return widget is material_gallery_item.GalleryItem
+    return widget is flutter_gallery_item.GalleryItem
         && widget.routeName == routeName;
   });
 }
@@ -50,8 +50,8 @@
 }
 
 void main() {
-  testWidgets('Material Gallery app smoke test', (WidgetTester tester) {
-    material_gallery_main.main(); // builds the app and schedules a frame but doesn't trigger one
+  testWidgets('Flutter gallery app smoke test', (WidgetTester tester) {
+    flutter_gallery_main.main(); // builds the app and schedules a frame but doesn't trigger one
     tester.pump(); // see https://github.com/flutter/flutter/issues/1865
     tester.pump(); // triggers a frame
 
@@ -64,7 +64,7 @@
 
     final List<double> scrollDeltas = new List<double>();
     double previousY = tester.getTopRight(find.text(demoCategories[0])).y;
-    final List<String> routeNames = material_gallery_app.kRoutes.keys.toList();
+    final List<String> routeNames = flutter_gallery_app.kRoutes.keys.toList();
     for (String routeName in routeNames) {
       final double y = tester.getTopRight(findGalleryItemByRouteName(tester, routeName)).y;
       scrollDeltas.add(previousY - y);
diff --git a/examples/material_gallery/test_driver/scroll_perf.dart b/examples/flutter_gallery/test_driver/scroll_perf.dart
similarity index 84%
copy from examples/material_gallery/test_driver/scroll_perf.dart
copy to examples/flutter_gallery/test_driver/scroll_perf.dart
index 1b0b033..c0010d0 100644
--- a/examples/material_gallery/test_driver/scroll_perf.dart
+++ b/examples/flutter_gallery/test_driver/scroll_perf.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter_driver/driver_extension.dart';
-import 'package:material_gallery/main.dart' as app;
+import 'package:flutter_gallery/main.dart' as app;
 
 void main() {
   enableFlutterDriverExtension();
diff --git a/examples/material_gallery/test_driver/scroll_perf_test.dart b/examples/flutter_gallery/test_driver/scroll_perf_test.dart
similarity index 100%
rename from examples/material_gallery/test_driver/scroll_perf_test.dart
rename to examples/flutter_gallery/test_driver/scroll_perf_test.dart
diff --git a/examples/material_gallery/test_driver/scroll_perf.dart b/examples/flutter_gallery/test_driver/transitions_perf.dart
similarity index 84%
copy from examples/material_gallery/test_driver/scroll_perf.dart
copy to examples/flutter_gallery/test_driver/transitions_perf.dart
index 1b0b033..c0010d0 100644
--- a/examples/material_gallery/test_driver/scroll_perf.dart
+++ b/examples/flutter_gallery/test_driver/transitions_perf.dart
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter_driver/driver_extension.dart';
-import 'package:material_gallery/main.dart' as app;
+import 'package:flutter_gallery/main.dart' as app;
 
 void main() {
   enableFlutterDriverExtension();
diff --git a/examples/material_gallery/test_driver/transitions_perf_test.dart b/examples/flutter_gallery/test_driver/transitions_perf_test.dart
similarity index 100%
rename from examples/material_gallery/test_driver/transitions_perf_test.dart
rename to examples/flutter_gallery/test_driver/transitions_perf_test.dart
diff --git a/examples/material_gallery/test_driver/transitions_perf.dart b/examples/material_gallery/test_driver/transitions_perf.dart
deleted file mode 100644
index 1b0b033..0000000
--- a/examples/material_gallery/test_driver/transitions_perf.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:flutter_driver/driver_extension.dart';
-import 'package:material_gallery/main.dart' as app;
-
-void main() {
-  enableFlutterDriverExtension();
-  app.main();
-}