libzyre not used in libxrap
Merged /model into /src