Updated file names. Refactored relationship between XmppClient and XmppListener.