Decided to use more "standard" hpp file extensions for headers