Move request/response filter into own classes