Revert "Split converter into refactory and converter itself"

This reverts commit 93ee9d80c1b455d6afa0c7048506f0667c55ac52.