refactorization of archive/download stuff - fix #33