Refactor Server and Group
Update doc