Extract version finders out into new classes