Renamed .h files to .hpp