Unify all clients under client/