Renamed *.hpp to *.h