Really changed all .h to .hpp in Makefile now