Fix generated indent and line breaks.
Generate factory interface and implementation in separate files. Move them into the interface/concrete class folders respectively.