Moved ClientProxy back to main package.