diff --git a/.gitattributes b/.gitattributes
index 52e10b78a9c..7f781fb6087 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -27,14 +27,14 @@ AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp -text
 AABB_tree/examples/AABB_tree/CMakeLists.txt -text
 AABB_tree/examples/AABB_tree/cleanup.bat -text
 AABB_tree/include/CGAL/AABB_intersections.h -text
+AABB_tree/include/CGAL/AABB_intersections/Triangle_3_line_3_intersection.h -text
+AABB_tree/include/CGAL/AABB_intersections/nearest_point_segment_3.h -text
+AABB_tree/include/CGAL/AABB_polyhedron_edge_primitive.h -text
+AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h -text
 AABB_tree/include/CGAL/AABB_search_tree.h -text
+AABB_tree/include/CGAL/AABB_segment_primitive.h -text
 AABB_tree/include/CGAL/AABB_traits.h -text
-AABB_tree/include/CGAL/intersections/Triangle_3_line_3_intersection.h -text
-AABB_tree/include/CGAL/intersections/nearest_point_segment_3.h -text
-AABB_tree/include/CGAL/primitives/AABB_polyhedron_edge_primitive.h -text
-AABB_tree/include/CGAL/primitives/AABB_polyhedron_triangle_primitive.h -text
-AABB_tree/include/CGAL/primitives/AABB_segment_primitive.h -text
-AABB_tree/include/CGAL/primitives/AABB_triangle_primitive.h -text
+AABB_tree/include/CGAL/AABB_triangle_primitive.h -text
 AABB_tree/test/AABB_tree/CMakeLists.txt -text
 AABB_tree/test/AABB_tree/aabb_intersection_triangle_test.cpp -text
 AABB_tree/test/AABB_tree/aabb_projection_edge_test.cpp -text
diff --git a/AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp b/AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp
index fbcb58a35a9..5013ad3f23d 100644
--- a/AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp
+++ b/AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp
@@ -27,7 +27,7 @@
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_traits.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/primitives/AABB_polyhedron_edge_primitive.h>
+#include <CGAL/AABB_polyhedron_edge_primitive.h>
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
diff --git a/AABB_tree/examples/AABB_tree/AABB_polyhedron_facet_example.cpp b/AABB_tree/examples/AABB_tree/AABB_polyhedron_facet_example.cpp
index 00a4fb663bf..661edb2a960 100644
--- a/AABB_tree/examples/AABB_tree/AABB_polyhedron_facet_example.cpp
+++ b/AABB_tree/examples/AABB_tree/AABB_polyhedron_facet_example.cpp
@@ -27,7 +27,7 @@
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_traits.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/primitives/AABB_polyhedron_triangle_primitive.h>
+#include <CGAL/AABB_polyhedron_triangle_primitive.h>
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
diff --git a/AABB_tree/examples/AABB_tree/AABB_segment_3_example.cpp b/AABB_tree/examples/AABB_tree/AABB_segment_3_example.cpp
index 18d0ee2e2fe..54b46504bd2 100644
--- a/AABB_tree/examples/AABB_tree/AABB_segment_3_example.cpp
+++ b/AABB_tree/examples/AABB_tree/AABB_segment_3_example.cpp
@@ -27,7 +27,7 @@
 
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_traits.h>
-#include <CGAL/primitives/AABB_segment_primitive.h>
+#include <CGAL/AABB_segment_primitive.h>
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
diff --git a/AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp b/AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp
index 79cbf94ec86..186e184ee01 100644
--- a/AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp
+++ b/AABB_tree/examples/AABB_tree/AABB_triangle_3_example.cpp
@@ -27,7 +27,7 @@
 
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_traits.h>
-#include <CGAL/primitives/AABB_triangle_primitive.h>
+#include <CGAL/AABB_triangle_primitive.h>
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
diff --git a/AABB_tree/include/CGAL/AABB_intersections.h b/AABB_tree/include/CGAL/AABB_intersections.h
index 5588d29a461..3eeb0200f0c 100644
--- a/AABB_tree/include/CGAL/AABB_intersections.h
+++ b/AABB_tree/include/CGAL/AABB_intersections.h
@@ -2,18 +2,18 @@
 
 #include <CGAL/intersections.h>
 
-#include <CGAL/intersections/Bbox_3_ray_3_do_intersect.h>
-#include <CGAL/intersections/Bbox_3_line_3_do_intersect.h>
-#include <CGAL/intersections/Bbox_3_bbox_3_do_intersect.h>
-#include <CGAL/intersections/Bbox_3_plane_3_do_intersect.h>
-#include <CGAL/intersections/Bbox_3_sphere_3_do_intersect.h>
-#include <CGAL/intersections/Bbox_3_segment_3_do_intersect.h>
-#include <CGAL/intersections/Bbox_3_triangle_3_do_intersect.h>
+#include <CGAL/AABB_intersections/Bbox_3_ray_3_do_intersect.h>
+#include <CGAL/AABB_intersections/Bbox_3_line_3_do_intersect.h>
+#include <CGAL/AABB_intersections/Bbox_3_bbox_3_do_intersect.h>
+#include <CGAL/AABB_intersections/Bbox_3_plane_3_do_intersect.h>
+#include <CGAL/AABB_intersections/Bbox_3_sphere_3_do_intersect.h>
+#include <CGAL/AABB_intersections/Bbox_3_segment_3_do_intersect.h>
+#include <CGAL/AABB_intersections/Bbox_3_triangle_3_do_intersect.h>
 
