Organize Client and Chat in separate modules