Merged from upstream.
Renamed package geom -> geometry.
Removed Point classes from space package.
Point classes in geometry now implement the space.Point interface.
Space classes now refer to the Point classes in geometry.