diff --git a/.gitattributes b/.gitattributes
index 7b868808f41..7a343f15fe6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -721,8 +721,8 @@ Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/linear/segments/spli
 Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/linear/segments/vertex -text
 Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/linear/segments/vertex.pt -text
 Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/linear/segments/xcurves -text
-Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test02.txt -text
-Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test02.txt -text
+Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test02.txt -text
+Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test02.txt -text
 Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/polylines/compare_y_at_x -text
 Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/polylines/compare_y_at_x.pt -text
 Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/polylines/compare_y_at_x.xcv -text
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test01.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test01.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test01.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test01.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test02.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test02.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test02.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test02.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test03.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test03.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test03.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test03.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test04.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test04.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test04.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test04.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test05.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test05.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test05.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test05.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test06.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test06.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test06.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test06.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test07.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test07.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test07.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test07.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test08.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test08.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test08.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test08.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test09.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test09.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/curves/test09.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/curves/test09.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test01.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test01.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test01.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test01.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test02.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test02.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test02.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test02.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test03.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test03.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test03.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test03.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test04.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test04.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test04.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test04.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test05.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test05.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test05.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test05.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test06.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test06.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test06.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test06.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test07.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test07.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test07.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test07.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test08.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test08.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test08.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test08.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test09.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test09.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/queries/test09.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test09.txt