finish the pharse III of message module refactor