Changed header file names from .h to .hpp