Restructured Messenger.java