Continue refactoring server client message system and Shared Classes