Revert "Huge architecture improvements"

This reverts commit 0f45f3592483488a209b866ef72e269c6bc98047.