Factory::autoConvertTo added, deleted old files