Update and rename matrix.hh to matrix.hpp