Refactor files structure
Search filter