Revert "revert to orginal architecture"

This reverts commit 57680c75d4c124c4d828e64fb8f0d448591b6d44.