diff --git a/.gitignore b/.gitignore
index 133e73e7fc1..6a58bd27485 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 Distance_2/web/lis
-Packages/Distance_3/include
+Distance_3/include
 Packages/Mesh_2/bench/bench
 Packages/Mesh_2/bench/semantic.cache
 Packages/Mesh_2/demo/Mesh_2/*.core
diff --git a/Packages/Distance_3/changes.txt b/Distance_3/changes.txt
similarity index 100%
rename from Packages/Distance_3/changes.txt
rename to Distance_3/changes.txt
diff --git a/Packages/Distance_3/description.txt b/Distance_3/description.txt
similarity index 100%
rename from Packages/Distance_3/description.txt
rename to Distance_3/description.txt
diff --git a/Packages/Distance_3/dont_submit b/Distance_3/dont_submit
similarity index 100%
rename from Packages/Distance_3/dont_submit
rename to Distance_3/dont_submit
diff --git a/Packages/Distance_3/include/CGAL/squared_distance_3.h b/Distance_3/include/CGAL/squared_distance_3.h
similarity index 100%
rename from Packages/Distance_3/include/CGAL/squared_distance_3.h
rename to Distance_3/include/CGAL/squared_distance_3.h
diff --git a/Packages/Distance_3/include/CGAL/squared_distance_3_0.h b/Distance_3/include/CGAL/squared_distance_3_0.h
similarity index 100%
rename from Packages/Distance_3/include/CGAL/squared_distance_3_0.h
rename to Distance_3/include/CGAL/squared_distance_3_0.h
diff --git a/Packages/Distance_3/include/CGAL/squared_distance_3_1.h b/Distance_3/include/CGAL/squared_distance_3_1.h
similarity index 100%
rename from Packages/Distance_3/include/CGAL/squared_distance_3_1.h
rename to Distance_3/include/CGAL/squared_distance_3_1.h
diff --git a/Packages/Distance_3/include/CGAL/squared_distance_3_2.h b/Distance_3/include/CGAL/squared_distance_3_2.h
similarity index 100%
rename from Packages/Distance_3/include/CGAL/squared_distance_3_2.h
rename to Distance_3/include/CGAL/squared_distance_3_2.h
diff --git a/Packages/Distance_3/maintainer b/Distance_3/maintainer
similarity index 100%
rename from Packages/Distance_3/maintainer
rename to Distance_3/maintainer
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst321/ix.1 b/Distance_3/test/Distance_3/DATA/tst321/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst321/ix.1
rename to Distance_3/test/Distance_3/DATA/tst321/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst321/ix.2 b/Distance_3/test/Distance_3/DATA/tst321/ix.2
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst321/ix.2
rename to Distance_3/test/Distance_3/DATA/tst321/ix.2
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst321/ix.3 b/Distance_3/test/Distance_3/DATA/tst321/ix.3
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst321/ix.3
rename to Distance_3/test/Distance_3/DATA/tst321/ix.3
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst321/ix.4 b/Distance_3/test/Distance_3/DATA/tst321/ix.4
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst321/ix.4
rename to Distance_3/test/Distance_3/DATA/tst321/ix.4
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.1 b/Distance_3/test/Distance_3/DATA/tst322/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.1
rename to Distance_3/test/Distance_3/DATA/tst322/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.10 b/Distance_3/test/Distance_3/DATA/tst322/ix.10
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.10
rename to Distance_3/test/Distance_3/DATA/tst322/ix.10
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.11 b/Distance_3/test/Distance_3/DATA/tst322/ix.11
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.11
rename to Distance_3/test/Distance_3/DATA/tst322/ix.11
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.12 b/Distance_3/test/Distance_3/DATA/tst322/ix.12
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.12
rename to Distance_3/test/Distance_3/DATA/tst322/ix.12
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.13 b/Distance_3/test/Distance_3/DATA/tst322/ix.13
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.13
rename to Distance_3/test/Distance_3/DATA/tst322/ix.13
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.14 b/Distance_3/test/Distance_3/DATA/tst322/ix.14
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.14
rename to Distance_3/test/Distance_3/DATA/tst322/ix.14
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.15 b/Distance_3/test/Distance_3/DATA/tst322/ix.15
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.15
rename to Distance_3/test/Distance_3/DATA/tst322/ix.15
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.16 b/Distance_3/test/Distance_3/DATA/tst322/ix.16
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.16
rename to Distance_3/test/Distance_3/DATA/tst322/ix.16
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.17 b/Distance_3/test/Distance_3/DATA/tst322/ix.17
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.17
rename to Distance_3/test/Distance_3/DATA/tst322/ix.17
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.18 b/Distance_3/test/Distance_3/DATA/tst322/ix.18
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.18
rename to Distance_3/test/Distance_3/DATA/tst322/ix.18
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.2 b/Distance_3/test/Distance_3/DATA/tst322/ix.2
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.2
rename to Distance_3/test/Distance_3/DATA/tst322/ix.2
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.3 b/Distance_3/test/Distance_3/DATA/tst322/ix.3
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.3
rename to Distance_3/test/Distance_3/DATA/tst322/ix.3
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.4 b/Distance_3/test/Distance_3/DATA/tst322/ix.4
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.4
rename to Distance_3/test/Distance_3/DATA/tst322/ix.4
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.5 b/Distance_3/test/Distance_3/DATA/tst322/ix.5
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.5
rename to Distance_3/test/Distance_3/DATA/tst322/ix.5
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.6 b/Distance_3/test/Distance_3/DATA/tst322/ix.6
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.6
rename to Distance_3/test/Distance_3/DATA/tst322/ix.6
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.7 b/Distance_3/test/Distance_3/DATA/tst322/ix.7
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.7
rename to Distance_3/test/Distance_3/DATA/tst322/ix.7
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.8 b/Distance_3/test/Distance_3/DATA/tst322/ix.8
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.8
rename to Distance_3/test/Distance_3/DATA/tst322/ix.8
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst322/ix.9 b/Distance_3/test/Distance_3/DATA/tst322/ix.9
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst322/ix.9
rename to Distance_3/test/Distance_3/DATA/tst322/ix.9
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst324/ix.1 b/Distance_3/test/Distance_3/DATA/tst324/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst324/ix.1
rename to Distance_3/test/Distance_3/DATA/tst324/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst324/ix.2 b/Distance_3/test/Distance_3/DATA/tst324/ix.2
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst324/ix.2
rename to Distance_3/test/Distance_3/DATA/tst324/ix.2
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst324/ix.3 b/Distance_3/test/Distance_3/DATA/tst324/ix.3
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst324/ix.3
rename to Distance_3/test/Distance_3/DATA/tst324/ix.3
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst326/ix.1 b/Distance_3/test/Distance_3/DATA/tst326/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst326/ix.1
rename to Distance_3/test/Distance_3/DATA/tst326/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst326/ix.2 b/Distance_3/test/Distance_3/DATA/tst326/ix.2
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst326/ix.2
rename to Distance_3/test/Distance_3/DATA/tst326/ix.2
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst326/ix.3 b/Distance_3/test/Distance_3/DATA/tst326/ix.3
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst326/ix.3
rename to Distance_3/test/Distance_3/DATA/tst326/ix.3
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst326/ix.4 b/Distance_3/test/Distance_3/DATA/tst326/ix.4
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst326/ix.4
rename to Distance_3/test/Distance_3/DATA/tst326/ix.4
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst327/ix.1 b/Distance_3/test/Distance_3/DATA/tst327/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst327/ix.1
rename to Distance_3/test/Distance_3/DATA/tst327/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst327/ix.2 b/Distance_3/test/Distance_3/DATA/tst327/ix.2
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst327/ix.2
rename to Distance_3/test/Distance_3/DATA/tst327/ix.2
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst328/ix.1 b/Distance_3/test/Distance_3/DATA/tst328/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst328/ix.1
rename to Distance_3/test/Distance_3/DATA/tst328/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst328/ix.2 b/Distance_3/test/Distance_3/DATA/tst328/ix.2
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst328/ix.2
rename to Distance_3/test/Distance_3/DATA/tst328/ix.2
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst328/ix.3 b/Distance_3/test/Distance_3/DATA/tst328/ix.3
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst328/ix.3
rename to Distance_3/test/Distance_3/DATA/tst328/ix.3
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst329/ix.1 b/Distance_3/test/Distance_3/DATA/tst329/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst329/ix.1
rename to Distance_3/test/Distance_3/DATA/tst329/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst329/ix.2 b/Distance_3/test/Distance_3/DATA/tst329/ix.2
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst329/ix.2
rename to Distance_3/test/Distance_3/DATA/tst329/ix.2
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst329/ix.3 b/Distance_3/test/Distance_3/DATA/tst329/ix.3
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst329/ix.3
rename to Distance_3/test/Distance_3/DATA/tst329/ix.3
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst330/ix.1 b/Distance_3/test/Distance_3/DATA/tst330/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst330/ix.1
rename to Distance_3/test/Distance_3/DATA/tst330/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst331/ix.1 b/Distance_3/test/Distance_3/DATA/tst331/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst331/ix.1
rename to Distance_3/test/Distance_3/DATA/tst331/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/DATA/tst332/ix.1 b/Distance_3/test/Distance_3/DATA/tst332/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/DATA/tst332/ix.1
rename to Distance_3/test/Distance_3/DATA/tst332/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.1 b/Distance_3/test/Distance_3/RESULT/tst322/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.1
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.10 b/Distance_3/test/Distance_3/RESULT/tst322/ix.10
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.10
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.10
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.11 b/Distance_3/test/Distance_3/RESULT/tst322/ix.11
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.11
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.11
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.12 b/Distance_3/test/Distance_3/RESULT/tst322/ix.12
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.12
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.12
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.13 b/Distance_3/test/Distance_3/RESULT/tst322/ix.13
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.13
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.13
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.14 b/Distance_3/test/Distance_3/RESULT/tst322/ix.14
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.14
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.14
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.15 b/Distance_3/test/Distance_3/RESULT/tst322/ix.15
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.15
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.15
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.16 b/Distance_3/test/Distance_3/RESULT/tst322/ix.16
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.16
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.16
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.17 b/Distance_3/test/Distance_3/RESULT/tst322/ix.17
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.17
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.17
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.18 b/Distance_3/test/Distance_3/RESULT/tst322/ix.18
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.18
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.18
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.2 b/Distance_3/test/Distance_3/RESULT/tst322/ix.2
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.2
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.2
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.3 b/Distance_3/test/Distance_3/RESULT/tst322/ix.3
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.3
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.3
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.4 b/Distance_3/test/Distance_3/RESULT/tst322/ix.4
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.4
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.4
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.5 b/Distance_3/test/Distance_3/RESULT/tst322/ix.5
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.5
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.5
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.6 b/Distance_3/test/Distance_3/RESULT/tst322/ix.6
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.6
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.6
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.7 b/Distance_3/test/Distance_3/RESULT/tst322/ix.7
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.7
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.7
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.8 b/Distance_3/test/Distance_3/RESULT/tst322/ix.8
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.8
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.8
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.9 b/Distance_3/test/Distance_3/RESULT/tst322/ix.9
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst322/ix.9
rename to Distance_3/test/Distance_3/RESULT/tst322/ix.9
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.1 b/Distance_3/test/Distance_3/RESULT/tst325/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.1
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.10 b/Distance_3/test/Distance_3/RESULT/tst325/ix.10
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.10
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.10
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.11 b/Distance_3/test/Distance_3/RESULT/tst325/ix.11
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.11
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.11
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.12 b/Distance_3/test/Distance_3/RESULT/tst325/ix.12
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.12
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.12
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.13 b/Distance_3/test/Distance_3/RESULT/tst325/ix.13
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.13
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.13
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.14 b/Distance_3/test/Distance_3/RESULT/tst325/ix.14
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.14
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.14
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.15 b/Distance_3/test/Distance_3/RESULT/tst325/ix.15
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.15
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.15
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.16 b/Distance_3/test/Distance_3/RESULT/tst325/ix.16
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.16
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.16
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.17 b/Distance_3/test/Distance_3/RESULT/tst325/ix.17
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.17
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.17
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.18 b/Distance_3/test/Distance_3/RESULT/tst325/ix.18
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.18
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.18
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.2 b/Distance_3/test/Distance_3/RESULT/tst325/ix.2
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.2
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.2
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.3 b/Distance_3/test/Distance_3/RESULT/tst325/ix.3
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.3
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.3
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.4 b/Distance_3/test/Distance_3/RESULT/tst325/ix.4
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.4
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.4
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.5 b/Distance_3/test/Distance_3/RESULT/tst325/ix.5
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.5
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.5
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.6 b/Distance_3/test/Distance_3/RESULT/tst325/ix.6
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.6
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.6
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.7 b/Distance_3/test/Distance_3/RESULT/tst325/ix.7
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.7
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.7
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.8 b/Distance_3/test/Distance_3/RESULT/tst325/ix.8
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.8
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.8
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.9 b/Distance_3/test/Distance_3/RESULT/tst325/ix.9
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst325/ix.9
rename to Distance_3/test/Distance_3/RESULT/tst325/ix.9
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst327/ix.1 b/Distance_3/test/Distance_3/RESULT/tst327/ix.1
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst327/ix.1
rename to Distance_3/test/Distance_3/RESULT/tst327/ix.1
diff --git a/Packages/Distance_3/test/Distance_3/RESULT/tst327/ix.2 b/Distance_3/test/Distance_3/RESULT/tst327/ix.2
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/RESULT/tst327/ix.2
rename to Distance_3/test/Distance_3/RESULT/tst327/ix.2
diff --git a/Packages/Distance_3/test/Distance_3/cgal_test b/Distance_3/test/Distance_3/cgal_test
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/cgal_test
rename to Distance_3/test/Distance_3/cgal_test
diff --git a/Packages/Distance_3/test/Distance_3/makefile b/Distance_3/test/Distance_3/makefile
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/makefile
rename to Distance_3/test/Distance_3/makefile
diff --git a/Packages/Distance_3/test/Distance_3/numrep1.h b/Distance_3/test/Distance_3/numrep1.h
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/numrep1.h
rename to Distance_3/test/Distance_3/numrep1.h
diff --git a/Packages/Distance_3/test/Distance_3/numrep2.h b/Distance_3/test/Distance_3/numrep2.h
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/numrep2.h
rename to Distance_3/test/Distance_3/numrep2.h
diff --git a/Packages/Distance_3/test/Distance_3/tst321.C b/Distance_3/test/Distance_3/tst321.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst321.C
rename to Distance_3/test/Distance_3/tst321.C
diff --git a/Packages/Distance_3/test/Distance_3/tst322.C b/Distance_3/test/Distance_3/tst322.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst322.C
rename to Distance_3/test/Distance_3/tst322.C
diff --git a/Packages/Distance_3/test/Distance_3/tst323.C b/Distance_3/test/Distance_3/tst323.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst323.C
rename to Distance_3/test/Distance_3/tst323.C
diff --git a/Packages/Distance_3/test/Distance_3/tst324.C b/Distance_3/test/Distance_3/tst324.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst324.C
rename to Distance_3/test/Distance_3/tst324.C
diff --git a/Packages/Distance_3/test/Distance_3/tst325.C b/Distance_3/test/Distance_3/tst325.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst325.C
rename to Distance_3/test/Distance_3/tst325.C
diff --git a/Packages/Distance_3/test/Distance_3/tst326.C b/Distance_3/test/Distance_3/tst326.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst326.C
rename to Distance_3/test/Distance_3/tst326.C
diff --git a/Packages/Distance_3/test/Distance_3/tst327.C b/Distance_3/test/Distance_3/tst327.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst327.C
rename to Distance_3/test/Distance_3/tst327.C
diff --git a/Packages/Distance_3/test/Distance_3/tst328.C b/Distance_3/test/Distance_3/tst328.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst328.C
rename to Distance_3/test/Distance_3/tst328.C
diff --git a/Packages/Distance_3/test/Distance_3/tst329.C b/Distance_3/test/Distance_3/tst329.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst329.C
rename to Distance_3/test/Distance_3/tst329.C
diff --git a/Packages/Distance_3/test/Distance_3/tst330.C b/Distance_3/test/Distance_3/tst330.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst330.C
rename to Distance_3/test/Distance_3/tst330.C
diff --git a/Packages/Distance_3/test/Distance_3/tst331.C b/Distance_3/test/Distance_3/tst331.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst331.C
rename to Distance_3/test/Distance_3/tst331.C
diff --git a/Packages/Distance_3/test/Distance_3/tst332.C b/Distance_3/test/Distance_3/tst332.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst332.C
rename to Distance_3/test/Distance_3/tst332.C
diff --git a/Packages/Distance_3/test/Distance_3/tst333.C b/Distance_3/test/Distance_3/tst333.C
similarity index 100%
rename from Packages/Distance_3/test/Distance_3/tst333.C
rename to Distance_3/test/Distance_3/tst333.C
diff --git a/Packages/Distance_3/web/Makefile b/Distance_3/web/Makefile
similarity index 100%
rename from Packages/Distance_3/web/Makefile
rename to Distance_3/web/Makefile
diff --git a/Packages/Distance_3/web/cgal_util.fwi b/Distance_3/web/cgal_util.fwi
similarity index 100%
rename from Packages/Distance_3/web/cgal_util.fwi
rename to Distance_3/web/cgal_util.fwi
diff --git a/Packages/Distance_3/web/stdmacros.fwi b/Distance_3/web/stdmacros.fwi
similarity index 100%
rename from Packages/Distance_3/web/stdmacros.fwi
rename to Distance_3/web/stdmacros.fwi