Defactor prim/sphere to geom/sphere.

For now it's simpler to just extend the types.