Implement private message
Fix sender issue
Clean-up
Fix broadcast message, removed unused message classes
Aldo's changes merged