some re org and cleanup in Converter.i and Converter_includes.i