Refactoring export/import. Prepare for encrypted ZIP