restructure client - WIP
simplify services names