Revert "refactor of Storage and Executor"

This reverts commit 885d4f0f295d744bb711f8645a11320b357f5c09.