Fix archive structure