Revert "882 Refactoring"

This reverts commit 09468a59d77421c8f1ea7a8bce1ee676f8625e75.