reworked Makefile, C++ headers now use .hpp extension