Suggest we use this way of organization instead

![image](https://cloud.githubusercontent.com/assets/426143/4246246/6059c104-3a47-11e4-84c0-8061036b62f3.png)