Split converter into refactory and converter itself