diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_circle_segments/curves/test01.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/circle_segments/curves/test01.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_circle_segments/curves/test01.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/circle_segments/curves/test01.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_circle_segments/ops/test01.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/circle_segments/ops/test01.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_circle_segments/ops/test01.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/circle_segments/ops/test01.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_circle_segments/queries/test01.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/circle_segments/queries/test01.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_circle_segments/queries/test01.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/circle_segments/queries/test01.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/curves/test01.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/curves/test01.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/curves/test01.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/curves/test01.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/curves/test03.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/curves/test03.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/curves/test03.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/curves/test03.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/curves/test04.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/curves/test04.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/curves/test04.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/curves/test04.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/ops/test01.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/ops/test01.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/ops/test01.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/ops/test01.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/ops/test02.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/ops/test02.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/ops/test02.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/ops/test02.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/queries/test01.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/queries/test01.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/queries/test01.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/queries/test01.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/queries/test02.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/queries/test02.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/queries/test02.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/queries/test02.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/queries/test03.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/queries/test03.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/queries/test03.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/queries/test03.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/queries/test04.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/queries/test04.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/queries/test04.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/queries/test04.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/xcurves/test02.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/xcurves/test02.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_linear/xcurves/test02.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/linear/xcurves/test02.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/ops/test01.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/segments/ops/test01.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/ops/test01.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/segments/ops/test01.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/ops/test10.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/segments/ops/test10.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/ops/test10.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/segments/ops/test10.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/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_segments/queries/test09.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/segments/queries/test09.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test10.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/segments/queries/test10.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/queries/test10.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/segments/queries/test10.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/xcurves/test10.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/segments/xcurves/test10.txt
similarity index 100%
rename from Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location_segments/xcurves/test10.txt
rename to Arrangement_on_surface_2/test/Arrangement_on_surface_2/data/point_location/segments/xcurves/test10.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.circle_segments.cmd b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.circle_segments.cmd
index 747790e2376..6c7749cade2 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.circle_segments.cmd
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.circle_segments.cmd
@@ -1 +1 @@
-./data/empty.zero ./data/empty.zero ./data/point_location_circle_segments/curves/test01.txt ./data/point_location_circle_segments/queries/test01.txt
+./data/empty.zero ./data/empty.zero ./data/point_location/circle_segments/curves/test01.txt ./data/point_location/circle_segments/queries/test01.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.linear.cmd b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.linear.cmd
index fdbe9cf954a..46bbf16cecf 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.linear.cmd
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.linear.cmd
@@ -1,3 +1,3 @@
-./data/empty.zero ./data/empty.zero ./data/point_location_linear/curves/test01.txt ./data/point_location_linear/queries/test01.txt
-./data/empty.zero ./data/point_location_linear/xcurves/test02.txt ./data/empty.zero ./data/point_location_linear/queries/test02.txt
-./data/empty.zero ./data/empty.zero ./data/point_location_linear/curves/test03.txt ./data/point_location_linear/queries/test03.txt
+./data/empty.zero ./data/empty.zero ./data/point_location/linear/curves/test01.txt ./data/point_location/linear/queries/test01.txt
+./data/empty.zero ./data/point_location/linear/xcurves/test02.txt ./data/empty.zero ./data/point_location/linear/queries/test02.txt
+./data/empty.zero ./data/empty.zero ./data/point_location/linear/curves/test03.txt ./data/point_location/linear/queries/test03.txt
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.segments.cmd b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.segments.cmd
index 65cfde10e8a..6cd142c96a2 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.segments.cmd
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_point_location.segments.cmd
@@ -1,9 +1,9 @@
-./data/empty.zero ./data/empty.zero ./data/point_location_segments/curves/test01.txt ./data/point_location_segments/queries/test01.txt
-./data/empty.zero ./data/empty.zero ./data/point_location_segments/curves/test02.txt ./data/point_location_segments/queries/test02.txt
-./data/empty.zero ./data/empty.zero ./data/point_location_segments/curves/test03.txt ./data/point_location_segments/queries/test03.txt
-./data/empty.zero ./data/empty.zero ./data/point_location_segments/curves/test04.txt ./data/point_location_segments/queries/test04.txt
-./data/empty.zero ./data/empty.zero ./data/point_location_segments/curves/test05.txt ./data/point_location_segments/queries/test05.txt
-./data/empty.zero ./data/empty.zero ./data/point_location_segments/curves/test06.txt ./data/point_location_segments/queries/test06.txt
-./data/empty.zero ./data/empty.zero ./data/point_location_segments/curves/test07.txt ./data/point_location_segments/queries/test07.txt
-./data/empty.zero ./data/empty.zero ./data/point_location_segments/curves/test08.txt ./data/point_location_segments/queries/test08.txt
-./data/empty.zero ./data/empty.zero ./data/point_location_segments/curves/test09.txt ./data/point_location_segments/queries/test09.txt
+./data/empty.zero ./data/empty.zero ./data/point_location/segments/curves/test01.txt ./data/point_location/segments/queries/test01.txt
+./data/empty.zero ./data/empty.zero ./data/point_location/segments/curves/test02.txt ./data/point_location/segments/queries/test02.txt
+./data/empty.zero ./data/empty.zero ./data/point_location/segments/curves/test03.txt ./data/point_location/segments/queries/test03.txt
+./data/empty.zero ./data/empty.zero ./data/point_location/segments/curves/test04.txt ./data/point_location/segments/queries/test04.txt
+./data/empty.zero ./data/empty.zero ./data/point_location/segments/curves/test05.txt ./data/point_location/segments/queries/test05.txt
+./data/empty.zero ./data/empty.zero ./data/point_location/segments/curves/test06.txt ./data/point_location/segments/queries/test06.txt
+./data/empty.zero ./data/empty.zero ./data/point_location/segments/curves/test07.txt ./data/point_location/segments/queries/test07.txt
+./data/empty.zero ./data/empty.zero ./data/point_location/segments/curves/test08.txt ./data/point_location/segments/queries/test08.txt
+./data/empty.zero ./data/empty.zero ./data/point_location/segments/curves/test09.txt ./data/point_location/segments/queries/test09.txt