renamed Message.java to ConversationMessage.java to avoid terminology
confusion