Merge "Refactor zip functions and state into Dumpstate class."