Renamed some header files (.h -> .hpp)