diff --git a/BGL/include/CGAL/HalfedgeDS_face_max_base_with_id.h b/HalfedgeDS/include/CGAL/HalfedgeDS_face_max_base_with_id.h
similarity index 100%
rename from BGL/include/CGAL/HalfedgeDS_face_max_base_with_id.h
rename to HalfedgeDS/include/CGAL/HalfedgeDS_face_max_base_with_id.h
diff --git a/BGL/include/CGAL/HalfedgeDS_halfedge_max_base_with_id.h b/HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_max_base_with_id.h
similarity index 100%
rename from BGL/include/CGAL/HalfedgeDS_halfedge_max_base_with_id.h
rename to HalfedgeDS/include/CGAL/HalfedgeDS_halfedge_max_base_with_id.h
diff --git a/BGL/include/CGAL/HalfedgeDS_vertex_max_base_with_id.h b/HalfedgeDS/include/CGAL/HalfedgeDS_vertex_max_base_with_id.h
similarity index 100%
rename from BGL/include/CGAL/HalfedgeDS_vertex_max_base_with_id.h
rename to HalfedgeDS/include/CGAL/HalfedgeDS_vertex_max_base_with_id.h
diff --git a/BGL/include/CGAL/Polyhedron_items_with_id_3.h b/Polyhedron/include/CGAL/Polyhedron_items_with_id_3.h
similarity index 100%
rename from BGL/include/CGAL/Polyhedron_items_with_id_3.h
rename to Polyhedron/include/CGAL/Polyhedron_items_with_id_3.h
diff --git a/BGL/include/CGAL/Triangulation_vertex_base_with_id_2.h b/Triangulation_2/include/CGAL/Triangulation_vertex_base_with_id_2.h
similarity index 100%
rename from BGL/include/CGAL/Triangulation_vertex_base_with_id_2.h
rename to Triangulation_2/include/CGAL/Triangulation_vertex_base_with_id_2.h