Changed all .h files to .hpp