Make unzipper more OO.
Needed to run travis, but not sufficient.