More packaging work; added a skeleton tools wrapper to allow for ZAP
presence (and compat)  before falling back to own impl.