Rearranged nodes to make their relationships clearer.

Leo build: 20141007230747