fixed makefile and includes for reorganization