archive.pl, make-installer.pl:  Refactor