Move responders to their own class