Reorganized some find_package stuff