Rename some of the Graphics libraries
Fix mistaken function name.
Move Geometry into Collage. Get rid of Graphics prefix as appropriate.