Moved to geometry package