Consolodated geometry classes into a single Geometry class. This allows proper serialization.