Refactored package Client to client