Move Handler to client.rb