Modified h files to hpp files to better reflect that they are C++