moving client in other module, ref #4.