[archive] Refactor.