new architecture
Merge branch 'ft-NewArchitecture'