refactoring most of the converter classes