Refactoring: move up request/response class.