some cleanup of packages and right before adding chat client
adding the chat Client