some refactoring (ca -> Geometry, mostly)