Fixes to Makefile
Starting with graph builder class and graph definition