File structure related tiny refactoring
Filter model