Move sql client to another module