edited makefile to include headers
reorganized, fixed makefile