Changed header files from .h to .hpp