Renamed *.h to *.hpp