move nodes to the node dir
Merge branch 'master' into jackie