Changed API's
Removed scratch files
Setup creation of nodes via builders