Fix ci.
Move client dependencies.
Change to extract class name.