Moving node data structure into more meaningful class name
Fixing build of tools