Restructure FileFinder