Reorganize packages
Change ellipse to ellipsoid