Move FileFinder to separate file