more consistent archive structure