Reorganized package, made graph toplevel
Reorganized package, made graph toplevel