Add Geometry class
Had to rename directory geometry->geometries to prevent naming conflicts
on Win32 builds.