Updated headers from .h to .hpp