Can we change to #include <catch2/catch.hpp>

I'm having "catch.hpp not found" error when I build from source on MacOS. I installed catch2 from brew and it's recommened to use `#include <catch2/catch.hpp>` instead. I end up replacing all `#include "catch.hpp"` with `#include <catch2/catch.hpp>` to build.