One more namespace change, cleanup some files.
Client.php renamed.