Revert "interim changes during refactoring"
Revert "interim changes during refactoring"

This reverts commit de09b52c274069f13b72a0d934f1df0680f80f16.

spivachuk/sovrin-node,TechWritingWhiz/indy-node,TechWritingWhiz/indy-node,TechWritingWhiz/indy-node,spivachuk/sovrin-node,keenondrums/sovrin-node,spivachuk/sovrin-node,keenondrums/sovrin-node,spivachuk/sovrin-node,keenondrums/sovrin-node,TechWritingWhiz/indy-node