Path Filter and Refactor