-#include <CGAL/intersections/Triangle_3_ray_3_intersection.h>
-#include <CGAL/intersections/Triangle_3_line_3_intersection.h>
-#include <CGAL/intersections/Triangle_3_plane_3_intersection.h>
-#include <CGAL/intersections/Triangle_3_segment_3_intersection.h>
+#include <CGAL/AABB_intersections/Triangle_3_ray_3_intersection.h>
+#include <CGAL/AABB_intersections/Triangle_3_line_3_intersection.h>
+#include <CGAL/AABB_intersections/Triangle_3_plane_3_intersection.h>
+#include <CGAL/AABB_intersections/Triangle_3_segment_3_intersection.h>
 
-#include <CGAL/intersections/nearest_point_triangle_3.h>
-#include <CGAL/intersections/nearest_point_segment_3.h>
+#include <CGAL/AABB_intersections/nearest_point_triangle_3.h>
+#include <CGAL/AABB_intersections/nearest_point_segment_3.h>
diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_bbox_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_bbox_3_do_intersect.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/Bbox_3_bbox_3_do_intersect.h
rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_bbox_3_do_intersect.h
diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_line_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_line_3_do_intersect.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/Bbox_3_line_3_do_intersect.h
rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_line_3_do_intersect.h
diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_plane_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_plane_3_do_intersect.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/Bbox_3_plane_3_do_intersect.h
rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_plane_3_do_intersect.h
diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_ray_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_ray_3_do_intersect.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/Bbox_3_ray_3_do_intersect.h
rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_ray_3_do_intersect.h
diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_segment_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_segment_3_do_intersect.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/Bbox_3_segment_3_do_intersect.h
rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_segment_3_do_intersect.h
diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_sphere_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_sphere_3_do_intersect.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/Bbox_3_sphere_3_do_intersect.h
rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_sphere_3_do_intersect.h
diff --git a/AABB_tree/include/CGAL/intersections/Bbox_3_triangle_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_triangle_3_do_intersect.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/Bbox_3_triangle_3_do_intersect.h
rename to AABB_tree/include/CGAL/AABB_intersections/Bbox_3_triangle_3_do_intersect.h
diff --git a/AABB_tree/include/CGAL/intersections/Triangle_3_line_3_intersection.h b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_line_3_intersection.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/Triangle_3_line_3_intersection.h
rename to AABB_tree/include/CGAL/AABB_intersections/Triangle_3_line_3_intersection.h
diff --git a/AABB_tree/include/CGAL/intersections/Triangle_3_plane_3_intersection.h b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_plane_3_intersection.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/Triangle_3_plane_3_intersection.h
rename to AABB_tree/include/CGAL/AABB_intersections/Triangle_3_plane_3_intersection.h
diff --git a/AABB_tree/include/CGAL/intersections/Triangle_3_ray_3_intersection.h b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_ray_3_intersection.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/Triangle_3_ray_3_intersection.h
rename to AABB_tree/include/CGAL/AABB_intersections/Triangle_3_ray_3_intersection.h
diff --git a/AABB_tree/include/CGAL/intersections/Triangle_3_segment_3_intersection.h b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_segment_3_intersection.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/Triangle_3_segment_3_intersection.h
rename to AABB_tree/include/CGAL/AABB_intersections/Triangle_3_segment_3_intersection.h
diff --git a/AABB_tree/include/CGAL/intersections/nearest_point_segment_3.h b/AABB_tree/include/CGAL/AABB_intersections/nearest_point_segment_3.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/nearest_point_segment_3.h
rename to AABB_tree/include/CGAL/AABB_intersections/nearest_point_segment_3.h
diff --git a/AABB_tree/include/CGAL/intersections/nearest_point_triangle_3.h b/AABB_tree/include/CGAL/AABB_intersections/nearest_point_triangle_3.h
similarity index 100%
rename from AABB_tree/include/CGAL/intersections/nearest_point_triangle_3.h
rename to AABB_tree/include/CGAL/AABB_intersections/nearest_point_triangle_3.h
diff --git a/AABB_tree/include/CGAL/primitives/AABB_polyhedron_edge_primitive.h b/AABB_tree/include/CGAL/AABB_polyhedron_edge_primitive.h
similarity index 100%
rename from AABB_tree/include/CGAL/primitives/AABB_polyhedron_edge_primitive.h
rename to AABB_tree/include/CGAL/AABB_polyhedron_edge_primitive.h
diff --git a/AABB_tree/include/CGAL/primitives/AABB_polyhedron_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h
similarity index 100%
rename from AABB_tree/include/CGAL/primitives/AABB_polyhedron_triangle_primitive.h
rename to AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h
diff --git a/AABB_tree/include/CGAL/primitives/AABB_segment_primitive.h b/AABB_tree/include/CGAL/AABB_segment_primitive.h
similarity index 100%
rename from AABB_tree/include/CGAL/primitives/AABB_segment_primitive.h
rename to AABB_tree/include/CGAL/AABB_segment_primitive.h
diff --git a/AABB_tree/include/CGAL/primitives/AABB_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_triangle_primitive.h
similarity index 100%
rename from AABB_tree/include/CGAL/primitives/AABB_triangle_primitive.h
rename to AABB_tree/include/CGAL/AABB_triangle_primitive.h