Refactor finders. Prevent circular dependency error

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>