modified makefile to be able to work with nested directories
Added Token and Edge implementation