Fix archive layout