Refactored location of request / response handlers.