Refactored voronoi packages