Restructuring use of rabbit client.