Changed back to .hpp. I think it is better if I get used to separating cpp from c headers since I code in both.