Updated architecture
Merge branch 'master' of https://github.com/captain78/Estia