and stick headers into the solver in the same hierarchy as is "standard"
so we don't have to patch so much, similiarly rename to libz