nodes: move some more nodes