Renamed stuff to .hpp