refactoring of the geometry library
rename primitive types
various updates