Architecture refactor

To be discussed...

![screens_architecture_refactor](https://cloud.githubusercontent.com/assets/219908/4435897/103efb6c-475d-11e4-91a4-cc6c5a8ca9c5.png)