re-align architecture.MD with project
Merge pull request #358 from stefanpenner/updatee-arch

re-align architecture.MD with project
re-align architecture.MD with project
fixup UI related test failures