Reorganizing #7 (Reorganize Msg.java & R.java)