moved util to Client folder