Couple dev dependencies
Refactoring Finder, adding search paths