renamed some classes in geom toolkit
reorganized the geometry toolkit