xmpppy client module refactor