Renamed .hpp headers to .h
Merge commit '1d913744f49db2465e9cf29fa4fb61d7dc0b0f61'