Several refactored class and Delaunay Triangulation