Restart the conversion process, handle subobjects first
Reorganize and rename some files