Moved chzap to its own package.