esl-9282. Cleanup and move converter code to separate classes