Revert "try to fix"

This reverts commit ef946b39353da2ce6d9fec718b8912eb5dc0d2dd.
Revert "refactoring: architecture"

This reverts commit 446ad78703013030bc4ff20c5a0708278ba982f2.