Fixed hpp files and makefile