diff --git a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Algebraic_structure_traits.h b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Algebraic_structure_traits.h
index 45693374beb..ca16dda856c 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Algebraic_structure_traits.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Algebraic_structure_traits.h
@@ -1,7 +1,7 @@
namespace CGAL {
/*!
-\ingroup PkgAlgebraicFoundations
+\ingroup PkgAlgebraicFoundationsAlgebraicStructures
An instance of `Algebraic_structure_traits` is a model of `AlgebraicStructureTraits`, where T is the associated type.
@@ -17,7 +17,7 @@ class Algebraic_structure_traits {
namespace CGAL {
/*!
-\ingroup PkgAlgebraicFoundations
+\ingroup PkgAlgebraicFoundationsAlgebraicStructures
\anchor Euclidean_ring_tag
@@ -36,7 +36,7 @@ class Euclidean_ring_tag : public Unique_factorization_domain_tag {
}; /* end Euclidean_ring_tag */
/*!
-\ingroup PkgAlgebraicFoundations
+\ingroup PkgAlgebraicFoundationsAlgebraicStructures
\anchor Field_tag
@@ -54,7 +54,7 @@ class Field_tag : public Integral_domain_tag {
}; /* end Field_tag */
/*!
-\ingroup PkgAlgebraicFoundations
+\ingroup PkgAlgebraicFoundationsAlgebraicStructures
\anchor Field_with_kth_root_tag
@@ -90,7 +90,7 @@ class Field_with_root_of_tag : public Field_with_kth_root_tag {
}; /* end Field_with_root_of_tag */
/*!
-\ingroup PkgAlgebraicFoundations
+\ingroup PkgAlgebraicFoundationsAlgebraicStructures
\anchor Field_with_sqrt_tag
@@ -108,7 +108,7 @@ class Field_with_sqrt_tag : public Field_tag {
}; /* end Field_with_sqrt_tag */
/*!
-\ingroup PkgAlgebraicFoundations
+\ingroup PkgAlgebraicFoundationsAlgebraicStructures
\anchor Integral_domain_tag
@@ -126,7 +126,7 @@ class Integral_domain_tag : public Integral_domain_without_division_tag {
}; /* end Integral_domain_tag */
/*!
-\ingroup PkgAlgebraicFoundations
+\ingroup PkgAlgebraicFoundationsAlgebraicStructures
\anchor Integral_domain_without_division_tag
@@ -143,7 +143,7 @@ class Integral_domain_without_division_tag {
}; /* end Integral_domain_without_division_tag */
/*!
-\ingroup PkgAlgebraicFoundations
+\ingroup PkgAlgebraicFoundationsAlgebraicStructures
\anchor Unique_factorization_domain_tag
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Coercion_traits.h b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Coercion_traits.h
index eff58a59a6a..c7e09f06109 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Coercion_traits.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Coercion_traits.h
@@ -2,7 +2,7 @@
namespace CGAL {
/*!
-\ingroup PkgAlgebraicFoundations
+\ingroup PkgAlgebraicFoundationsInteroperability
An instance of `Coercion_traits` reflects the type coercion of the types
A and B, it is symmetric in the two template arguments.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Fraction_traits.h b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Fraction_traits.h
index 946e802ca2a..8a96eee2072 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Fraction_traits.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Fraction_traits.h
@@ -1,7 +1,7 @@
namespace CGAL {
/*!
-\ingroup PkgAlgebraicFoundations
+\ingroup PkgAlgebraicFoundationsFractions
An instance of `Fraction_traits` is a model of `FractionTraits`,
where `T` is the associated type.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Real_embeddable_traits.h b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Real_embeddable_traits.h
index 2620c92470a..95cf1989c3e 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Real_embeddable_traits.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/CGAL/Real_embeddable_traits.h
@@ -2,7 +2,7 @@
namespace CGAL {
/*!
-\ingroup PkgAlgebraicFoundations
+\ingroup PkgAlgebraicFoundationsRealEmbeddable
An instance of `Real_embeddable_traits` is a model of `RealEmbeddableTraits`, where T is the associated type.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Div.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Div.h
index a995a001b68..3d25d15c46a 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Div.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Div.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableBinaryFunction` computes the integral quotient of division
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--DivMod.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--DivMod.h
index ea7ef3bdb6d..1649f049819 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--DivMod.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--DivMod.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableFunctor` computes both integral quotient and remainder
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Divides.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Divides.h
index a8a6e68faed..e39b760f886 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Divides.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Divides.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableBinaryFunction`,
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Gcd.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Gcd.h
index dca4615171b..403b80b16d9 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Gcd.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Gcd.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableBinaryFunction` providing the gcd.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IntegralDivision.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IntegralDivision.h
index 3184cd50a98..d3e153331b5 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IntegralDivision.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IntegralDivision.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableBinaryFunction` providing an integral division.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Inverse.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Inverse.h
index 1d827acbf57..c99b14eb963 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Inverse.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Inverse.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableUnaryFunction` providing the inverse element with
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IsOne.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IsOne.h
index aae3be05f45..1fb16b7d0fd 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IsOne.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IsOne.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableUnaryFunction`,
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IsSquare.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IsSquare.h
index 2647f05b921..edc6438ace9 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IsSquare.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IsSquare.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableBinaryFunction` that computes whether the first argument is a square.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IsZero.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IsZero.h
index 8ee0c673ebe..7166bf4377c 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IsZero.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--IsZero.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableUnaryFunction`, returns true in case the argument is the zero element of the ring.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--KthRoot.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--KthRoot.h
index 11c9bdd0427..dc891666f90 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--KthRoot.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--KthRoot.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableBinaryFunction` providing the k-th root.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Mod.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Mod.h
index 5c46284ee20..66c39c8c76e 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Mod.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Mod.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableBinaryFunction` computes the remainder of division with remainder.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--RootOf.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--RootOf.h
index f8f4709524d..68859df6f56 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--RootOf.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--RootOf.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableFunctor` computes a real root of a square-free univariate
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Simplify.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Simplify.h
index 90ac2fdb422..c82612ead80 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Simplify.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Simplify.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
This `AdaptableUnaryFunction` may simplify a given object.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Sqrt.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Sqrt.h
index 1d983ca4232..00f542449ee 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Sqrt.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Sqrt.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableUnaryFunction` providing the square root.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Square.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Square.h
index 6e55aa83ca7..c07db827c71 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Square.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--Square.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`AdaptableUnaryFunction`, computing the square of the argument.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--UnitPart.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--UnitPart.h
index fcc6a06104d..dae09367e66 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--UnitPart.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits--UnitPart.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
This `AdaptableUnaryFunction` computes the unit part of a given ring
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits.h
index 1caffdf9bbf..b528e858cf3 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/AlgebraicStructureTraits.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
A model of `AlgebraicStructureTraits` reflects the algebraic structure
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/EuclideanRing.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/EuclideanRing.h
index 1a1ccccddf7..e8e97d7656f 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/EuclideanRing.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/EuclideanRing.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
A model of `EuclideanRing` represents an euclidean ring (or Euclidean domain).
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ExplicitInteroperable.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ExplicitInteroperable.h
index f225097796f..3521b218853 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ExplicitInteroperable.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ExplicitInteroperable.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsInteroperabilityConcepts
\cgalconcept
Two types `A` and `B` are a model of the `ExplicitInteroperable`
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Field.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Field.h
index fafe67059cc..c8cebb09fb0 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Field.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Field.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
A model of `Field` is an `IntegralDomain` in which every non-zero element
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldNumberType.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldNumberType.h
index 9802f51b1e3..c59f12aa39f 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldNumberType.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldNumberType.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsRealNumberTypesConcepts
\cgalconcept
The concept `FieldNumberType` combines the requirements of the concepts
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithRootOf.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithRootOf.h
index 9a1b6cbd283..497249206e0 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithRootOf.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithRootOf.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
A model of `FieldWithRootOf` is a `FieldWithKthRoot` with the possibility to
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithSqrt.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithSqrt.h
index 4353562dc95..92465a185ab 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithSqrt.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FieldWithSqrt.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
A model of `FieldWithSqrt` is a `Field` that has operations to take square roots.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Fraction.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Fraction.h
index f9b00cb7fee..edd86896ae2 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Fraction.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Fraction.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsFractionsConcepts
\cgalconcept
A type is considered as a `Fraction`, if there is a reasonable way to
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FractionTraits.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FractionTraits.h
index 8be3c3e045f..8fd84ecacb4 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FractionTraits.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FractionTraits.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsFractionsConcepts
\cgalconcept
A model of `FractionTraits` is associated with a type `Type`.
@@ -55,7 +55,7 @@ typedef Hidden_type Denominator_type;
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsFractionsConcepts
\cgalconcept
Functor decomposing a `Fraction` into its numerator and denominator.
@@ -85,7 +85,7 @@ FractionTraits::Denominator_type & d);
}; /* end FractionTraits::Decompose */
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsFractionsConcepts
\cgalconcept
`AdaptableBinaryFunction`, returns the fraction of its arguments.
@@ -136,7 +136,7 @@ result_type operator()(first_argument_type n, second_argument_type d);
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsFractionsConcepts
\cgalconcept
`AdaptableBinaryFunction`, finds great common factor of denominators.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromDoubleConstructible.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromDoubleConstructible.h
index 6bfcce92c81..88d341351d1 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromDoubleConstructible.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromDoubleConstructible.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsMiscellaneousConcepts
\cgalconcept
A model of the concept `FromDoubleConstructible` is required
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromIntConstructible.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromIntConstructible.h
index dbc356111d6..cb9eaf9e146 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromIntConstructible.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromIntConstructible.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsMiscellaneousConcepts
\cgalconcept
A model of the concept `FromIntConstructible` is required
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/IntegralDomain.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/IntegralDomain.h
index a7f8eb0a038..2d0d759ba13 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/IntegralDomain.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/IntegralDomain.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
`IntegralDomain` refines `IntegralDomainWithoutDivision` by
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/IntegralDomainWithoutDivision.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/IntegralDomainWithoutDivision.h
index f56d1cf0ae1..3f13d2ca5df 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/IntegralDomainWithoutDivision.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/IntegralDomainWithoutDivision.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
This is the most basic concept for algebraic structures considered within CGAL.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddable.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddable.h
index 54248932824..121737ad4f6 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddable.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddable.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsRealEmbeddableConcepts
\cgalconcept
A model of this concepts represents numbers that are embeddable on the real
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddableTraits--Abs.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddableTraits--Abs.h
index db580ef820e..1bc122079b4 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddableTraits--Abs.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddableTraits--Abs.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsRealEmbeddableConcepts
\cgalconcept
`AdaptableUnaryFunction` computes the absolute value of a number.
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddableTraits.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddableTraits.h
index 9ee054a53df..9421e97b8d1 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddableTraits.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RealEmbeddableTraits.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsRealEmbeddableConcepts
\cgalconcept
A model of `RealEmbeddableTraits` is associated to a number type
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RingNumberType.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RingNumberType.h
index c31c1755a72..963db3a2e38 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RingNumberType.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/RingNumberType.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsRealNumberTypesConcepts
\cgalconcept
The concept `RingNumberType` combines the requirements of the concepts
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/UniqueFactorizationDomain.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/UniqueFactorizationDomain.h
index 0a4be4fa6b0..8c099af8f9c 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/UniqueFactorizationDomain.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/UniqueFactorizationDomain.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalconcept
A model of `UniqueFactorizationDomain` is an `IntegralDomain` with the
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/PackageDescription.txt b/Algebraic_foundations/doc/Algebraic_foundations/PackageDescription.txt
index 733b839dc50..9f660861dc0 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/PackageDescription.txt
+++ b/Algebraic_foundations/doc/Algebraic_foundations/PackageDescription.txt
@@ -1,6 +1,47 @@
/// \defgroup PkgAlgebraicFoundations Algebraic Foundations
-/// \defgroup PkgAlgebraicFoundationsConcepts Concepts
+
+
+/// \defgroup PkgAlgebraicFoundationsAlgebraicStructures Algebraic Structures
/// \ingroup PkgAlgebraicFoundations
+
+/// \defgroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts Concepts
+/// \ingroup PkgAlgebraicFoundationsAlgebraicStructures
+
+
+/// \defgroup PkgAlgebraicFoundationsRealEmbeddable Real Embeddable
+/// \ingroup PkgAlgebraicFoundations
+
+/// \defgroup PkgAlgebraicFoundationsRealEmbeddableConcepts Concepts
+/// \ingroup PkgAlgebraicFoundationsRealEmbeddable
+
+
+/// \defgroup PkgAlgebraicFoundationsRealNumberTypes Real Number Types
+/// \ingroup PkgAlgebraicFoundations
+
+/// \defgroup PkgAlgebraicFoundationsRealNumberTypesConcepts Concepts
+/// \ingroup PkgAlgebraicFoundationsRealNumberTypes
+
+
+/// \defgroup PkgAlgebraicFoundationsInteroperability Interoperability
+/// \ingroup PkgAlgebraicFoundations
+
+/// \defgroup PkgAlgebraicFoundationsInteroperabilityConcepts Concepts
+/// \ingroup PkgAlgebraicFoundationsInteroperability
+
+
+/// \defgroup PkgAlgebraicFoundationsFractions Fractions
+/// \ingroup PkgAlgebraicFoundations
+
+/// \defgroup PkgAlgebraicFoundationsFractionsConcepts Concepts
+/// \ingroup PkgAlgebraicFoundationsFractions
+
+
+/// \defgroup PkgAlgebraicFoundationsMiscellaneous Miscellaneous
+/// \ingroup PkgAlgebraicFoundations
+
+/// \defgroup PkgAlgebraicFoundationsMiscellaneousConcepts Concepts
+/// \ingroup PkgAlgebraicFoundationsMiscellaneous
+
/*!
\addtogroup PkgAlgebraicFoundations
\todo check generated documentation