[#82] Moved shapes to a geom package.