Renamed some headers to use .hpp extension instead of .h