diff --git a/.idea/modules.xml b/.idea/modules.xml
index e1cd55b0c0..41697c5943 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,11 +5,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/examples/flutter_gallery/flutter_gallery.iml b/examples/flutter_gallery/.idea/flutter_gallery.iml
similarity index 93%
rename from examples/flutter_gallery/flutter_gallery.iml
rename to examples/flutter_gallery/.idea/flutter_gallery.iml
index 3e9be65925..702d05278f 100644
--- a/examples/flutter_gallery/flutter_gallery.iml
+++ b/examples/flutter_gallery/.idea/flutter_gallery.iml
@@ -3,6 +3,7 @@
+
diff --git a/examples/flutter_gallery/.idea/modules.xml b/examples/flutter_gallery/.idea/modules.xml
index 180cda925d..666a525523 100644
--- a/examples/flutter_gallery/.idea/modules.xml
+++ b/examples/flutter_gallery/.idea/modules.xml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/examples/hello_services/hello_services.iml b/examples/hello_services/.idea/hello_services.iml
similarity index 91%
rename from examples/hello_services/hello_services.iml
rename to examples/hello_services/.idea/hello_services.iml
index 6c95b1bc45..c4447024fe 100644
--- a/examples/hello_services/hello_services.iml
+++ b/examples/hello_services/.idea/hello_services.iml
@@ -3,6 +3,7 @@
+
diff --git a/examples/hello_services/.idea/modules.xml b/examples/hello_services/.idea/modules.xml
index cb7dabc417..328fb20245 100644
--- a/examples/hello_services/.idea/modules.xml
+++ b/examples/hello_services/.idea/modules.xml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/examples/hello_world/hello_world.iml b/examples/hello_world/.idea/hello_world.iml
similarity index 92%
rename from examples/hello_world/hello_world.iml
rename to examples/hello_world/.idea/hello_world.iml
index 93713a9949..a9c4f5568f 100644
--- a/examples/hello_world/hello_world.iml
+++ b/examples/hello_world/.idea/hello_world.iml
@@ -3,6 +3,7 @@
+
diff --git a/examples/hello_world/.idea/modules.xml b/examples/hello_world/.idea/modules.xml
index 6c4ef6201e..3e68d82ce5 100644
--- a/examples/hello_world/.idea/modules.xml
+++ b/examples/hello_world/.idea/modules.xml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/examples/hello_world/flutter.yaml b/examples/hello_world/flutter.yaml
new file mode 100644
index 0000000000..d668b442c3
--- /dev/null
+++ b/examples/hello_world/flutter.yaml
@@ -0,0 +1,2 @@
+name: hello_world
+uses-material-design: true
diff --git a/examples/layers/layers.iml b/examples/layers/.idea/layers.iml
similarity index 92%
rename from examples/layers/layers.iml
rename to examples/layers/.idea/layers.iml
index 93713a9949..a9c4f5568f 100644
--- a/examples/layers/layers.iml
+++ b/examples/layers/.idea/layers.iml
@@ -3,6 +3,7 @@
+
diff --git a/examples/layers/.idea/modules.xml b/examples/layers/.idea/modules.xml
index ec44738db8..f61dd524eb 100644
--- a/examples/layers/.idea/modules.xml
+++ b/examples/layers/.idea/modules.xml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/examples/stocks/.idea/modules.xml b/examples/stocks/.idea/modules.xml
index ac48f7b645..fb2ea5b2a5 100644
--- a/examples/stocks/.idea/modules.xml
+++ b/examples/stocks/.idea/modules.xml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/examples/stocks/stocks.iml b/examples/stocks/.idea/stocks.iml
similarity index 92%
rename from examples/stocks/stocks.iml
rename to examples/stocks/.idea/stocks.iml
index 93713a9949..a9c4f5568f 100644
--- a/examples/stocks/stocks.iml
+++ b/examples/stocks/.idea/stocks.iml
@@ -3,6 +3,7 @@
+
diff --git a/packages/flutter_tools/templates/create/.idea/modules.xml.tmpl b/packages/flutter_tools/templates/create/.idea/modules.xml.tmpl
index 7488ebe80d..d37e9c9e1a 100644
--- a/packages/flutter_tools/templates/create/.idea/modules.xml.tmpl
+++ b/packages/flutter_tools/templates/create/.idea/modules.xml.tmpl
@@ -2,7 +2,7 @@
-
+
diff --git a/packages/flutter_tools/templates/create/projectName.iml.tmpl b/packages/flutter_tools/templates/create/.idea/projectName.iml.tmpl
similarity index 91%
rename from packages/flutter_tools/templates/create/projectName.iml.tmpl
rename to packages/flutter_tools/templates/create/.idea/projectName.iml.tmpl
index 6c95b1bc45..c4447024fe 100644
--- a/packages/flutter_tools/templates/create/projectName.iml.tmpl
+++ b/packages/flutter_tools/templates/create/.idea/projectName.iml.tmpl
@@ -3,6 +3,7 @@
+
diff --git a/packages/flutter_tools/templates/create/.idea/workspace.xml.tmpl b/packages/flutter_tools/templates/create/.idea/workspace.xml.tmpl
index b6f518ba13..1e7e0cd929 100644
--- a/packages/flutter_tools/templates/create/.idea/workspace.xml.tmpl
+++ b/packages/flutter_tools/templates/create/.idea/workspace.xml.tmpl
@@ -19,4 +19,11 @@
+
+
+
+
+
+
+