Added headers dir, fixed header locations in makefile.