Another round of restructuring the graph module