moved factory methods to converter classes
Merge branch 'Magda'