Moved filter's Predicate classes into separate files