Completely removed the Clients path and files. Too much duplicated code and confusion between provider and client.