Added Makefile
Reorganized roles and node attributes