Geometry builder classes moved from base to sim.