Moving the graph stuff into a more appropriate package