Graph class reorg