diff --git a/Bounding_volumes/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterC2.h b/Bounding_volumes/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterC2.h
index 5c5384bd72f..3cfb460194d 100644
--- a/Bounding_volumes/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterC2.h
+++ b/Bounding_volumes/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterC2.h
@@ -22,7 +22,7 @@
 #define CGAL_MIN_ELLIPSE_2_ADAPTERC2_H
 
 // includes
-#  include <CGAL/ConicCPA2.h>
+#  include <CGAL/Cartesian/ConicCPA2.h>
 #  include <CGAL/Optimisation/assertions.h>
 
 namespace CGAL {
diff --git a/Bounding_volumes/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterH2.h b/Bounding_volumes/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterH2.h
index 33de7d16d07..f13759c3f2a 100644
--- a/Bounding_volumes/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterH2.h
+++ b/Bounding_volumes/include/CGAL/Min_ellipse_2/Min_ellipse_2_adapterH2.h
@@ -22,7 +22,7 @@
 #define CGAL_MIN_ELLIPSE_2_ADAPTERH2_H
 
 // includes
-#  include <CGAL/ConicHPA2.h>
+#  include <CGAL/Homogeneous/ConicHPA2.h>
 #  include <CGAL/Optimisation/assertions.h>
 
 namespace CGAL {
diff --git a/Bounding_volumes/include/CGAL/Min_ellipse_2/Optimisation_ellipse_2.h b/Bounding_volumes/include/CGAL/Min_ellipse_2/Optimisation_ellipse_2.h
index efa58d9b992..4fb2d46b6f7 100644
--- a/Bounding_volumes/include/CGAL/Min_ellipse_2/Optimisation_ellipse_2.h
+++ b/Bounding_volumes/include/CGAL/Min_ellipse_2/Optimisation_ellipse_2.h
@@ -24,6 +24,7 @@
 #include <CGAL/Conic_2.h>
 #include <CGAL/Optimisation/assertions.h>
 #include <CGAL/Kernel/global_functions_2.h>
+#include <CGAL/Kernel/Conic_misc.h>
 
 
 namespace CGAL {
diff --git a/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h b/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h
index fb5b6aa08f0..9e250f82a68 100644
--- a/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h
+++ b/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h
@@ -40,7 +40,7 @@
 #include <CGAL/Cartesian/Iso_rectangle_2.h>
 #include <CGAL/Cartesian/Aff_transformation_2.h>
 #include <CGAL/Cartesian/Data_accessor_2.h>
-#include <CGAL/ConicCPA2.h>
+#include <CGAL/Cartesian/ConicCPA2.h>
 
 #include <CGAL/Cartesian/predicates_on_points_2.h>
 #include <CGAL/Cartesian/predicates_on_directions_2.h>
diff --git a/Conic_2/include/CGAL/ConicCPA2.h b/Cartesian_kernel/include/CGAL/Cartesian/ConicCPA2.h
similarity index 99%
rename from Conic_2/include/CGAL/ConicCPA2.h
rename to Cartesian_kernel/include/CGAL/Cartesian/ConicCPA2.h
index fca7633ce9c..20aae94631f 100644
--- a/Conic_2/include/CGAL/ConicCPA2.h
+++ b/Cartesian_kernel/include/CGAL/Cartesian/ConicCPA2.h
@@ -26,7 +26,7 @@
 #define CGAL_CONICCPA2_H
 
 // includes
-#include <CGAL/Conic_misc.h>
+#include <CGAL/Kernel/Conic_misc.h>
 #include <CGAL/kernel_assertions.h>
 
 namespace CGAL {
diff --git a/Conic_2/package_info/Conic_2/copyright b/Conic_2/package_info/Conic_2/copyright
deleted file mode 100644
index a35c66ade4c..00000000000
--- a/Conic_2/package_info/Conic_2/copyright
+++ /dev/null
@@ -1,5 +0,0 @@
-Utrecht University (The Netherlands),
-ETH Zurich (Switzerland),
-INRIA Sophia-Antipolis (France),
-Max-Planck-Institute Saarbruecken (Germany),
-Tel-Aviv University (Israel).
diff --git a/Conic_2/package_info/Conic_2/description.txt b/Conic_2/package_info/Conic_2/description.txt
deleted file mode 100644
index 7b4c30aa35e..00000000000
--- a/Conic_2/package_info/Conic_2/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This package ....
\ No newline at end of file
diff --git a/Conic_2/package_info/Conic_2/license.txt b/Conic_2/package_info/Conic_2/license.txt
deleted file mode 100644
index 5c1c5d8436f..00000000000
--- a/Conic_2/package_info/Conic_2/license.txt
+++ /dev/null
@@ -1 +0,0 @@
-LGPL (v3 or later)
diff --git a/Conic_2/package_info/Conic_2/maintainer b/Conic_2/package_info/Conic_2/maintainer
deleted file mode 100644
index 4f45ddcd216..00000000000
--- a/Conic_2/package_info/Conic_2/maintainer
+++ /dev/null
@@ -1 +0,0 @@
-Andreas Fabri <Andreas.Fabri@geometryfactory.com>
diff --git a/Conic_2/include/CGAL/ConicHPA2.h b/Homogeneous_kernel/include/CGAL/Homogeneous/ConicHPA2.h
similarity index 99%
rename from Conic_2/include/CGAL/ConicHPA2.h
rename to Homogeneous_kernel/include/CGAL/Homogeneous/ConicHPA2.h
index ae340f70c13..93646e8514d 100644
--- a/Conic_2/include/CGAL/ConicHPA2.h
+++ b/Homogeneous_kernel/include/CGAL/Homogeneous/ConicHPA2.h
@@ -26,7 +26,7 @@
 #define CGAL_CONICHPA2_H
 
 // includes
-#include <CGAL/Conic_misc.h>
+#include <CGAL/Kernel/Conic_misc.h>
 #include <CGAL/kernel_assertions.h>
 
 namespace CGAL {
diff --git a/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h b/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
index 35131fe06d9..db950491d5f 100644
--- a/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
+++ b/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
@@ -43,7 +43,7 @@
 #include <CGAL/Cartesian/Triangle_2.h>
 #include <CGAL/Homogeneous/VectorH2.h>
 #include <CGAL/Homogeneous/Data_accessorH2.h>
-#include <CGAL/ConicHPA2.h>
+#include <CGAL/Homogeneous/ConicHPA2.h>
 
 #include <CGAL/Homogeneous/Aff_transformationH3.h>
 #include <CGAL/Homogeneous/DirectionH3.h>
diff --git a/Conic_2/include/CGAL/Conic_2.h b/Kernel_23/include/CGAL/Conic_2.h
similarity index 99%
rename from Conic_2/include/CGAL/Conic_2.h
rename to Kernel_23/include/CGAL/Conic_2.h
index 74eb34fa750..21e803ec8ca 100644
--- a/Conic_2/include/CGAL/Conic_2.h
+++ b/Kernel_23/include/CGAL/Conic_2.h
@@ -27,7 +27,7 @@
 #define CGAL_CONIC_2_H
 
 #include <CGAL/Point_2.h>
-#include <CGAL/Conic_misc.h>
+#include <CGAL/Kernel/Conic_misc.h>
 #include <CGAL/Dimension.h>
 
 namespace CGAL {
diff --git a/Conic_2/include/CGAL/Conic_misc.h b/Kernel_23/include/CGAL/Kernel/Conic_misc.h
similarity index 100%
rename from Conic_2/include/CGAL/Conic_misc.h
rename to Kernel_23/include/CGAL/Kernel/Conic_misc.h