Some more code re-org in Find.hs