Refactoring Messages to ClientServerStructure