Revert "refactored to blocks POC"

This reverts commit 4282673a3c2ed09769d9a426acd4fffe10da5d0e.
Changed port