Merge pull request #138 from lifeart/patch-1

#135

guides/advanced-use/project-layouts.md

@@ -8,22 +8,24 @@ For example, if you have a `post` resource and a `tags` component in your projec
 ```shell
 app
 ├── components
-|   └── tags.js
+|   ├── tags.js
+|   └── tags.hbs
 ├── controllers
 |   └── post.js
 ├── models
 |   └── post.js
 ├── routes
 |   └── post.js
 ├── templates
-|   ├── components/tags.hbs
 |   └── post.hbs
-└── app.js
-└── index.html
-└── resolver.js
+├── app.js
+├── index.html
+├── resolver.js
 └── router.js
 ```
 
+Note: the default layout for non-Octane apps is to have component templates located at `app/templates/components/tags.hbs` instead of `app/components/tags.hbs` as shown above.
+
 The `classic` project provides the easiest way to get started with Ember. It's the easiest way to generate files using Ember CLI.  Addons __should only use__ the `classic` structure for compatibility with either `classic` or `pods-based` consuming applications.
 
 ## Pods layout
@@ -40,9 +42,9 @@ app
 |   ├── model.js
 |   ├── route.js
 |   └── template.hbs
-└── app.js
-└── index.html
-└── resolver.js
+├── app.js
+├── index.html
+├── resolver.js
 └── router.js
 ```
 
@@ -108,17 +110,3 @@ app
         ├── route.js
         └── template.hbs
 ```
-
-## Common questions
-
-I heard Ember is getting a new project or file structure?  Yes, there are proposed Ember changes that include a new project/file structure.  The new file system is most similar to pods, with its advantages but with better developer ergonomics like the `classic` filesystem. 
-
-The changes are more than a new filesystem and include improvements to module names, namespacing and the Ember Resolver.
-
-If changes are made to the file structure in the future, they will be accompanied with codemods and other tools to make the migrating your apps easier. The codemod would migrate `classic`, `pods-based` and `mixed` apps. 
-
-Developers who want to test drive the experimental layout should read [RFC 0143](https://github.com/emberjs/rfcs/blob/master/text/0143-module-unification.md) and [#16373](https://github.com/emberjs/ember.js/issues/16373). 
-
-In general, experimental features should be used with caution, as they are subject to breaking changes, significant iteration, and in some cases, they may be removed altogether.
-
-To follow along with the progress of new features in Ember, check out the Ember [Blog](https://www.emberjs.com/blog/).