Moved the converter to its own class