Update : header file location and Makefile