Finder

Refactored file finder