.h headers renamed to .hpp for similar naming