Rename Message to Message.java