Move client_class to correct config