Move finder logic into reusable module