Refactor package adding archive