Refactor .h -> .hpp