More work on graphic

and yes, another package renaming