Client classes move to separate package + ClietnContext