Moved header files to separate directory
Generalised makefile