More node reorg (sorry about that)