Fixes and structure

Breaking out some statics into ZipUtils, a few structural changes and
bug fixes.