Added callback for message consuming, moved client files