AABB tree: undo folder restructuring

.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

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>
 

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>
 

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>
 

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>
 

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>