diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_arc_traits.h b/Circular_kernel_2/include/CGAL/Arr_circular_arc_traits.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_arc_traits.h
rename to Circular_kernel_2/include/CGAL/Arr_circular_arc_traits.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_arc_traits_checker.h b/Circular_kernel_2/include/CGAL/Arr_circular_arc_traits_checker.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_arc_traits_checker.h
rename to Circular_kernel_2/include/CGAL/Arr_circular_arc_traits_checker.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_arc_traits_tracer.h b/Circular_kernel_2/include/CGAL/Arr_circular_arc_traits_tracer.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_arc_traits_tracer.h
rename to Circular_kernel_2/include/CGAL/Arr_circular_arc_traits_tracer.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_line_arc_traits.h b/Circular_kernel_2/include/CGAL/Arr_circular_line_arc_traits.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Arr_circular_line_arc_traits.h
rename to Circular_kernel_2/include/CGAL/Arr_circular_line_arc_traits.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Arr_line_arc_traits.h b/Circular_kernel_2/include/CGAL/Arr_line_arc_traits.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Arr_line_arc_traits.h
rename to Circular_kernel_2/include/CGAL/Arr_line_arc_traits.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Circular_arc_2.h b/Circular_kernel_2/include/CGAL/Circular_arc_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Circular_arc_2.h
rename to Circular_kernel_2/include/CGAL/Circular_arc_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Circular_arc_point_2.h b/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Circular_arc_point_2.h
rename to Circular_kernel_2/include/CGAL/Circular_arc_point_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Circular_kernel.h b/Circular_kernel_2/include/CGAL/Circular_kernel.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Circular_kernel.h
rename to Circular_kernel_2/include/CGAL/Circular_kernel.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/Circular_arc_2.h b/Circular_kernel_2/include/CGAL/Curved_kernel/Circular_arc_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/Circular_arc_2.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/Circular_arc_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/Circular_arc_point_2.h b/Circular_kernel_2/include/CGAL/Curved_kernel/Circular_arc_point_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/Circular_arc_point_2.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/Circular_arc_point_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/Line_arc_2.h b/Circular_kernel_2/include/CGAL/Curved_kernel/Line_arc_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/Line_arc_2.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/Line_arc_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/function_objects_on_circle_2.h b/Circular_kernel_2/include/CGAL/Curved_kernel/function_objects_on_circle_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/function_objects_on_circle_2.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/function_objects_on_circle_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/function_objects_on_line_2.h b/Circular_kernel_2/include/CGAL/Curved_kernel/function_objects_on_line_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/function_objects_on_line_2.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/function_objects_on_line_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h b/Circular_kernel_2/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/function_objects_polynomial_circular.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/functions_on_circle_2.h b/Circular_kernel_2/include/CGAL/Curved_kernel/functions_on_circle_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/functions_on_circle_2.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/functions_on_circle_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/interface_macros.h b/Circular_kernel_2/include/CGAL/Curved_kernel/interface_macros.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/interface_macros.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/interface_macros.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h b/Circular_kernel_2/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/internal_functions_on_circle_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circular_arc_2.h b/Circular_kernel_2/include/CGAL/Curved_kernel/internal_functions_on_circular_arc_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_circular_arc_2.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/internal_functions_on_circular_arc_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_2.h b/Circular_kernel_2/include/CGAL/Curved_kernel/internal_functions_on_line_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_2.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/internal_functions_on_line_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_arc_2.h b/Circular_kernel_2/include/CGAL/Curved_kernel/internal_functions_on_line_arc_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/internal_functions_on_line_arc_2.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/internal_functions_on_line_arc_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/intersection_line_2_circle_2_map.h b/Circular_kernel_2/include/CGAL/Curved_kernel/intersection_line_2_circle_2_map.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel/intersection_line_2_circle_2_map.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel/intersection_line_2_circle_2_map.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel_converter.h b/Circular_kernel_2/include/CGAL/Curved_kernel_converter.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel_converter.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel_converter.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel_type_equality_wrapper.h b/Circular_kernel_2/include/CGAL/Curved_kernel_type_equality_wrapper.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Curved_kernel_type_equality_wrapper.h
rename to Circular_kernel_2/include/CGAL/Curved_kernel_type_equality_wrapper.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Exact_circular_kernel.h b/Circular_kernel_2/include/CGAL/Exact_circular_kernel.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Exact_circular_kernel.h
rename to Circular_kernel_2/include/CGAL/Exact_circular_kernel.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel.h b/Circular_kernel_2/include/CGAL/Filtered_bbox_curved_kernel.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel.h
rename to Circular_kernel_2/include/CGAL/Filtered_bbox_curved_kernel.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_endpoint_with_bbox_2.h b/Circular_kernel_2/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_endpoint_with_bbox_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_endpoint_with_bbox_2.h
rename to Circular_kernel_2/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_endpoint_with_bbox_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_with_bbox_2.h b/Circular_kernel_2/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_with_bbox_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_with_bbox_2.h
rename to Circular_kernel_2/include/CGAL/Filtered_bbox_curved_kernel/Circular_arc_with_bbox_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Line_arc_with_bbox_2.h b/Circular_kernel_2/include/CGAL/Filtered_bbox_curved_kernel/Line_arc_with_bbox_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/Line_arc_with_bbox_2.h
rename to Circular_kernel_2/include/CGAL/Filtered_bbox_curved_kernel/Line_arc_with_bbox_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/bbox_filtered_predicates.h b/Circular_kernel_2/include/CGAL/Filtered_bbox_curved_kernel/bbox_filtered_predicates.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_bbox_curved_kernel/bbox_filtered_predicates.h
rename to Circular_kernel_2/include/CGAL/Filtered_bbox_curved_kernel/bbox_filtered_predicates.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel.h b/Circular_kernel_2/include/CGAL/Filtered_hexagon_curved_kernel.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel.h
rename to Circular_kernel_2/include/CGAL/Filtered_hexagon_curved_kernel.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h b/Circular_kernel_2/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h
rename to Circular_kernel_2/include/CGAL/Filtered_hexagon_curved_kernel/Circular_arc_with_hexagon_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h b/Circular_kernel_2/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h
rename to Circular_kernel_2/include/CGAL/Filtered_hexagon_curved_kernel/Line_arc_with_hexagon_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_filtered_predicates.h b/Circular_kernel_2/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_filtered_predicates.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_filtered_predicates.h
rename to Circular_kernel_2/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_filtered_predicates.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h b/Circular_kernel_2/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h
rename to Circular_kernel_2/include/CGAL/Filtered_hexagon_curved_kernel/hexagon_primitives.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel.h b/Circular_kernel_2/include/CGAL/Filtered_interval_circular_kernel.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel.h
rename to Circular_kernel_2/include/CGAL/Filtered_interval_circular_kernel.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/ah_filtered_predicates.h b/Circular_kernel_2/include/CGAL/Filtered_interval_circular_kernel/ah_filtered_predicates.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/ah_filtered_predicates.h
rename to Circular_kernel_2/include/CGAL/Filtered_interval_circular_kernel/ah_filtered_predicates.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/ah_primitives.h b/Circular_kernel_2/include/CGAL/Filtered_interval_circular_kernel/ah_primitives.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/ah_primitives.h
rename to Circular_kernel_2/include/CGAL/Filtered_interval_circular_kernel/ah_primitives.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_defines.h b/Circular_kernel_2/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_defines.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_defines.h
rename to Circular_kernel_2/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_defines.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table.h b/Circular_kernel_2/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table.h
rename to Circular_kernel_2/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table_generator.h b/Circular_kernel_2/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table_generator.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table_generator.h
rename to Circular_kernel_2/include/CGAL/Filtered_interval_circular_kernel/filtered_interval_circular_kernel_table_generator.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/IO/Dxf_reader.h b/Circular_kernel_2/include/CGAL/IO/Dxf_reader.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/IO/Dxf_reader.h
rename to Circular_kernel_2/include/CGAL/IO/Dxf_reader.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/IO/Dxf_variant_reader.h b/Circular_kernel_2/include/CGAL/IO/Dxf_variant_reader.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/IO/Dxf_variant_reader.h
rename to Circular_kernel_2/include/CGAL/IO/Dxf_variant_reader.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_2.h b/Circular_kernel_2/include/CGAL/IO/Qt_widget_circular_arc_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_2.h
rename to Circular_kernel_2/include/CGAL/IO/Qt_widget_circular_arc_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_endpoint_2.h b/Circular_kernel_2/include/CGAL/IO/Qt_widget_circular_arc_endpoint_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_endpoint_2.h
rename to Circular_kernel_2/include/CGAL/IO/Qt_widget_circular_arc_endpoint_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_with_hexagon_2.h b/Circular_kernel_2/include/CGAL/IO/Qt_widget_circular_arc_with_hexagon_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/IO/Qt_widget_circular_arc_with_hexagon_2.h
rename to Circular_kernel_2/include/CGAL/IO/Qt_widget_circular_arc_with_hexagon_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Lazy_curved_kernel.h b/Circular_kernel_2/include/CGAL/Lazy_curved_kernel.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Lazy_curved_kernel.h
rename to Circular_kernel_2/include/CGAL/Lazy_curved_kernel.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Lazy_curved_kernel_constructions.h b/Circular_kernel_2/include/CGAL/Lazy_curved_kernel_constructions.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Lazy_curved_kernel_constructions.h
rename to Circular_kernel_2/include/CGAL/Lazy_curved_kernel_constructions.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Line_arc_2.h b/Circular_kernel_2/include/CGAL/Line_arc_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Line_arc_2.h
rename to Circular_kernel_2/include/CGAL/Line_arc_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/Simple_circular_kernel.h b/Circular_kernel_2/include/CGAL/Simple_circular_kernel.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/Simple_circular_kernel.h
rename to Circular_kernel_2/include/CGAL/Simple_circular_kernel.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_circle_2.h b/Circular_kernel_2/include/CGAL/global_functions_on_circle_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_circle_2.h
rename to Circular_kernel_2/include/CGAL/global_functions_on_circle_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_circular_arcs_2.h b/Circular_kernel_2/include/CGAL/global_functions_on_circular_arcs_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_circular_arcs_2.h
rename to Circular_kernel_2/include/CGAL/global_functions_on_circular_arcs_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_line_2.h b/Circular_kernel_2/include/CGAL/global_functions_on_line_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_line_2.h
rename to Circular_kernel_2/include/CGAL/global_functions_on_line_2.h
diff --git a/Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_line_arcs_2.h b/Circular_kernel_2/include/CGAL/global_functions_on_line_arcs_2.h
similarity index 100%
rename from Circular_kernel_2/Curved_kernel/include/CGAL/global_functions_on_line_arcs_2.h
rename to Circular_kernel_2/include/CGAL/global_functions_on_line_arcs_2.h