Fix the converter organization