Move export to top for consistency
Move zip creation to bundle module