Changed the header files from .h to .hpp