diff --git a/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h
index 087279e43f486af1e3c12d8656ba28019d0503ed..978f38e9e2b61073c988ef1ddb8962f2a2b701ae 100644
--- a/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h
+++ b/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h
@@ -30,6 +30,8 @@ namespace otb
  * not available, i.e. the compilation should pass, the runtime should
  * not segfault but of course, the behavior will be different.
  *
+ *
+ * \ingroup OTBCurlAdapters
  */
 class ITK_EXPORT CurlHelper : public CurlHelperInterface
 {
diff --git a/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
index 724301db1d85d2959de5a40ec50d642d272439f2..20176d0b2a8da2a77b63ff9c61e838986db1c761 100644
--- a/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
+++ b/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
@@ -32,6 +32,8 @@ namespace otb
  * This class implement the interface of the curl access allowing for
  * different implementation to be used (include stubs for test).
  *
+ *
+ * \ingroup OTBCurlAdapters
  */
 class ITK_EXPORT CurlHelperInterface : public itk::Object
 {
diff --git a/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h
index 659d9084819e33aff9f1a897819f544eec3b6e50..0f150cb9eec0d78e2866849141adde000f66a1ea 100644
--- a/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h
+++ b/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h
@@ -28,6 +28,8 @@ namespace otb
  *
  * This class is available only for testing purposes
  *
+ *
+ * \ingroup OTBCurlAdapters
  */
 class ITK_ABI_EXPORT CurlHelperStub : public CurlHelperInterface
 {
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
index 7774025173f04a6e7e3b9b3c776db7b3986e7d1c..921f4de97e2749b8e95cfb1b6476bdf1422b9822 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
@@ -29,6 +29,8 @@ namespace otb
  * \class GeometriesSet
  * \brief Common ITK type to manipulate any set of geometries: a \c otb::ogr::DataSource, or a \c otb::ogr::Layer.
  * \since OTB v 3.14.0
+ *
+ * \ingroup OTBGdalAdapters
  */
 class ITK_EXPORT GeometriesSet : public itk::DataObject
   {
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h
index 7fb98fb4902785803673fb61f76557a5155d1d6f..a5a1bc68ee54bf43d91460169eea442bf4f157ed 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h
@@ -59,6 +59,8 @@ namespace otb
  * ogr::DataSource can't be grafted, and as a consequence, \c GeometriesSource
  * subtypes can't be grafted as well.
  * \since OTB v 3.14.0
+ *
+ * \ingroup OTBGdalAdapters
  */
 class ITK_EXPORT GeometriesSource : public itk::ProcessObject, boost::noncopyable
   {
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
index 89fd40fe578e9f1c61bbe144a755e8a2ddc1a348..2b36e9c32e991f135f962d18ac15f63ff57a5b96 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
@@ -43,6 +43,8 @@ namespace otb
  * \class GeometriesToGeometriesFilter
  * Root abstract class for all geometries to geometries filters.
  * \since OTB v 3.14.0
+ *
+ * \ingroup OTBGdalAdapters
  */
 class ITK_EXPORT GeometriesToGeometriesFilter : public GeometriesSource
   {
@@ -239,6 +241,8 @@ private:
  * actual \c TransformationFunctor.
  * \since OTB v 3.14.0
  * \todo Add a specialization for \c ogr::Feature.
+ *
+ * \ingroup OTBGdalAdapters
  */
 template <class TransformationFunctor, class TransformedElementType, class FieldTransformationPolicy = FieldCopyTransformation>
 struct TransformationFunctorDispatcher
@@ -317,6 +321,8 @@ private:
  * what we need).
  * \since OTB v 3.14.0
  * \todo Find a better name
+ *
+ * \ingroup OTBGdalAdapters
  */
 template <class TransformationFunctor, class FieldTransformationPolicy = FieldCopyTransformation>
 class ITK_EXPORT DefaultGeometriesToGeometriesFilter
diff --git a/Modules/Adapters/GdalAdapters/include/otbImageReference.h b/Modules/Adapters/GdalAdapters/include/otbImageReference.h
index e5035ae085fa7f0c373e9197f0ead423e566aeac..83d0cc4df95946e7b1a9641d3ef23a95e6c8cb65 100644
--- a/Modules/Adapters/GdalAdapters/include/otbImageReference.h
+++ b/Modules/Adapters/GdalAdapters/include/otbImageReference.h
@@ -30,6 +30,8 @@ namespace ogr
  * \todo See how mix it with the \c otb::ogr::DataSource wrapper as it was
  * with \c VectorData.
  * \since OTB v 3.14.0
+ *
+ * \ingroup OTBGdalAdapters
  */
 template <typename TPrecision> class ImageReference
 {
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
index 6b5ce9b82b8d273f580fd455f36927724468efcc..0a37948fab58167d9426007187279e5468497bd8 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
@@ -59,6 +59,8 @@ namespace otb { namespace ogr {
  * - all functions related to the reference count.
  * \since OTB v 3.14.0
  * \internal As the class is not meant to be inherited, no new function is virtual.
+ *
+ * \ingroup OTBGdalAdapters
  */
 class DataSource : public itk::DataObject , public boost::noncopyable
   {
@@ -176,6 +178,8 @@ public:
    * instance.
    * \see http://www.boost.org/doc/libs/1_49_0/libs/iterator/doc/iterator_facade.html#tutorial-example
    * \since OTB v 3.14.0
+ *
+ * \ingroup OTBGdalAdapters
    */
   template <class Value> class layer_iter
     : public boost::iterator_facade<layer_iter<Value>, Value, boost::random_access_traversal_tag, Value>
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
index 51f6c1b628216ca578e99b24b814b14f85784913..a7c24b845661b3bf8e3f35ca3da2c7986a003efd 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
@@ -51,6 +51,8 @@ bool operator==(Feature const& lhs, Feature const& rhs);
  * se, as it may be null in some cases, for instance to define mark the \c
  * Layer::end() iterator.
  * \since OTB v 3.14.0
+ *
+ * \ingroup OTBGdalAdapters
  */
 class Feature
   {
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
index d3f686c72b45f37246a4dbc48c49f6617eebca45..cfe17bc37316d9462e88d6a02a247a526ab95bad 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
@@ -39,6 +39,8 @@ namespace otb { namespace ogr {
  * \c OGRFeatureDefn.
  * \sa OGRFieldDefn
  * \since OTB v 3.14.0
+ *
+ * \ingroup OTBGdalAdapters
  */
 class FieldDefn
   {
@@ -87,6 +89,8 @@ class Feature;
  * \invariant <tt>m_Feature->GetFieldDefnRef(m_index) != 0</tt>.
  * \sa OGRField
  * \since OTB v 3.14.0
+ *
+ * \ingroup OTBGdalAdapters
  */
 class Field
 {
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRHelpers.h b/Modules/Adapters/GdalAdapters/include/otbOGRHelpers.h
index 26416ecd3b97b6e36aa4af6bd5123fea47bbeb8e..109e9c2abb36b7c57698325bb36c9b1ae2a58027 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRHelpers.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRHelpers.h
@@ -51,6 +51,8 @@ namespace ogr
  * order to ensure the temporary vector of <tt>char*</tt> survives the call of
  * \c to_ogr(). Even when used as suggested by the example above, the vector
  * survives till the <tt>; </tt> at the end of the instruction.
+ *
+ * \ingroup OTBGdalAdapters
  */
 struct StringListConverter
 {
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
index 0e8d2158f738bf1287a4c24500fe5b616633b2b6..60a84b3624487b7ca7ba6eb3db38a03006f41b67 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
@@ -60,6 +60,8 @@ bool operator==(Layer const& lhs, Layer const& rhs);
  *
  * \todo Find a way to be notified when the related \c OGRDataSource is released
  * \since OTB v 3.14.0
+ *
+ * \ingroup OTBGdalAdapters
  */
 class Layer
   {
@@ -312,6 +314,8 @@ public:
    * instance.
    * \see http://www.boost.org/doc/libs/1_49_0/libs/iterator/doc/iterator_facade.html#tutorial-example
    * \since OTB v 3.14.0
+ *
+ * \ingroup OTBGdalAdapters
    */
   template <class Value> class feature_iter
     : public boost::iterator_facade<feature_iter<Value>, Value, boost::single_pass_traversal_tag>
diff --git a/Modules/Adapters/ITKPendingPatches/include/itkFFTComplexToComplexImageFilter.h b/Modules/Adapters/ITKPendingPatches/include/itkFFTComplexToComplexImageFilter.h
index 1ed4e964649c869b58aa2acee0cb2a1f272eff33..69b22e4c1098905dda8797a2e91564e893ae9b92 100644
--- a/Modules/Adapters/ITKPendingPatches/include/itkFFTComplexToComplexImageFilter.h
+++ b/Modules/Adapters/ITKPendingPatches/include/itkFFTComplexToComplexImageFilter.h
@@ -46,6 +46,8 @@ namespace itk
  *
  * \sa ForwardFFTImageFilter
  * \ingroup ITKReview
+ *
+ * \ingroup OTBITKPendingPatches
  */
 template< class TImage >
 class FFTComplexToComplexImageFilter:
diff --git a/Modules/Adapters/ITKPendingPatches/include/itkFFTWComplexToComplexImageFilter.h b/Modules/Adapters/ITKPendingPatches/include/itkFFTWComplexToComplexImageFilter.h
index 22509230ba2c482e5a6d2d1ff12a381ab78444cc..60939ebd9758433b4d0949038d7e94e68d1b87d7 100644
--- a/Modules/Adapters/ITKPendingPatches/include/itkFFTWComplexToComplexImageFilter.h
+++ b/Modules/Adapters/ITKPendingPatches/include/itkFFTWComplexToComplexImageFilter.h
@@ -51,6 +51,8 @@ namespace itk
  * \ingroup ITKReview
  *
  * \sa FFTWGlobalConfiguration
+ *
+ * \ingroup OTBITKPendingPatches
  */
 template< class TImage >
 class ITK_EXPORT FFTWComplexToComplexImageFilter:
diff --git a/Modules/Adapters/ITKPendingPatches/include/itkImageRegionMultidimensionalSplitter.h b/Modules/Adapters/ITKPendingPatches/include/itkImageRegionMultidimensionalSplitter.h
index e8c2fc06f336a5997c5ab1d91b9de72237d195a7..8844607899f7977323aaaffaac174493b545e940 100644
--- a/Modules/Adapters/ITKPendingPatches/include/itkImageRegionMultidimensionalSplitter.h
+++ b/Modules/Adapters/ITKPendingPatches/include/itkImageRegionMultidimensionalSplitter.h
@@ -55,6 +55,8 @@ namespace itk
  * implements the same algorithm.
  *
  * \ingroup ITKDeprecated
+ *
+ * \ingroup OTBITKPendingPatches
  */
 
 template< unsigned int VImageDimension >
diff --git a/Modules/Adapters/ITKPendingPatches/include/itkImageRegionSplitter.h b/Modules/Adapters/ITKPendingPatches/include/itkImageRegionSplitter.h
index 03fe4b8209bbafa531f165ed24f7902af73038cd..10934fffadd3584bea1cd0cff265d7edad6bdd24 100644
--- a/Modules/Adapters/ITKPendingPatches/include/itkImageRegionSplitter.h
+++ b/Modules/Adapters/ITKPendingPatches/include/itkImageRegionSplitter.h
@@ -63,6 +63,8 @@ namespace itk
 
  *
  * \ingroup ITKDeprecated
+ *
+ * \ingroup OTBITKPendingPatches
  */
 
 template< unsigned int VImageDimension >
diff --git a/Modules/Adapters/ITKPendingPatches/include/itkTransformToDisplacementFieldSource.h b/Modules/Adapters/ITKPendingPatches/include/itkTransformToDisplacementFieldSource.h
index c2c1e376c715d87761bd9754e86d1c207b79aa1b..dc9005bec4fdd1f2ffa62e67f953ab35b9d60ce5 100644
--- a/Modules/Adapters/ITKPendingPatches/include/itkTransformToDisplacementFieldSource.h
+++ b/Modules/Adapters/ITKPendingPatches/include/itkTransformToDisplacementFieldSource.h
@@ -50,6 +50,8 @@ namespace itk
  *
  * \ingroup GeometricTransform
  * \ingroup ITKReview
+ *
+ * \ingroup OTBITKPendingPatches
  */
 template< class TOutputImage,
           class TTransformPrecisionType = double >
diff --git a/Modules/Adapters/ITKPendingPatches/include/itkUnaryFunctorImageFilter.h b/Modules/Adapters/ITKPendingPatches/include/itkUnaryFunctorImageFilter.h
index 12e794d07d5daef97bf57d32c02ba5a7eb20eb96..2f764f19737f9684ef7223b44bcadf2ce9a5df3f 100644
--- a/Modules/Adapters/ITKPendingPatches/include/itkUnaryFunctorImageFilter.h
+++ b/Modules/Adapters/ITKPendingPatches/include/itkUnaryFunctorImageFilter.h
@@ -43,6 +43,8 @@ namespace itk
  * \wiki
  * \wikiexample{ImageProcessing/UnaryFunctorImageFilter,Apply a custom operation to each pixel in an image}
  * \endwiki
+ *
+ * \ingroup OTBITKPendingPatches
  */
 template< class TInputImage, class TOutputImage, class TFunction >
 class ITK_EXPORT UnaryFunctorImageFilter:public InPlaceImageFilter< TInputImage, TOutputImage >
diff --git a/Modules/Adapters/ITKPendingPatches/include/otbWarpImageFilter.h b/Modules/Adapters/ITKPendingPatches/include/otbWarpImageFilter.h
index 6ace761b7b6b6cd81816c0075aac123b93d6641e..c14092d74cc767c8cb728a0060c59a1b96362540 100644
--- a/Modules/Adapters/ITKPendingPatches/include/otbWarpImageFilter.h
+++ b/Modules/Adapters/ITKPendingPatches/include/otbWarpImageFilter.h
@@ -76,6 +76,8 @@ namespace otb
  * and deformation field type all have the same number of dimensions.
  *
  * \ingroup GeometricTransforms MultiThreaded Streamed
+ *
+ * \ingroup OTBITKPendingPatches
  */
 template <
   class TInputImage,
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h b/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
index f446e76b9015541ab547d2dd5d13ba1750679671..528144e916d3c06135cdb501bd37487718c5042d 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
@@ -79,6 +79,8 @@ namespace otb
  * DEM directory can either contain DTED or SRTM formats.
  * \ingroup Images
  *
+ *
+ * \ingroup OTBOSSIMAdapters
  */
 
 class ITK_EXPORT DEMHandler : public itk::Object
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h
index a8cd95dd387141eb7a1d8431298afdfb0df61ba5..f3734093599b82f496f34fdf79c1adfe3e551521 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h
@@ -33,6 +33,8 @@ namespace otb
  *
  *  This class provide functions to define, compare and measure times and dates.
  *
+ *
+ * \ingroup OTBOSSIMAdapters
  **/
 class DateTimeAdapter : public itk::Object
 {
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h
index 001c5ed733a51947a75254eac5a8f4b585cbfd5e..9764e772cac6c101e13c6963441ee8d8bb2017ba 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h
@@ -33,6 +33,8 @@ namespace otb
  *
  * \todo{Add the support for different ellipsoid models}
  *
+ *
+ * \ingroup OTBOSSIMAdapters
  **/
 
 class EllipsoidAdapter: public itk::Object
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h b/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h
index 48ff44dea1790b361bf38ad74f9b40401ce39473..d14e2f41f8b722e838a5178582bc1742dc4a5a98 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h
@@ -34,6 +34,8 @@ namespace otb
  * Those value can be directly read from the image metadatas.
  *
  * \ingroup IO
+ *
+ * \ingroup OTBOSSIMAdapters
  */
 class ITK_EXPORT FilterFunctionValues : public itk::DataObject
 {
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h
index 2075b8913f54c8909b54effec6e42179ba886503..e4395106f9613be992e476213ab5c83c29d5acb5 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h
@@ -43,6 +43,8 @@ class ImageKeywordlist;
  * information relative to the baseline. If necessary, it could be
  * extended to non SAR models, but the optical ossim classes would
  * need to be modified.
+ *
+ * \ingroup OTBOSSIMAdapters
  **/
 
 class GeometricSarSensorModelAdapter: public itk::Object
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h b/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
index 6808aa1edfa8ac0b5946504d5a0627514c31ed51..475665a60d7bf4cd158ac22a0a042ae65d155885 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
@@ -68,6 +68,8 @@ namespace internal
  *
  * \ingroup Projections
  *
+ *
+ * \ingroup OTBOSSIMAdapters
  */
 class ITK_EXPORT ImageKeywordlist
 {
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h
index 7edbc6a6b4107e0957c5174b0a2300c8d497390d..b935f8e7e00c05e397f47113594c3b2bf5cc3c20 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h
@@ -40,6 +40,8 @@ namespace otb
  * \sa GenericMapProjection
  * \ingroup Projection
  *
+ *
+ * \ingroup OTBOSSIMAdapters
  **/
 
 class MapProjectionAdapter: public itk::Object
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbMetaDataKey.h b/Modules/Adapters/OSSIMAdapters/include/otbMetaDataKey.h
index 0e117131c695f50f598156819a5a772dce4ea7eb..d563485bd5ce19b0898cf7365082d2315f320ab4 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbMetaDataKey.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbMetaDataKey.h
@@ -109,6 +109,8 @@ namespace MetaDataKey
  * \brief This OTB_GCP class is used to manage the GCP parameters
  * in OTB.
  *
+ *
+ * \ingroup OTBOSSIMAdapters
  */
 class ITK_EXPORT OTB_GCP
 {
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h
index 19a91f0dd8cda94b0e849515829ac47e8085ef36..ea0535417b3357872a60aa5f5da027df92720e91 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h
@@ -42,6 +42,8 @@ class ImageKeywordlist;
  * information relative to the baseline. If necessary, it could be
  * extended to non SAR models, but the optical ossim classes would
  * need to be modified.
+ *
+ * \ingroup OTBOSSIMAdapters
  **/
 
 class PlatformPositionAdapter: public itk::Object
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbRPCProjectionAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbRPCProjectionAdapter.h
index d478d517e3b41e1ce9cd7f09af297e24dafc80ca..084fc51a217ba5c5b830851b8a7b454ae6508165 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbRPCProjectionAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbRPCProjectionAdapter.h
@@ -44,6 +44,8 @@ class ImageKeywordlist;
  * \deprecated Please use the RpcSolverAdapter class static methods instead
  *
  * \sa GCPsToRPCSensorModelImageFilter
+ *
+ * \ingroup OTBOSSIMAdapters
  **/
 
 class RPCProjectionAdapter: public itk::Object
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbRPCSolverAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbRPCSolverAdapter.h
index ac4b9113583ae16ed3da06aa35e18711599e0e5b..3fe64808ca9136aec5556320ac3d115824f5b388 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbRPCSolverAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbRPCSolverAdapter.h
@@ -39,6 +39,8 @@ class ImageKeywordlist;
  *  This class defines some typedefs and exposes the RPC solving functions.
  *
  * \sa GCPsToRPCSensorModelImageFilter
+ *
+ * \ingroup OTBOSSIMAdapters
  **/
 
 class RPCSolverAdapter
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h
index f61b7b6b892cdbf9c7a315728f4b22a620811e76..25808e93d4c4a7ae6679b99180dbfea498638807 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h
+++ b/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h
@@ -40,6 +40,8 @@ class ImageKeywordlist;
  * \sa ForwardSensorModel
  * \ingroup Projection
  *
+ *
+ * \ingroup OTBOSSIMAdapters
  **/
 
 class SensorModelAdapter: public itk::Object
diff --git a/Modules/Adapters/OpenCVAdapters/include/otbBoostMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbBoostMachineLearningModelFactory.h
index 6820ebc95e672b2bf67dd1c01889566ceb647fa2..453abba5a81eb069506c079c0ddf63e73d807a06 100644
--- a/Modules/Adapters/OpenCVAdapters/include/otbBoostMachineLearningModelFactory.h
+++ b/Modules/Adapters/OpenCVAdapters/include/otbBoostMachineLearningModelFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class BoostMachineLearningModelFactory
  * \brief Creation d'un instance d'un objet SVMMachineLearningModel utilisant les object factory.
+ *
+ * \ingroup OTBOpenCVAdapters
  */
 template <class TInputValue, class TTargetValue>
 class ITK_EXPORT BoostMachineLearningModelFactory : public itk::ObjectFactoryBase
diff --git a/Modules/Adapters/OpenCVAdapters/include/otbDecisionTreeMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbDecisionTreeMachineLearningModelFactory.h
index 9f422d322b5179fabde2a184b86430f0caf34d9c..2c61e283229a081c691a6d85243dba8e452d3576 100644
--- a/Modules/Adapters/OpenCVAdapters/include/otbDecisionTreeMachineLearningModelFactory.h
+++ b/Modules/Adapters/OpenCVAdapters/include/otbDecisionTreeMachineLearningModelFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class DecisionTreeMachineLearningModelFactory
  * \brief Creation d'un instance d'un objet SVMMachineLearningModel utilisant les object factory.
+ *
+ * \ingroup OTBOpenCVAdapters
  */
 template <class TInputValue, class TTargetValue>
 class ITK_EXPORT DecisionTreeMachineLearningModelFactory : public itk::ObjectFactoryBase
diff --git a/Modules/Adapters/OpenCVAdapters/include/otbGradientBoostedTreeMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbGradientBoostedTreeMachineLearningModelFactory.h
index 914cd06e87675c9ea62df1a3220f60c0ccf50a9e..c15fc0205de78df594d82b9c2db7d650ebd1adc7 100644
--- a/Modules/Adapters/OpenCVAdapters/include/otbGradientBoostedTreeMachineLearningModelFactory.h
+++ b/Modules/Adapters/OpenCVAdapters/include/otbGradientBoostedTreeMachineLearningModelFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class GradientBoostedTreeMachineLearningModelFactory
  * \brief Creation d'un instance d'un objet SVMMachineLearningModel utilisant les object factory.
+ *
+ * \ingroup OTBOpenCVAdapters
  */
 template <class TInputValue, class TTargetValue>
 class ITK_EXPORT GradientBoostedTreeMachineLearningModelFactory : public itk::ObjectFactoryBase
diff --git a/Modules/Adapters/OpenCVAdapters/include/otbKNearestNeighborsMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbKNearestNeighborsMachineLearningModelFactory.h
index 43333c3027e73e585547178ec26fa6ee71ce4bf4..7be090ab885cd8a3abfc90b99e31f2cabc8ddd88 100644
--- a/Modules/Adapters/OpenCVAdapters/include/otbKNearestNeighborsMachineLearningModelFactory.h
+++ b/Modules/Adapters/OpenCVAdapters/include/otbKNearestNeighborsMachineLearningModelFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class KNearestNeighborsMachineLearningModelFactory
  * \brief Creation d'un instance d'un objet KNearestNeighborsMachineLearningModel utilisant les object factory.
+ *
+ * \ingroup OTBOpenCVAdapters
  */
 template <class TInputValue, class TTargetValue>
 class ITK_EXPORT KNearestNeighborsMachineLearningModelFactory : public itk::ObjectFactoryBase
diff --git a/Modules/Adapters/OpenCVAdapters/include/otbNeuralNetworkMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbNeuralNetworkMachineLearningModelFactory.h
index bf0e77fd401291535459cd96b9fe7f348da75ff8..1232f3ed4280263a2aeccb7600539213035e6406 100644
--- a/Modules/Adapters/OpenCVAdapters/include/otbNeuralNetworkMachineLearningModelFactory.h
+++ b/Modules/Adapters/OpenCVAdapters/include/otbNeuralNetworkMachineLearningModelFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class NeuralNetworkMachineLearningModelFactory
  * \brief Creation d'un instance d'un objet SVMMachineLearningModel utilisant les object factory.
+ *
+ * \ingroup OTBOpenCVAdapters
  */
 template <class TInputValue, class TTargetValue>
 class ITK_EXPORT NeuralNetworkMachineLearningModelFactory : public itk::ObjectFactoryBase
diff --git a/Modules/Adapters/OpenCVAdapters/include/otbNormalBayesMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbNormalBayesMachineLearningModelFactory.h
index b85ecbc6243b3950070c4b8c57e791d2da9265f1..b9aa11122841d2b175eb3941713e167aa4e61812 100644
--- a/Modules/Adapters/OpenCVAdapters/include/otbNormalBayesMachineLearningModelFactory.h
+++ b/Modules/Adapters/OpenCVAdapters/include/otbNormalBayesMachineLearningModelFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class NormalBayesMachineLearningModelFactory
  * \brief Creation d'un instance d'un objet SVMMachineLearningModel utilisant les object factory.
+ *
+ * \ingroup OTBOpenCVAdapters
  */
 template <class TInputValue, class TTargetValue>
 class ITK_EXPORT NormalBayesMachineLearningModelFactory : public itk::ObjectFactoryBase
diff --git a/Modules/Adapters/OpenCVAdapters/include/otbRandomForestsMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbRandomForestsMachineLearningModelFactory.h
index 87f56b140c1540398ced93803ab65e41d3d9f2d2..72a44a91fc3479ce70ba32e35a93e9aa775d0dd5 100644
--- a/Modules/Adapters/OpenCVAdapters/include/otbRandomForestsMachineLearningModelFactory.h
+++ b/Modules/Adapters/OpenCVAdapters/include/otbRandomForestsMachineLearningModelFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class RandomForestsMachineLearningModelFactory
  * \brief Creation d'un instance d'un objet RandomForestsMachineLearningModel utilisant les object factory.
+ *
+ * \ingroup OTBOpenCVAdapters
  */
 template <class TInputValue, class TTargetValue>
 class ITK_EXPORT RandomForestsMachineLearningModelFactory : public itk::ObjectFactoryBase
diff --git a/Modules/Adapters/OpenCVAdapters/include/otbSVMMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbSVMMachineLearningModelFactory.h
index 7bc70b8f0e7c7c5364c76e3131df1508def41570..11d0ae309cfc07e640df09c0594cd061fed686b7 100644
--- a/Modules/Adapters/OpenCVAdapters/include/otbSVMMachineLearningModelFactory.h
+++ b/Modules/Adapters/OpenCVAdapters/include/otbSVMMachineLearningModelFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class SVMMachineLearningModelFactory
  * \brief Creation d'un instance d'un objet SVMMachineLearningModel utilisant les object factory.
+ *
+ * \ingroup OTBOpenCVAdapters
  */
 template <class TInputValue, class TTargetValue>
 class ITK_EXPORT SVMMachineLearningModelFactory : public itk::ObjectFactoryBase
diff --git a/Modules/Adapters/OpenThreadsAdapters/include/otbThreads.h b/Modules/Adapters/OpenThreadsAdapters/include/otbThreads.h
index 2263145c9b8f5e665d98a8aa1b2f94d6782a8c3d..b48656787175268e9dd1d3507f1e50c282cef23c 100644
--- a/Modules/Adapters/OpenThreadsAdapters/include/otbThreads.h
+++ b/Modules/Adapters/OpenThreadsAdapters/include/otbThreads.h
@@ -27,6 +27,8 @@ namespace otb
  * Implement the sleep operation from openthreads to remove Monteverdi
  * dependance to openthreads at compile time.
  *
+ *
+ * \ingroup OTBOpenThreadsAdapters
  */
 class Threads
 {
diff --git a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.h b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.h
index 1c723ddbd88ae997db1a833dce27a896ce86a6ab..add5ec353b2494d3bc0c6bb57116711eb0261f1b 100644
--- a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.h
+++ b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.h
@@ -14,6 +14,7 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
+#define OTB_USE_OPENCV
 
 #include "otbWrapperApplicationFactory.h"
 
diff --git a/Modules/Core/Common/include/otbChannelSelectorFunctor.h b/Modules/Core/Common/include/otbChannelSelectorFunctor.h
index ae8ec86ad65997b5a2953de3656d2957acedcf75..8780dc3910fb36a07fd43e0ac2e8962523e22bf4 100644
--- a/Modules/Core/Common/include/otbChannelSelectorFunctor.h
+++ b/Modules/Core/Common/include/otbChannelSelectorFunctor.h
@@ -35,6 +35,8 @@ namespace Function
 *  \ingroup Visualization
 *
 * \sa AmplitudeFunctor PhaseFunctor
+ *
+ * \ingroup OTBCommon
 */
 template <class TInputPixel>
 class ChannelSelectorFunctor : public itk::Object
diff --git a/Modules/Core/Common/include/otbCommandLineArgumentParser.h b/Modules/Core/Common/include/otbCommandLineArgumentParser.h
index 6278642c5cd2b9f232d17ea95022d5c96d4dbb50..edb5805d05ffedda10e48f33849a234cc8763be8 100644
--- a/Modules/Core/Common/include/otbCommandLineArgumentParser.h
+++ b/Modules/Core/Common/include/otbCommandLineArgumentParser.h
@@ -27,6 +27,8 @@
 
 /** \class CommandLineArgumentParserHelpException
  * \brief This exception is thrown when the help menu is displayed.
+ *
+ * \ingroup OTBCommon
  */
 class ITK_EXPORT CommandLineArgumentParserHelpException
   : public itk::ExceptionObject
@@ -49,6 +51,8 @@ public:
 
 /** \class CommandLineArgumentParserVersionException
  * \brief This exception is thrown when the version is displayed.
+ *
+ * \ingroup OTBCommon
  */
 class ITK_EXPORT CommandLineArgumentParserVersionException
   : public itk::ExceptionObject
@@ -71,6 +75,8 @@ public:
 
 /** \class CommandLineArgumentParserArgumentErrorException
  * \brief This exception is thrown when the version is displayed.
+ *
+ * \ingroup OTBCommon
  */
 class ITK_EXPORT CommandLineArgumentParserArgumentErrorException
   : public itk::ExceptionObject
@@ -101,6 +107,8 @@ namespace otb
  * \brief Object returned by CommandLineArgumentParser
  *
  * \see CommandLineArgumentParser
+ *
+ * \ingroup OTBCommon
  */
 class ITK_EXPORT CommandLineArgumentParseResult : public itk::ProcessObject
 {
@@ -201,6 +209,8 @@ private:
  *      }
  *    }
  * \endcode
+ *
+ * \ingroup OTBCommon
  */
 class ITK_EXPORT CommandLineArgumentParser : public itk::ProcessObject
 {
diff --git a/Modules/Core/Common/include/otbCommandProgressUpdate.h b/Modules/Core/Common/include/otbCommandProgressUpdate.h
index f63d53da2e08cce222c279164a6c70e39b5a17ca..7842014eddc5049777d88a15dfd53a14dde1a6d9 100644
--- a/Modules/Core/Common/include/otbCommandProgressUpdate.h
+++ b/Modules/Core/Common/include/otbCommandProgressUpdate.h
@@ -29,6 +29,8 @@ namespace otb
 * \class CommandProgressUpdate
 * \brief TODO
 *
+ *
+ * \ingroup OTBCommon
 */
 template <class TFilter>
 class CommandProgressUpdate : public itk::Command
diff --git a/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h b/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
index 3e05e61b7c6eae1b7372d7d848b1c26c7430a590..6c2ab5ffc807ba570a0128a486320453385cb770 100644
--- a/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
+++ b/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
@@ -29,6 +29,8 @@ namespace otb
  *
  * \sa ComplexToPhaseImageFilter ComplexToModulusImageFilter
  * \ingroup IntensityImageFilters  Multithreaded
+ *
+ * \ingroup OTBCommon
  */
 
 namespace Function {
diff --git a/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h b/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h
index 3614e5f8558fcaad140223cd97aef879f89c4837..763447c38590cfbeae4f8266caeb752fbc726020 100644
--- a/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h
+++ b/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h
@@ -33,6 +33,8 @@ namespace otb
  *
  * \sa ComplexToImaginaryImageFilter
  * \sa ComplexToRealImageFilter
+ *
+ * \ingroup OTBCommon
  */
 namespace Functor {
 
diff --git a/Modules/Core/Common/include/otbConfigurationFile.h b/Modules/Core/Common/include/otbConfigurationFile.h
index d0b3d29b1d8711398ea16d1a60d2a464f0837ec3..c90de810875b8550a0f3a2176f4db361bdad0fd6 100644
--- a/Modules/Core/Common/include/otbConfigurationFile.h
+++ b/Modules/Core/Common/include/otbConfigurationFile.h
@@ -22,7 +22,7 @@
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
-#include "ConfigFile.h"
+#include "otb_configfile.h"
 #include "itksys/FundamentalType.h"
 
 namespace otb
@@ -33,6 +33,8 @@ namespace otb
  *
  *  The path to the file can be set with environment variable OTB_CONFIG_FILE
  *
+ *
+ * \ingroup OTBCommon
 */
 
 class ConfigurationFile
diff --git a/Modules/Core/Common/include/otbDecimateImageFilter.h b/Modules/Core/Common/include/otbDecimateImageFilter.h
index c1008b0c0be685b355e43047966b12fa72a3fa1f..d0edccc95bb698f120c46c632efcaa0e349828cb 100644
--- a/Modules/Core/Common/include/otbDecimateImageFilter.h
+++ b/Modules/Core/Common/include/otbDecimateImageFilter.h
@@ -34,6 +34,8 @@ namespace otb {
  *
  * \sa ResampleImageFilter
  * \sa SubsampleImageRegionConstIterator
+ *
+ * \ingroup OTBCommon
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT DecimateImageFilter :
diff --git a/Modules/Core/Common/include/otbDotProductImageFilter.h b/Modules/Core/Common/include/otbDotProductImageFilter.h
index 4aba646478274e7e4e7f72ed192a776ef0830291..ac78b385a93e59c4c484d4f9e5eeb501e6fc2095 100644
--- a/Modules/Core/Common/include/otbDotProductImageFilter.h
+++ b/Modules/Core/Common/include/otbDotProductImageFilter.h
@@ -30,6 +30,8 @@ namespace Functor {
  *
  * \brief Computes the dot product against a specific vector
  *
+ *
+ * \ingroup OTBCommon
  */
 template<class TInput, class TOutput>
 class DotProductFunctor
@@ -85,6 +87,8 @@ private:
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBCommon
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT DotProductImageFilter :
diff --git a/Modules/Core/Common/include/otbFilterWatcherBase.h b/Modules/Core/Common/include/otbFilterWatcherBase.h
index 65e6fe677b2a61d0f2669de3df8fbbd5944a016a..66a01f085710afc1d359f58ff753d0e2e4f8f221 100644
--- a/Modules/Core/Common/include/otbFilterWatcherBase.h
+++ b/Modules/Core/Common/include/otbFilterWatcherBase.h
@@ -37,6 +37,8 @@ namespace otb
  *  \li StartFilter  : callback called at the begin of process
  *  \li EndFilter    : callback called at the end of process
  *
+ *
+ * \ingroup OTBCommon
  */
 class /*ITK_EXPORT*/ FilterWatcherBase
 {
diff --git a/Modules/Core/Common/include/otbFunctionToImageFilter.h b/Modules/Core/Common/include/otbFunctionToImageFilter.h
index 02aa7bc26d0fe225a48e5b9d5c8396f981fd4c0b..9edb416f675bffbf5695746e93eb0c26c0cd70ae 100644
--- a/Modules/Core/Common/include/otbFunctionToImageFilter.h
+++ b/Modules/Core/Common/include/otbFunctionToImageFilter.h
@@ -46,6 +46,8 @@ namespace otb
  * \sa SpatialFunctionImageFilter
  * \sa ImageFunction
  * \ingroup ImageFilters
+ *
+ * \ingroup OTBCommon
  */
 
 template <class TInputImage, class TOutputImage, class TFunction>
diff --git a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
index 09e12a2007c84d333d92fab34f2172ff840084ce..f0f192dc0abc80aa46cbf9fa24d8bcc66b369966 100644
--- a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
+++ b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
@@ -113,6 +113,8 @@ protected:
  *
  * \sa itkMultiplyImageFilter
  * \ingroup itkBinaryFunctorImageFilter
+ *
+ * \ingroup OTBCommon
  */
 
 template <class TInputImage, class TVectorInputImage, class TOutputImage>
diff --git a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
index 5578b660cb76bd71ee3fdb8d1e6bf4a2befa9d83..16ce4cd343e5de0a6e871a993beeb3db27bee071 100644
--- a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
@@ -54,6 +54,8 @@ namespace otb
    *
    * \ingroup ITKSystemObjects
    * \ingroup DataProcessing
+ *
+ * \ingroup OTBCommon
  */
 
 template <unsigned int VImageDimension>
diff --git a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
index cdfa1ed4aa44354c9ea02be6e15fee7b745cc7a5..cf2a68bd8f1d7a36613e040c46eaa09f5549ed64 100644
--- a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
@@ -57,6 +57,8 @@ namespace otb
  *
  * \ingroup ITKSystemObjects
  * \ingroup DataProcessing
+ *
+ * \ingroup OTBCommon
  */
 
 template <unsigned int VImageDimension>
diff --git a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
index 8fe331d0e8654025c1220ec22fb00a4d077bc744..a9ad5ccb2375133623494e829bb0a99bc6348119 100644
--- a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
@@ -64,6 +64,8 @@ namespace otb
    *
    * \ingroup ITKSystemObjects
    * \ingroup DataProcessing
+ *
+ * \ingroup OTBCommon
  */
 
 template <unsigned int VImageDimension>
diff --git a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
index 6f117c929b6c0dfe48e35288e5d790b4c007f06b..34a3ea7800190c5d939aaba4d6708c7180ae7fa0 100644
--- a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
@@ -64,6 +64,8 @@ namespace otb
    *
    * \ingroup ITKSystemObjects
    * \ingroup DataProcessing
+ *
+ * \ingroup OTBCommon
  */
 
 template <unsigned int VImageDimension>
diff --git a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
index 91afd981139e803b2bb6d971d8cca3d44dd6365d..359edfd4c3ffbfdad23e6b8efa8c8d47ac8e45c3 100644
--- a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
+++ b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * GetOutput() method return the output image modulus and
  * GetOutputDirection() return the output image direction
  *
+ *
+ * \ingroup OTBCommon
  */
 template <class TInputImage,
     class TOutputImage,
diff --git a/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h b/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h
index 48f7ff800569519cfab9d262d6099a1ea82adb8f..e84721599d9f92a8929b913443f74bfbae6c2d8d 100644
--- a/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h
+++ b/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h
@@ -29,6 +29,8 @@ namespace otb
  *
  * \sa ImaginaryImageToComplexImageFilter
  * \ingroup Multithreaded
+ *
+ * \ingroup OTBCommon
  */
 
 namespace Function {
diff --git a/Modules/Core/Common/include/otbImportImageFilter.h b/Modules/Core/Common/include/otbImportImageFilter.h
index 015a3ac581aa6c04d4bfa28a49152efaf873c6eb..c5a927129ea279c33274144cb5dc7d960c31eb9c 100644
--- a/Modules/Core/Common/include/otbImportImageFilter.h
+++ b/Modules/Core/Common/include/otbImportImageFilter.h
@@ -36,6 +36,8 @@ namespace otb
  *
  * This class is templated over the output Image Type
  *
+ *
+ * \ingroup OTBCommon
  */
 
 template <typename TOutputImageType>
diff --git a/Modules/Core/Common/include/otbImportVectorImageFilter.h b/Modules/Core/Common/include/otbImportVectorImageFilter.h
index 22d21f8ee5a53d89222df71747562bb951eaa035..08ebbf63cdf6469b1686c1683476affe3f7fb835 100644
--- a/Modules/Core/Common/include/otbImportVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbImportVectorImageFilter.h
@@ -36,6 +36,8 @@ namespace otb
  *
  * This class is templated over the output Image Type
  *
+ *
+ * \ingroup OTBCommon
  */
 
 template <typename TOutputImageType>
diff --git a/Modules/Core/Common/include/otbMachineLearningModel.h b/Modules/Core/Common/include/otbMachineLearningModel.h
index 9f2c39e7dcbf0a4f978b7223ea04be9095684a2e..9ecd77eb01efa6209afe80cf3a42c41226820729 100644
--- a/Modules/Core/Common/include/otbMachineLearningModel.h
+++ b/Modules/Core/Common/include/otbMachineLearningModel.h
@@ -57,6 +57,8 @@ namespace otb
  * \sa NeuralNetworkMachineLearningModel
  * \sa ImageClassificationFilter
  *
+ *
+ * \ingroup OTBCommon
  */
 template <class TInputValue, class TTargetValue>
 class ITK_EXPORT MachineLearningModel
diff --git a/Modules/Core/Common/include/otbModelComponentBase.h b/Modules/Core/Common/include/otbModelComponentBase.h
index e80e6b8d5f72ab416c1dc3f5c184ffa08cd957ca..cdf80a0fa23f9a2b55e079429e7d3519c0532ad4 100644
--- a/Modules/Core/Common/include/otbModelComponentBase.h
+++ b/Modules/Core/Common/include/otbModelComponentBase.h
@@ -55,6 +55,8 @@ namespace Statistics
  * to membership functions from different distributional model
  *
  * \sa FIXME: StochasticExpectationMaximizationMixtureModelEstimator
+ *
+ * \ingroup OTBCommon
  */
 
 template<class TSample>
diff --git a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
index 6e2b3cbd0a4fb5bd88c057e7dbd95c9b2a97d178..80be874f90fd44fea0fb9bb9bc9ff39165bb77c1 100644
--- a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
+++ b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
@@ -37,6 +37,8 @@ namespace otb
  * \sa TernaryFunctorImageFilter, BinaryFunctorImageFilter UnaryFunctorImageFilter
  *
  * \ingroup IntensityImageFilters Multithreaded
+ *
+ * \ingroup OTBCommon
  */
 template <class TInputImage1, class TInputImage2,
     class TInputImage3, class TInputImage4,
diff --git a/Modules/Core/Common/include/otbRGBAPixelConverter.h b/Modules/Core/Common/include/otbRGBAPixelConverter.h
index fdb4bcfc454a92ac13ba588f5c32eaef1f59cab0..932b4ba31148ef274e77c3185492b269df4bf62b 100644
--- a/Modules/Core/Common/include/otbRGBAPixelConverter.h
+++ b/Modules/Core/Common/include/otbRGBAPixelConverter.h
@@ -33,6 +33,8 @@ namespace otb
  * To be usable, the desired convertion must be implemented through
  * partial specialisation mecanism.
  *
+ *
+ * \ingroup OTBCommon
  */
 
 
diff --git a/Modules/Core/Common/include/otbRectangle.h b/Modules/Core/Common/include/otbRectangle.h
index 552947ba15c46d4d951273c98dcb42f45f1bf045..c6d6c07b4f1b95c236af694d6936db980ae6c55d 100644
--- a/Modules/Core/Common/include/otbRectangle.h
+++ b/Modules/Core/Common/include/otbRectangle.h
@@ -29,6 +29,8 @@ namespace otb
  *
  *  A rectangle is defined by the median of the width, an orientation and a width
  *
+ *
+ * \ingroup OTBCommon
  */
 template<class TValue = double>
 class ITK_EXPORT Rectangle
diff --git a/Modules/Core/Common/include/otbStandardFilterWatcher.h b/Modules/Core/Common/include/otbStandardFilterWatcher.h
index 5e4fd7f69037855a477e3e2c9b89a0605bf2bc07..53b9cb67cb3e0940f283e4bf10c6ad4d80673368 100644
--- a/Modules/Core/Common/include/otbStandardFilterWatcher.h
+++ b/Modules/Core/Common/include/otbStandardFilterWatcher.h
@@ -45,6 +45,8 @@ namespace otb
  *
  *  \see itk::SimpleFilterWatcher
  *  \see otb::fltkFilterWatcher
+ *
+ * \ingroup OTBCommon
  */
 class /*ITK_EXPORT*/ StandardFilterWatcher : public FilterWatcherBase
 {
diff --git a/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h b/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
index feac7b60a99dd542daac9ec77bee620d2459a57c..4508b4632c666d34d5800d22caf73fe2e288187e 100644
--- a/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
+++ b/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
@@ -45,6 +45,8 @@ namespace otb
  *
  *  \see itk::SimpleFilterWatcher
  *  \see otb::fltkFilterWatcher
+ *
+ * \ingroup OTBCommon
  */
 class /*ITK_EXPORT*/ StandardOneLineFilterWatcher : public FilterWatcherBase
 {
diff --git a/Modules/Core/Common/include/otbStandardWriterWatcher.h b/Modules/Core/Common/include/otbStandardWriterWatcher.h
index 180d6ee478d7856213ac6b751b9a5c1c26b4144a..4bb1aa5ed3625112c07209e6b0474bee08bd2d3d 100644
--- a/Modules/Core/Common/include/otbStandardWriterWatcher.h
+++ b/Modules/Core/Common/include/otbStandardWriterWatcher.h
@@ -45,6 +45,8 @@ namespace otb
  *
  *  \see itk::SimpleWriterWatcher
  *  \see otb::fltkWriterWatcher
+ *
+ * \ingroup OTBCommon
  */
 class /*ITK_EXPORT*/ StandardWriterWatcher : public WriterWatcherBase
 {
diff --git a/Modules/Core/Common/include/otbSubsampledImageRegionIterator.h b/Modules/Core/Common/include/otbSubsampledImageRegionIterator.h
index dc698b0662d010a4d5f9cce9c5ba2d14ba2eae64..eb0e45d7d06350ce55ae0a1e7e49264ab622b95f 100644
--- a/Modules/Core/Common/include/otbSubsampledImageRegionIterator.h
+++ b/Modules/Core/Common/include/otbSubsampledImageRegionIterator.h
@@ -36,6 +36,8 @@ namespace otb {
  *
  * \ingroup ImageIterator
  * \sa SubsampledImageRegionConstIterator
+ *
+ * \ingroup OTBCommon
  */
 template <class TImage>
 class ITK_EXPORT SubsampledImageRegionIterator
diff --git a/Modules/Core/Common/include/otbSystem.h b/Modules/Core/Common/include/otbSystem.h
index 0bfee0d30c7c98631df8bef7d940f42ce096c0dc..eecd10785ab4a2359b8e23234a41489ed209bd83 100644
--- a/Modules/Core/Common/include/otbSystem.h
+++ b/Modules/Core/Common/include/otbSystem.h
@@ -32,6 +32,8 @@ namespace otb
  *
  * System operations, filename or strings manipulations, etc.
  *
+ *
+ * \ingroup OTBCommon
  */
 class ITK_EXPORT System
 {
diff --git a/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h
index 418cfc26c503790ac09a74a675874a01bfec5c9a..e0df8601f86bbcd534c0a3e53842cf8cf2cc7e63 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h
@@ -34,6 +34,8 @@ namespace otb
  * remains unchanged.
  *
  * \sa itk::UnaryFunctorImageFilter
+ *
+ * \ingroup OTBCommon
  */
 template <class TInputImage, class TOutputImage, class TFunction>
 class ITK_EXPORT UnaryFunctorImageFilter : public itk::UnaryFunctorImageFilter<TInputImage, TOutputImage, TFunction>
diff --git a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
index 532a1c0c39ef47a40453e27eb27aac1e8ad616a2..ba29df414a9730478720e8535769ebfcd9f12d9b 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * operation to be applied.  A Functor style is used.
  *
  * \ingroup IntensityImageFilters   Multithreaded
+ *
+ * \ingroup OTBCommon
  */
 template <class TInputImage, class TOutputImage, class TFunction>
 class ITK_EXPORT UnaryFunctorNeighborhoodVectorImageFilter
diff --git a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
index fcde10f8041a815ad263c2e72e6824227bcde277..47bf386febcedbad4178998abe9f88b0ef1c8fd1 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
@@ -30,6 +30,8 @@ namespace otb
  * operation to be applied.  A Functor style is used.
  *
  * \ingroup IntensityImageFilters   Multithreaded
+ *
+ * \ingroup OTBCommon
  */
 template <class TInputImage, class TOutputImage, class TFunction>
 class ITK_EXPORT UnaryFunctorVectorImageFilter
diff --git a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
index dc15c8d0ab47bd5192f2b320d2a516998d096361..6ec57f90ef0ba9c3e426dccec5c41b8de0279d0f 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * operation to be applied.  A Functor style is used.
  *
  * \ingroup IntensityImageFilters   Multithreaded
+ *
+ * \ingroup OTBCommon
  */
 template <class TInputImage, class TOutputImage, class TFunction>
 class ITK_EXPORT UnaryFunctorWithIndexWithOutputSizeImageFilter
diff --git a/Modules/Core/Common/include/otbUniformAlphaBlendingFunctor.h b/Modules/Core/Common/include/otbUniformAlphaBlendingFunctor.h
index 47a18a7b287e9f7000fcc20737cc0ce301296716..fe69507c8c99142a728cef296e6dd61d83427a24 100644
--- a/Modules/Core/Common/include/otbUniformAlphaBlendingFunctor.h
+++ b/Modules/Core/Common/include/otbUniformAlphaBlendingFunctor.h
@@ -31,6 +31,8 @@ namespace Functor
  * \brief Implements simple blending
  * For each channel the blending function is as follows:
  * \f[ P_{o} = \alpha P_{i1} + (1 - \alpha) P_{i2} \f]
+ *
+ * \ingroup OTBCommon
  */
 
 template<class TInputPixel, class TInputPixel2, class TOutputPixel>
diff --git a/Modules/Core/Common/include/otbUtils.h b/Modules/Core/Common/include/otbUtils.h
index dd0b5b8c1007a6933ac13ba4cde3c5e393413205..0894276c627fe23cab1bb58087a71477bc39bc76 100644
--- a/Modules/Core/Common/include/otbUtils.h
+++ b/Modules/Core/Common/include/otbUtils.h
@@ -28,6 +28,8 @@ namespace otb
  *
  * Some usefull utilities in use across the library
  *
+ *
+ * \ingroup OTBCommon
  */
 namespace Utils
 {
diff --git a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
index 7497bdb57fd126e107f4987480a6230b6d6c79d7..febc9c5d4845f74d19779359b3e31e55f3a92d51 100644
--- a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
+++ b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
@@ -34,6 +34,8 @@ namespace otb
  * To be usable, the desired convertion must be implemented through
  * partial specialisation mecanism.
  *
+ *
+ * \ingroup OTBCommon
  */
 
 //Base
diff --git a/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h b/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h
index 879777e8dbcbe0dcc4a6bc095f6c88f79a61e523..48832da89e4907315a0260a8489c728f3808a104 100644
--- a/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h
+++ b/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h
@@ -31,6 +31,8 @@ namespace otb
  *
  * \ingroup ImageAdaptors
  *
+ *
+ * \ingroup OTBCommon
  */
 template <class TImage>
 class ITK_EXPORT VectorImageToASImageAdaptor : public
diff --git a/Modules/Core/Common/include/otbVectorImageToASPixelAccessor.h b/Modules/Core/Common/include/otbVectorImageToASPixelAccessor.h
index dbe8620c4c48f0db0f0c99479d92a18ad94a95fa..4fefbcaf8f6c819ec5ae7b47e73dc5ab6a7e49fa 100644
--- a/Modules/Core/Common/include/otbVectorImageToASPixelAccessor.h
+++ b/Modules/Core/Common/include/otbVectorImageToASPixelAccessor.h
@@ -36,6 +36,8 @@ namespace Accessor
  * \sa ImageAdaptor
  * \ingroup ImageAdaptors
  *
+ *
+ * \ingroup OTBCommon
  */
 
 template <class T>
diff --git a/Modules/Core/Common/include/otbWriterWatcherBase.h b/Modules/Core/Common/include/otbWriterWatcherBase.h
index 9658fd8764f0de2b81f479836f58aa301e2507eb..657733eedf1a0c9068555b6c3dd2641e14704763 100644
--- a/Modules/Core/Common/include/otbWriterWatcherBase.h
+++ b/Modules/Core/Common/include/otbWriterWatcherBase.h
@@ -40,6 +40,8 @@ namespace otb
  *  \li StartFilter        : callback called at the begin of filter execution for a given tile
  *  \li EndFilter          : callback called at the end of filter execution for a given tile
  *
+ *
+ * \ingroup OTBCommon
  */
 class /*ITK_EXPORT*/ WriterWatcherBase
 {
diff --git a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
index 40053d627cb26b38026baf2577c839605cc34176..36c022f185c67bf5410fd535ad8e0d85431957bb 100644
--- a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
+++ b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
@@ -33,6 +33,8 @@ namespace otb
  * OutputConvertTraits() is the traits class.  The default one used is
  * DefaultConvertPixelTraits.
  *
+ *
+ * \ingroup OTBImageBase
  */
 template <
   typename InputPixelType,
diff --git a/Modules/Core/ImageBase/include/otbDefaultConvertPixelTraits.h b/Modules/Core/ImageBase/include/otbDefaultConvertPixelTraits.h
index f1009bced6971822e38368e1d5e7f31cb70e5374..343bfc1acb96ad5eb5cac335a90967714681916f 100644
--- a/Modules/Core/ImageBase/include/otbDefaultConvertPixelTraits.h
+++ b/Modules/Core/ImageBase/include/otbDefaultConvertPixelTraits.h
@@ -34,6 +34,8 @@ namespace otb
  *  This implementation does a simple assignment operator, so if you are
  *  going from a higher bit representation to a lower bit one (int to
  *  char), you may want to specialize and add some sort of transfer function.
+ *
+ * \ingroup OTBImageBase
  */
 template<typename PixelType>
 class DefaultConvertPixelTraits
diff --git a/Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValue.h b/Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValue.h
index 62aa5bc8e2f6720173457b9cfa4ae2fab84cecca..94fd9bc21214efbdb8604712073f047eb09a23ff 100644
--- a/Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValue.h
+++ b/Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValue.h
@@ -40,6 +40,8 @@ namespace Statistics {
  *
  * \sa EuclideanDistanceMetric
  * \sa EuclideanDistanceMetricWithMissingValuePow2
+ *
+ * \ingroup OTBImageBase
  */
 template<class TVector>
 class ITK_EXPORT EuclideanDistanceMetricWithMissingValue :
diff --git a/Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValuePow2.h b/Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
index b716b6c60ae67c09852d21c09aebead843cbc07f..383454fef0fa9f00111a87e8e5d2975e3ea3bc11 100644
--- a/Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
+++ b/Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
@@ -42,6 +42,8 @@ namespace Statistics {
  *
  * \sa EuclideanDistanceMetric
  * \sa EuclideanDistanceMetricWithMissingValue
+ *
+ * \ingroup OTBImageBase
  */
 template<class TVector>
 class ITK_EXPORT EuclideanDistanceMetricWithMissingValuePow2 :
diff --git a/Modules/Core/ImageBase/include/otbExtractROI.h b/Modules/Core/ImageBase/include/otbExtractROI.h
index fc46dfa29751f2e892abfe4bb9f96f9946ee5635..831456ad0488a3bf526f4a6d3a095023608b98c8 100644
--- a/Modules/Core/ImageBase/include/otbExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbExtractROI.h
@@ -32,6 +32,8 @@ namespace otb
  * \note Parameter to this class are the input pixel type and the output
  * pixel type.
  *
+ *
+ * \ingroup OTBImageBase
  */
 template <class TInputPixel, class TOutputPixel>
 class ITK_EXPORT ExtractROI :
diff --git a/Modules/Core/ImageBase/include/otbExtractROIBase.h b/Modules/Core/ImageBase/include/otbExtractROIBase.h
index 01374f835561657dd6ce9c7837c256d647363590..7112ad4f6b040a24cdfa859e1b0ffdb8ccd95a62 100644
--- a/Modules/Core/ImageBase/include/otbExtractROIBase.h
+++ b/Modules/Core/ImageBase/include/otbExtractROIBase.h
@@ -38,6 +38,8 @@ namespace otb
  *
  * \ingroup Common
  *
+ *
+ * \ingroup OTBImageBase
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ExtractROIBase :
diff --git a/Modules/Core/ImageBase/include/otbFlexibleDistanceWithMissingValue.h b/Modules/Core/ImageBase/include/otbFlexibleDistanceWithMissingValue.h
index f954e159f7f62d9bcbf5406d106fe9c421402b6a..2aa1801932bda0b6b40725f7f03fe275068aca83 100644
--- a/Modules/Core/ImageBase/include/otbFlexibleDistanceWithMissingValue.h
+++ b/Modules/Core/ImageBase/include/otbFlexibleDistanceWithMissingValue.h
@@ -45,6 +45,8 @@ namespace Statistics {
  * The only restriction is that elements have to support \code NaN \endcode.
  *
  * \sa EuclideanDistanceMetricWithMissingValuePow2
+ *
+ * \ingroup OTBImageBase
  */
 template<class TVector>
 class ITK_EXPORT FlexibleDistanceWithMissingValue :
diff --git a/Modules/Core/ImageBase/include/otbImage.h b/Modules/Core/ImageBase/include/otbImage.h
index 919f8cc31f6d9f77f5d1f7c2b2496bd9426bf1da..6ba202e938153c08f1662d0581b176590f7c326b 100644
--- a/Modules/Core/ImageBase/include/otbImage.h
+++ b/Modules/Core/ImageBase/include/otbImage.h
@@ -26,6 +26,8 @@ namespace otb
 /** \class Image
  * \brief Creation of an "otb" image which contains metadata.
  *
+ *
+ * \ingroup OTBImageBase
  */
 
 template <class TPixel, unsigned int VImageDimension = 2>
diff --git a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
index ea85901ff476cd8dee1c9da1d614d9d80c77da13..0f461ddecc92f83c2faeffbc4a9807cee6357d8a 100644
--- a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
+++ b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
@@ -38,6 +38,8 @@ namespace otb
  *
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBImageBase
  */
 
 template< class TInternalImageFunctionType, class TOutputPrecision = double >
diff --git a/Modules/Core/ImageBase/include/otbImageIOBase.h b/Modules/Core/ImageBase/include/otbImageIOBase.h
index e9d96b7f9aacd353939985830049dae69af1ccc2..94785c1cf7367478dc68cc5ed047d7335b97a35a 100644
--- a/Modules/Core/ImageBase/include/otbImageIOBase.h
+++ b/Modules/Core/ImageBase/include/otbImageIOBase.h
@@ -53,6 +53,8 @@ namespace otb
  *
  * \ingroup IOFilters
  *
+ *
+ * \ingroup OTBImageBase
  */
 class ITK_EXPORT ImageIOBase : public itk::LightProcessObject
 {
@@ -76,6 +78,8 @@ public:
   /**
    * \class UnknownType
    * Used to return information when types are unknown.
+ *
+ * \ingroup OTBImageBase
    */
   class UnknownType {};
 
diff --git a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
index 85d00f97e44a773b9a16b6b216ea262d88299595..027e1497c82d9362ebe31e8819e77289c6b7bdad 100644
--- a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
@@ -30,6 +30,8 @@ namespace otb
 /** \class ImageOfVectorsToMonoChannelExtractROI
  * \brief
  * \todo Document this class
+ *
+ * \ingroup OTBImageBase
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ImageOfVectorsToMonoChannelExtractROI :
diff --git a/Modules/Core/ImageBase/include/otbMetaImageFunction.h b/Modules/Core/ImageBase/include/otbMetaImageFunction.h
index deca40ce79ae3de1d6eb3a2fe53c589f4ef4f6f8..59023a419405887303cb7ac974e0058bc26da040 100644
--- a/Modules/Core/ImageBase/include/otbMetaImageFunction.h
+++ b/Modules/Core/ImageBase/include/otbMetaImageFunction.h
@@ -37,6 +37,8 @@ namespace otb
  *  a VariableLengthVector.
  *
  *  \ingroup ImageFunction
+ *
+ * \ingroup OTBImageBase
  */
 template <class TOutputPrecision = double, class TCoordRep = double>
 class ITK_EXPORT MetaImageFunction
diff --git a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
index 99632088a679d399461a73dd0c281503b0e2efc1..1744295145326233e11a5ddbb69e8f06c9a02ed3 100644
--- a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
@@ -36,6 +36,8 @@ namespace otb
  *
  * \note If no channels are specified, then all channels from the input image are selected.
  * \note The image manipulated inside this class are of type otb::VectorImage.
+ *
+ * \ingroup OTBImageBase
  */
 template <class TInputPixelType, class TOutputPixelType>
 class ITK_EXPORT MultiChannelExtractROI :
diff --git a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
index d5a528b774736ab8ad117734a961940392c3a1c4..f08cfa46b0b66eb3876368222f10574723e6da7b 100644
--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
@@ -35,6 +35,8 @@ namespace otb
  * \note If nothing is specified, only the first channel is processed.
  * \note This class is templated over the pixel types of the input and output images.
  * The input image has to be an otb::VectorImage, whereas the output image has to be an otb::Image.
+ *
+ * \ingroup OTBImageBase
  */
 template <class TInputPixelType, class TOutputPixelType>
 class ITK_EXPORT MultiToMonoChannelExtractROI :
diff --git a/Modules/Core/ImageBase/include/otbVectorImage.h b/Modules/Core/ImageBase/include/otbVectorImage.h
index 0d771f4f4f0abd2591324a2db81e760abf8c5250..3b9468dd5a632d12846af9cf6d19f0385f204c95 100644
--- a/Modules/Core/ImageBase/include/otbVectorImage.h
+++ b/Modules/Core/ImageBase/include/otbVectorImage.h
@@ -26,6 +26,8 @@ namespace otb
 /** \class VectorImage
  * \brief Creation of an "otb" vector image which contains metadata.
  *
+ *
+ * \ingroup OTBImageBase
  */
 template <class TPixel, unsigned int VImageDimension = 2>
 class ITK_EXPORT VectorImage : public itk::VectorImage<TPixel, VImageDimension>
diff --git a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
index b338bd82ecb06a011897c3cd2c8fa805348fb862..0baf3bb53da49858393f6f92bc586fd1ef938fb7 100644
--- a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
@@ -46,6 +46,8 @@ namespace otb
  * function.
  *
  * \ingroup ImageFunctions ImageInterpolators
+ *
+ * \ingroup OTBInterpolation
  */
 template< class TInputImage, class TCoordRep = double >
 class ITK_EXPORT BCOInterpolateImageFunctionBase :
diff --git a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
index 484c8edff64d076f91abe942765248e97e6a5cd5..48cafebae4d52cc8749ba7b34c5625fa9a5fc5b6 100644
--- a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
+++ b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
@@ -33,6 +33,8 @@ namespace otb
  * class.
  * \sa itk::BSplineDecompositionImageFilter
  * \ingroup ImageFilters
+ *
+ * \ingroup OTBInterpolation
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT BSplineDecompositionImageFilter :
diff --git a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
index 4f87dc491cc8ad3256d08b92aaca3748209da54c..f84a97cb6c09070b13793b31d29cd591b63efa2d 100644
--- a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
@@ -38,6 +38,8 @@ namespace otb
  * \sa otb::BSplineDecompositionImageFilter
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBInterpolation
  */
 template <
     class TImageType,
diff --git a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
index 7fd61dd31e0ae1ef825ae6435fc80cfe54d19807..d27ee46e03174e4223aadf40bef668fe9536bd5c 100644
--- a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
@@ -34,6 +34,8 @@ namespace otb
  * The Initialize() method need to be call to create the filter.
  *
  * \ingroup ImageFunctions ImageInterpolators
+ *
+ * \ingroup OTBInterpolation
  */
 template <class TInputImage, class TFunction, class TBoundaryCondition = itk::ZeroFluxNeumannBoundaryCondition<TInputImage>,
     class TCoordRep = double>
diff --git a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
index cf6c0b6f91cf6e12c6cfdf3e73ba42a0a30440ab..705e93d5f4746df6ecf32abc8fb7d5bdcf3f6986 100644
--- a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
@@ -34,6 +34,8 @@ namespace Function
  * \brief Prolate function give the value of the prolate profile following
  * one of the 2 image dimension.
  *
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInput, class TOutput>
 class ProlateFunction
@@ -252,6 +254,8 @@ private:
  * The Initialize() method need to be call to create the filter.
  *
  * \ingroup ImageFunctions ImageInterpolators
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
diff --git a/Modules/Core/Interpolation/include/otbStreamingTraits.h b/Modules/Core/Interpolation/include/otbStreamingTraits.h
index 4d542fb6c8bb5ea15207f166d25767e5d5495e7d..b973290a3295a04d78ce24b35b97225f662731ee 100644
--- a/Modules/Core/Interpolation/include/otbStreamingTraits.h
+++ b/Modules/Core/Interpolation/include/otbStreamingTraits.h
@@ -60,6 +60,8 @@ typedef enum
  * \sa ImageFileWriter
  * \sa StreamingStatisticsImageFilter
  * \sa StreamingResampleImageFilter
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TImage>
 class ITK_EXPORT StreamingTraitsBase
@@ -114,6 +116,8 @@ public:
  * \sa ImageFileWriter
  * \sa StreamingStatisticsImageFilter
  * \sa StreamingResampleImageFilter
+ *
+ * \ingroup OTBInterpolation
  */
 template <class TImage>
 class ITK_EXPORT StreamingTraits
@@ -164,6 +168,8 @@ public:
   * \sa ImageFileWriter
   * \sa StreamingStatisticsImageFilter
   * \sa StreamingResampleImageFilter
+ *
+ * \ingroup OTBInterpolation
   */
 template <typename TPixel, unsigned int VImageDimension>
 class ITK_EXPORT StreamingTraits< otb::VectorImage<TPixel, VImageDimension> >
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h
index b64f4b4ef9bdae0cce3337ebb87395e1f97f81a8..ddbe8e3b19d60f78b2c634aea4de2c64438bc071 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h
@@ -31,6 +31,8 @@ namespace Function
  * \brief Window function for sinc interpolation.
  * \f[ w(x) = 0.42 + 0.5 cos(\frac{\pi x}{m}) + 0.08 cos(\frac{2 \pi x}{m}) \f]
  * \sa WindowedSincInterpolateImageBlackmanFunction
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInput = double, class TOutput = double>
 class BlackmanWindowFunction
@@ -83,6 +85,8 @@ private:
  * \sa Function::LanczosWindowFunction
  * \sa Function::BlackmanWindowFunction
  * \ingroup ImageFunctionBases ImageInterpolators
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h
index 397f1f1a02e54ca66e10e9afc8efa927cfafd264..a00ce82ee57a6568556f2936634e4f33e0361ff1 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h
@@ -31,6 +31,8 @@ namespace Function
  * \brief Window function for sinc interpolation.
  * \f[ w(x) = 0.54 + 0.46 cos(\frac{\pi x}{m} ) \f]
  * \sa WindowedSincInterpolateImageCosineFunction
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInput = double, class TOutput = double>
 class CosineWindowFunction
@@ -76,6 +78,8 @@ private:
  * \sa Function::LanczosWindowFunction
  * \sa Function::BlackmanWindowFunction
  * \ingroup ImageFunctionBases ImageInterpolators
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
index 3a069971a6680c21370e7942904df71b30a26ef4..5eb242b636821f41f584cc50abada294f41d3a9d 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
@@ -130,6 +130,8 @@ namespace otb
  * \sa Function::LanczosWindowFunction
  * \sa Function::BlackmanWindowFunction
  * \ingroup ImageFunctionBases ImageInterpolators
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInputImage, class TWindowFunction, class TBoundaryCondition =
       itk::ZeroFluxNeumannBoundaryCondition<TInputImage>, class TCoordRep = double>
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h
index 1e2c4e31b06fc3b6bbbc3f576a6726465138f20a..23026061152df1b40186343e5af07a7d6752e7cf 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h
@@ -31,6 +31,8 @@ namespace Function
  * \brief Gaussian interpolation windowing function.
  * \f[ w(x) = exp ( -2. \frac{sigma*sigma * \pi } ) \f]
  * \sa otbWindowedSincInterpolateImageFunctionBase
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInput = double, class TOutput = double>
 class GaussianWindowFunction
@@ -76,6 +78,8 @@ private:
  * \sa Function::LanczosWindowFunction
  * \sa Function::BlackmanWindowFunction
  * \ingroup ImageFunctionBases ImageInterpolators
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInputImage, class TBoundaryCondition = itk::ZeroFluxNeumannBoundaryCondition<TInputImage>, class TCoordRep =
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h
index 0365397b18447d67480f9ae2351979cc72c6e53e..2da34dd799fa0e22b40137464cf6a190f5767231 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h
@@ -31,6 +31,8 @@ namespace Function
  * \brief Window function for sinc interpolation.
  * \f[ w(x) = 0.54 + 0.46 cos(\frac{\pi x}{m} ) \f]
  * \sa WindowedSincInterpolateImageHammingFunction
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInput = double, class TOutput = double>
 class HammingWindowFunction
@@ -77,6 +79,8 @@ private:
  * \sa Function::LanczosWindowFunction
  * \sa Function::BlackmanWindowFunction
  * \ingroup ImageFunctionBases ImageInterpolators
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h
index 7a3ffe2efe6cef1801b0fbbdaa9db41d731c7413..85e157536e2e263a80a4cc904f54f3cb78704bc2 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h
@@ -33,6 +33,8 @@ namespace Function
  * Note: Paper referenced in WindowedSincInterpolateImageFunctionBase gives
  * an incorrect definition of this window function.
  * \sa WindowedSincInterpolateImageLanczosFunction
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInput = double, class TOutput = double>
 class LanczosWindowFunction
@@ -87,6 +89,8 @@ private:
  * \sa Function::LanczosWindowFunction
  * \sa Function::BlackmanWindowFunction
  * \ingroup ImageFunctionBases ImageInterpolators
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h
index bd891004cb04065b415b9a0824a77e50a6c7ce5b..20f0fc6072490755a6d4996db778454595c4481a 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h
@@ -31,6 +31,8 @@ namespace Function
  * \brief Window function for sinc interpolation.
  * \f[ w(x) = 1 - ( \frac{x^2}{m^2} ) \f]
  * \sa WindowedSincInterpolateImageWelchFunction
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInput = double, class TOutput = double>
 class WelchWindowFunction
@@ -76,6 +78,8 @@ private:
  * \sa Function::LanczosWindowFunction
  * \sa Function::BlackmanWindowFunction
  * \ingroup ImageFunctionBases ImageInterpolators
+ *
+ * \ingroup OTBInterpolation
  */
 template<class TInputImage, class TBoundaryCondition = itk::ConstantBoundaryCondition<TInputImage>, class TCoordRep =
       double, class TInputInterpolator = double, class TOutputInterpolator = double>
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h b/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
index 67efda31f5f0d6d3dd9506aa82ef9c9af9351ded..2564bc27bb323e7e6c1af8205f93d6337b778416 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
+++ b/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
@@ -35,6 +35,8 @@ namespace Functor
  * SetAttributeName method.
  *
  * \sa AttributesMapLabelObject
+ *
+ * \ingroup OTBLabelMap
  */
 template<class TLabelObject>
 class ITK_EXPORT AttributesMapLabelObjectAccessor
@@ -81,6 +83,8 @@ private:
 *   \brief This class allows to build a measurement vector from an AttributesMapLabelObject
 *
 *    It Allows to select only a subset of the available attributes.
+ *
+ * \ingroup OTBLabelMap
 */
 template<class TLabelObject, class TMeasurementVector>
 class AttributesMapMeasurementFunctor
@@ -149,6 +153,8 @@ private:
  * \sa LabelObject, ShapeLabelObject, StatisticsLabelObject
  *
  * \ingroup DataRepresentation
+ *
+ * \ingroup OTBLabelMap
  */
 template <class TLabel, unsigned int VImageDimension, class TAttributesValue>
 class ITK_EXPORT AttributesMapLabelObject
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h b/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h
index 2797b660db97da22bd6cf76f9a3910117bdaccd1..de7b7c9a6dda2126678b6fa5740a2ffa7c2041e8 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h
+++ b/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h
@@ -44,6 +44,8 @@ namespace otb
  *\sa LabelObject, ShapeLabelObject, StatisticsLabelObject
  *
  * \ingroup DataRepresentation
+ *
+ * \ingroup OTBLabelMap
  */
 template < class TLabel, unsigned int VImageDimension, class TAttributesValue, class TClassLabel >
 class ITK_EXPORT AttributesMapLabelObjectWithClassLabel : public AttributesMapLabelObject<TLabel, VImageDimension, TAttributesValue>
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
index 90522cba1ebaba77fa67adab8fb6558a22cf64af..6b5a949ce4a6a2549c1781c150a23f968038a981 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
@@ -34,6 +34,8 @@ namespace otb
  * \sa AttributeLabelObject, AttributeOpeningLabelMapFilter
  *
  * \ingroup ImageEnhancement MathematicalMorphologyImageFilters
+ *
+ * \ingroup OTBLabelMap
  */
 template<class TImage >
 class ITK_EXPORT AttributesMapOpeningLabelMapFilter
diff --git a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
index 7e8cf7d76e40b738fbec4594d1a525076179f439..a2c4a7e4b0bc6d2135a1acccdbf7ad7625bbd6ef 100644
--- a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
@@ -28,6 +28,8 @@ namespace otb {
 
 /** \class KMeansAttributesLabelMapFilter
  * \brief Execute a KMeans on the attributes of a itk::LabelMap<otb::AttributesMapLabelObject>
+ *
+ * \ingroup OTBLabelMap
  */
 template<class TInputImage>
 class ITK_EXPORT KMeansAttributesLabelMapFilter :
diff --git a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
index 5071cdcf48e8d04a32818cafe5a956ae172717f2..3b597fe26e644d975fdda5b3870eda700fda2c25 100644
--- a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
@@ -30,6 +30,8 @@ namespace otb {
 /** \class LabelImageToLabelMapWithAdjacencyFilter
  * \brief convert a labeled image to a label map with adjacency information.
  *
+ *
+ * \ingroup OTBLabelMap
  */
 template<class TInputImage, class TOutputImage=otb::LabelMapWithAdjacency< itk::LabelObject< typename TInputImage::PixelType, TInputImage::ImageDimension > > >
 class ITK_EXPORT LabelImageToLabelMapWithAdjacencyFilter :
diff --git a/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h
index 182d87ec9fc652fd3d775cdc71941e5294c15cd1..a4e077f082a8e0f23e10b8cd060b09dd2bb2131a 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h
@@ -44,6 +44,8 @@ namespace otb {
  * \sa itk::InPlaceLabelMapFilter
  *
  * \ingroup ImageEnhancement  MathematicalMorphologyImageFilters
+ *
+ * \ingroup OTBLabelMap
  */
 template<class TImage, class TFunctor>
 class ITK_EXPORT LabelMapFeaturesFunctorImageFilter :
diff --git a/Modules/Core/LabelMap/include/otbLabelMapSource.h b/Modules/Core/LabelMap/include/otbLabelMapSource.h
index 7a27530f5ede68ae58109b79a7f83411e14a8ca8..be10ce584e80993db0d9f26c61c783d3a0a3d823 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapSource.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapSource.h
@@ -30,6 +30,8 @@ namespace otb
  *
  * \ingroup IO
  *
+ *
+ * \ingroup OTBLabelMap
  */
 
 template <class TOutputLabelMap>
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
index da9c87d8a30a0aa4299d27284e374809fb24e29e..ab9fb5c17496c81867b2e407c8e8fefa570a790a 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * This filter is intended to work on AttributesMapLabelObject. The user chooses
  * the attributes to display for each channel. The output image is expected to be
  * a vector image.
+ *
+ * \ingroup OTBLabelMap
  */
 
 template< class TInputImage, class TOutputImage , class TAttributeAccessor=
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
index f500c5f4384284ca8f749b2d1fd24a226ed386d1..647e431cda3be641a841f7ca9636b52279814f05 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
@@ -35,6 +35,8 @@ namespace otb {
  * \sa LabelMapToBinaryImageFilter, LabelMapMaskImageFilter
  * \ingroup ImageEnhancement  MathematicalMorphologyImageFilters
  * \ingroup LabeledImageFilters
+ *
+ * \ingroup OTBLabelMap
  */
 template<class TInputImage, class TOutputImage>
 class ITK_EXPORT LabelMapToLabelImageFilter :
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
index 82c547f38e3eadf997f43a0ca09df5e52b422905..a5c71d9d2ebcb89318e41af80dc9d2a0f7735f06 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
@@ -33,6 +33,8 @@ namespace otb
  * The conversion from label object to measurement vector is made
  * through a functor. This allows to support any kind of LabelObject
  * via proper redefinition of the functor.
+ *
+ * \ingroup OTBLabelMap
  */
 
 template <class TInputLabelMap, class TOutputSampleList,
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h b/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h
index ce0b00fd3c75966ed983ae5587be8da99123cdcf..92a132d29ca43e1f91300aef2df2be5b258e6c24 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h
@@ -30,6 +30,8 @@ namespace otb
 *
 *   The adjacency information is stored as a map of set of labels, in
 *   order to avoid duplicated neighbors.
+ *
+ * \ingroup OTBLabelMap
 */
 
 template <class TLabelObject >
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
index 60c6ec68b73ef2e17cab2a90a7cf4eb3d6144ea6..f86b3f7798ec579d1ca3fac3fa82c94c60071ccd 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
@@ -25,6 +25,8 @@ namespace otb {
 /** \class LabelMapWithClassLabelToClassLabelImageFilter
  * \brief Converts a LabelMap<LabelObjectWithClassLabel> to an image
  *        of class labels
+ *
+ * \ingroup OTBLabelMap
  */
 template<class TInputImage, class TOutputImage>
 class ITK_EXPORT LabelMapWithClassLabelToClassLabelImageFilter :
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
index dc5a04c521b1bea1430833fef600cfacbdef196e..d80c23121e480ce20376be7c80838b75e7d1e8d4 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * via proper redefinition of the functor.
  *
  * \sa otb::SVMSampleListModelEstimator
+ *
+ * \ingroup OTBLabelMap
  */
 
 template <class TInputLabelMap, class TOutputSampleList, class TOutputTrainingSampleList,
diff --git a/Modules/Core/LabelMap/include/otbLabelObjectFieldsFunctor.h b/Modules/Core/LabelMap/include/otbLabelObjectFieldsFunctor.h
index da55a66cf681b01dc34fe5bb81581ee3236117b9..4875537cfbba52f6e7f34b0a0c032b7f0a5ba2a5 100644
--- a/Modules/Core/LabelMap/include/otbLabelObjectFieldsFunctor.h
+++ b/Modules/Core/LabelMap/include/otbLabelObjectFieldsFunctor.h
@@ -31,6 +31,8 @@ namespace Functor
  *  \brief Returns additionnal OGR fields to be saved in VectorData
  *
  * \sa LabelObjectWithClassLabelFieldsFunctor
+ *
+ * \ingroup OTBLabelMap
  */
 template<class TLabelObject>
 class ITK_EXPORT LabelObjectFieldsFunctor
diff --git a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
index 3c943c41eea2076db0b8b5e74fc115b76257a084..f050fe1d65814e42178ecf7859507b07773d65b4 100644
--- a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
+++ b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
@@ -52,6 +52,8 @@ namespace Functor
  *
  * Please be aware that this functor is not thread-safe.
  *
+ *
+ * \ingroup OTBLabelMap
  */
 template <class TLabelObject, class TPolygon>
 class LabelObjectToPolygonFunctor
diff --git a/Modules/Core/LabelMap/include/otbLabelObjectWithClassLabelFieldsFunctor.h b/Modules/Core/LabelMap/include/otbLabelObjectWithClassLabelFieldsFunctor.h
index 79dc6fa4e29342b367436d684441a24d4f142dea..0317b60c012877d74ed8cd3d4c6a1c54ff036177 100644
--- a/Modules/Core/LabelMap/include/otbLabelObjectWithClassLabelFieldsFunctor.h
+++ b/Modules/Core/LabelMap/include/otbLabelObjectWithClassLabelFieldsFunctor.h
@@ -31,6 +31,8 @@ namespace Functor
  *  \brief Returns additionnal OGR fields to be saved in VectorData
  *
  * \sa LabelObjectFieldsFunctor
+ *
+ * \ingroup OTBLabelMap
  */
 template<class TLabelObject>
 class ITK_EXPORT LabelObjectWithClassLabelFieldsFunctor
diff --git a/Modules/Core/LabelMap/include/otbMergeLabelObjectFunctor.h b/Modules/Core/LabelMap/include/otbMergeLabelObjectFunctor.h
index 1f620749dae73e5ebd364296d8e051338629de41..5c279fdca7971792f6bc8a54da5bcf8a959207e9 100644
--- a/Modules/Core/LabelMap/include/otbMergeLabelObjectFunctor.h
+++ b/Modules/Core/LabelMap/include/otbMergeLabelObjectFunctor.h
@@ -38,6 +38,8 @@ namespace Functor
  * resulting label object will have more than one connected component.
  *
  * This functor is thread safe.
+ *
+ * \ingroup OTBLabelMap
  */
 template <class TLabelObject >
 class MergeLabelObjectFunctor
diff --git a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
index 4ebcc057f938b432f7223ad3fbc431f133679f1b..1b955558fae57e554904136bda0e871b026feacd 100644
--- a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
@@ -27,6 +27,8 @@ namespace otb {
  * \brief Computes the min/max of all attributes of a LabelMap
  *        where LabelObject type is compatible with otb::AttributesMapLabelObject
  *
+ *
+ * \ingroup OTBLabelMap
  */
 template<class TInputImage>
 class ITK_EXPORT MinMaxAttributesLabelMapFilter :
diff --git a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
index bfc1a24d18622d6705d9dbda1530e812d844fe78..4e61817e7010642e266710291f55322c3024b1b6 100644
--- a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
@@ -37,6 +37,8 @@ namespace Functor
 *   all attributes are in [0, 1] interval
 *
 *   \sa MinMaxAttributesLabelMapFilter
+ *
+ * \ingroup OTBLabelMap
 */
 template <class TLabelObject>
 class NormalizeAttributesLabelObjectFunctor
@@ -88,6 +90,8 @@ private:
  *        attributes are in the [0, 1] interval
  *
  * \sa MinMaxAttributesLabelMapFilter
+ *
+ * \ingroup OTBLabelMap
  */
 template<class TImage>
 class ITK_EXPORT NormalizeAttributesLabelMapFilter
diff --git a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
index c001bacd26335b5dfd42770e0bcbae7d80b81b79..25bce7d0c750d166e77d8f13317dcda9bd79e939 100644
--- a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
@@ -33,6 +33,8 @@ namespace Functor
 *   \brief Functor to compute statistics attributes of one LabelObject.
 *
 *   \sa StatisticsAttributesLabelMapFilter
+ *
+ * \ingroup OTBLabelMap
 */
 template <class TLabelObject, class TFeatureImage>
 class StatisticsAttributesLabelObjectFunctor
@@ -119,6 +121,8 @@ private:
  * \sa itk::StatisticsLabelMapFilter
  *
  * \ingroup ImageEnhancement  MathematicalMorphologyImageFilters
+ *
+ * \ingroup OTBLabelMap
  */
 template<class TImage, class TFeatureImage>
 class ITK_EXPORT StatisticsAttributesLabelMapFilter :
diff --git a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
index 99cd2b279cee1306220e987c1db8b04043f5460d..775b42e909b28d1967f922f88ea60fdc0b47609f 100644
--- a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
@@ -29,6 +29,8 @@ namespace otb
  *
  * \brief Creation of an "otb" DefaultImageMetadataInterface that gets metadata.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT DefaultImageMetadataInterface : public ImageMetadataInterfaceBase
 {
diff --git a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h
index a01d6b8588e77a04430efc6080e19269cfd85fc0..f5fca02115c0008e3961f8f5457c4a5fa41dbd1c 100644
--- a/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h
@@ -26,6 +26,8 @@ namespace otb
 /** \class DefaultImageMetadataInterfaceFactory
  * \brief Creating an instance of a ImageMetadataInterface object using object factory.
  * This class only provides the method of the virtual pure class ImageMetadataInterfaceBase and throw exception for virtual method.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT DefaultImageMetadataInterfaceFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
index 72386db66b1c4e3c9090ab937489d2372e431c35..e7860a1d788274fbcdf5f46ff8d897e439c0c5d1 100644
--- a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
@@ -26,6 +26,8 @@ namespace otb
  *
  * \brief Creation of an "otb" FormosatImageMetadataInterface that gets metadata.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT FormosatImageMetadataInterface : public OpticalImageMetadataInterface
 {
diff --git a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h
index 315215a44d8578a6e8467669fa1ce9ba2b5cb0f0..b2dc609d07ff72622f0fcc540e23b3b6d6187f1c 100644
--- a/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class FormosatImageMetadataInterfaceFactory
  * \brief Creating an instance of a ImageMetadataInterface object using object factory.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT FormosatImageMetadataInterfaceFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
index 492f6b744eb874f87f3c64f154faf869f99fba24..ec961bfa6155f3a0a9fe059f22ab2ec8711b24fe 100644
--- a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
@@ -26,6 +26,8 @@ namespace otb
  *
  * \brief Creation of an "otb" IkonosImageMetadataInterface that gets metadata.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT IkonosImageMetadataInterface : public OpticalImageMetadataInterface
 {
diff --git a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h
index 87efb52673d90d9350c3a13ce077bf7ef141e56a..9bec791d4dcd03d05868256ef76bcf6e51d163d7 100644
--- a/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class IkonosImageMetadataInterfaceFactory
  * \brief Creating an instance of a ImageMetadataInterface object using object factory.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT IkonosImageMetadataInterfaceFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h b/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
index bc5e90633679a6107337eee3065976c778991513..c3aa5e70b7c7934f10813c4e796098671d10f36f 100644
--- a/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
+++ b/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
@@ -32,6 +32,8 @@ namespace otb
  *
  * \brief Base class for captor metadata reading.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT ImageMetadataInterfaceBase : public itk::Object
 {
diff --git a/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h
index ed17cf40fe6b04be8fbd2968d8f7ad5f6d939722..9f10f645f890328fe4fc98db8c6d5006c65e29f5 100644
--- a/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class ImageMetadataInterfaceFactory
  * \brief Create instances of ImageMetadataInterfaceFactory objects using an object factory.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT ImageMetadataInterfaceFactory : public itk::Object
 {
diff --git a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
index 0c83cbe87c11b934146603ce31bf782550d2529c..515d32b466af5d4d1011b99a556071d1dedb8a94 100644
--- a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
@@ -29,6 +29,8 @@ namespace otb
  *
  * \brief Creation of an "otb" DefaultImageMetadataInterface that gets metadata.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT OpticalDefaultImageMetadataInterface : public OpticalImageMetadataInterface
 {
diff --git a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h
index f41fbb5da4a73991fdc71c55314faf0f2c73fc0e..c379df4a199c6e6654f601a4b18dbad1dde1e8ac 100644
--- a/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h
@@ -26,6 +26,8 @@ namespace otb
 /** \class OpticalDefaultImageMetadataInterfaceFactory
  * \brief Creating an instance of a OpticalImageMetadataInterface object using object factory.
  * This class only provides the method of the virtual pure class OpticalImageMetadataInterface and throw exception for virtual method.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT OpticalDefaultImageMetadataInterfaceFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
index df6972ae511d0182590d4439e50141b958ab80ab..39f2db591003f955b03685e2b5e0db0ce55bc75f 100644
--- a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
@@ -30,6 +30,8 @@ namespace otb
  *
  * \brief Class for Optical captor metadata reading.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT OpticalImageMetadataInterface : public ImageMetadataInterfaceBase
 {
diff --git a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h
index 3bb7820afdb0d495cd9e3bb36405f0567d499fa6..135259d19a022f38bc968cadfb46fd5f046e8612 100644
--- a/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class OpticalImageMetadataInterfaceFactory
  * \brief Create instances of OpticalImageMetadataInterfaceFactory objects using an object factory.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT OpticalImageMetadataInterfaceFactory : public itk::Object
 {
diff --git a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
index 2c3861eb2ade347b6afed210b5877f3e650f0514..ea7f49d2701850af1a460c96cbd1ac86352d412d 100644
--- a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
@@ -26,6 +26,8 @@ namespace otb
  *
  * \brief Creation of an "otb" PleiadesImageMetadataInterface that gets metadata.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT PleiadesImageMetadataInterface : public OpticalImageMetadataInterface
 {
diff --git a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h
index 96609049b8bef37106c468e928a5e9c4802b4f53..13e293b50d69935ef5ab607097bc8fec8b568d1d 100644
--- a/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class PleiadesImageMetadataInterfaceFactory
  * \brief Creating an instance of a ImageMetadataInterface object using object factory.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT PleiadesImageMetadataInterfaceFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
index 754357801004055aac1605fbe5e823d8999b4dcf..94d23133520a3eaca1d7c96132ed01d7e84ba0a1 100644
--- a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
@@ -26,6 +26,8 @@ namespace otb
  *
  * \brief Creation of an "otb" QuickBirdImageMetadataInterface that gets metadata.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT QuickBirdImageMetadataInterface : public OpticalImageMetadataInterface
 {
diff --git a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h
index 23786d2b0e89b8e587f22fec43386c7c186407d1..070138b3699f75a97befe8354f7f6ba37d83d31d 100644
--- a/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class QuickBirdImageMetadataInterfaceFactory
  * \brief Creating an instance of a ImageMetadataInterface object using object factory.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT QuickBirdImageMetadataInterfaceFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
index deeff3dae96e5181e61a24e5d13fffa76ba817de..f78fa3e87cabf9cd888cad5900c3636c2120795d 100644
--- a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
@@ -29,6 +29,8 @@ namespace otb
  *
  * \brief Creation of an "otb" DefaultImageMetadataInterface that gets metadata.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT SarDefaultImageMetadataInterface : public SarImageMetadataInterface
 {
diff --git a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h
index 6766328b6c2da62f5d832079bd3f25d1b6841312..8eb0f384903cfc2578c2f5edb21e4775ad8956d8 100644
--- a/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h
@@ -26,6 +26,8 @@ namespace otb
 /** \class SarDefaultImageMetadataInterfaceFactory
  * \brief Creating an instance of a SarImageMetadataInterface object using object factory.
  * This class only provides the method of the virtual pure class SarImageMetadataInterface and throw exception for virtual method.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT SarDefaultImageMetadataInterfaceFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h
index 21f6ef718a50817a34f5c4ae6284d47e7e793922..73f055cbdcab660835dd526a3c806f8d318e4703 100644
--- a/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h
@@ -29,6 +29,8 @@ namespace otb
  *
  * \brief Class for SAR captor metadata reading.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT SarImageMetadataInterface : public ImageMetadataInterfaceBase
 {
diff --git a/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h
index f687a0803857b370c57a06dc712f67ba8776933e..caa77c33d36969e81c48ebe1b72cffd267430142 100644
--- a/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class SarImageMetadataInterfaceFactory
  * \brief Create instances of SarImageMetadataInterfaceFactory objects using an object factory.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT SarImageMetadataInterfaceFactory : public itk::Object
 {
diff --git a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
index c56fea37a5241b8ed325612ab4fd3ff457da3926..269af29003625d526fa1e6b0bf9b2a1988b0ef37 100644
--- a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
@@ -26,6 +26,8 @@ namespace otb
  *
  * \brief Creation of an "otb" Spot6ImageMetadataInterface that gets metadata.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT Spot6ImageMetadataInterface : public OpticalImageMetadataInterface
 {
diff --git a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h
index d72ac305d765302dad8a269e3fd132d177ecbf64..5534e97e2427206a1cb1b1c691e619c2bbd2092b 100644
--- a/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class Spot6ImageMetadataInterfaceFactory
  * \brief Creating an instance of a ImageMetadataInterface object using object factory.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT Spot6ImageMetadataInterfaceFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
index 3586f5b12c14c7ad13db6ebaf038f7b4269ed4d8..4e6555cf0cb88b08250a4f2788ba347b5c772d22 100644
--- a/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
@@ -26,6 +26,8 @@ namespace otb
  *
  * \brief Creation of an "otb" SpotImageMetadataInterface that gets metadata.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT SpotImageMetadataInterface : public OpticalImageMetadataInterface
 {
diff --git a/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h
index 1661b533ceb5229ced5715af2d2fd8d1b1d4916b..7413f1e8f048a3b4292b173cf8377e586024776a 100644
--- a/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class SpotImageMetadataInterfaceFactory
  * \brief Creating an instance of a ImageMetadataInterface object using object factory.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT SpotImageMetadataInterfaceFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
index b26addf14b73361b0f03342e33fd67276bc3bd56..22687cfca53d83929230b9bd083975f9cdc2b3b3 100644
--- a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
@@ -30,6 +30,8 @@ namespace otb
  *
  * \brief Creation of an "otb" TerraSarImageMetadataInterface that gets metadata.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT TerraSarImageMetadataInterface : public SarImageMetadataInterface
 {
diff --git a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h
index cb720c55e7647ac17d13e822881be75064c70855..9a92a0b8bbf1f72d0fe7334702723acd06793a48 100644
--- a/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class TerraSarImageMetadataInterfaceFactory
  * \brief Creating an instance of a ImageMetadataInterface object using object factory.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT TerraSarImageMetadataInterfaceFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
index b77ae00b4c35bd631f9ffdc715621ba1ce5446a9..3fb4b79d65f1e989f228a0f24320a3ff7b171e0e 100644
--- a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
+++ b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
@@ -26,6 +26,8 @@ namespace otb
  *
  * \brief Creation of an "otb" WorldView2ImageMetadataInterface that gets metadata.
  *
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT WorldView2ImageMetadataInterface : public OpticalImageMetadataInterface
 {
diff --git a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h
index 569ff63b00ef5a45b0dad5c4d4eca8b48e07e49d..7434ed9856aa33a316908c1cd2b45cae2dd25d19 100644
--- a/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h
+++ b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class WorldView2ImageMetadataInterfaceFactory
  * \brief Creating an instance of a ImageMetadataInterface object using object factory.
+ *
+ * \ingroup OTBMetadata
  */
 class ITK_EXPORT WorldView2ImageMetadataInterfaceFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/Core/ObjectList/include/otbImageList.h b/Modules/Core/ObjectList/include/otbImageList.h
index aeece2eebac1c743ac984ebca72e350a0aa48c52..760eea8815c3a051958f0ec32192ec47ce15c7dd 100644
--- a/Modules/Core/ObjectList/include/otbImageList.h
+++ b/Modules/Core/ObjectList/include/otbImageList.h
@@ -28,6 +28,8 @@ namespace otb
  * It is derived from the otbObjectList class, which allows to manipulate an ITK/OTB
  * object list with the appropriate formalism (iterators, accessors).
  * \sa ObjectList
+ *
+ * \ingroup OTBObjectList
  */
 
 template <class TImage>
diff --git a/Modules/Core/ObjectList/include/otbImageListSource.h b/Modules/Core/ObjectList/include/otbImageListSource.h
index 09f15312a2ef92e853a94574340b30ba52b0c231..2e2b02b0b96302e2662d71161696375f2522aaf9 100644
--- a/Modules/Core/ObjectList/include/otbImageListSource.h
+++ b/Modules/Core/ObjectList/include/otbImageListSource.h
@@ -30,6 +30,8 @@ namespace otb
  * \ingroup DataSources
  * \ingroup Images
  * \ingroup Lists
+ *
+ * \ingroup OTBObjectList
  */
 template <class TOutputImage>
 class ITK_EXPORT ImageListSource
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
index fc049d2f407ce480ba1db04c31c9bd025d866ba9..84b836d8bd4b816951115cb44e702e809b1489f9 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
@@ -30,6 +30,8 @@ namespace otb
  *
  * \ingroup Images
  * \ingroup Lists
+ *
+ * \ingroup OTBObjectList
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ImageListToImageFilter
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
index 1ae63bd910899704f7d23658e9fa88dfee77a584..8ed1dd401e474f7e1f1dcb85c51bdb7e9c838827 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
@@ -37,6 +37,8 @@ namespace otb
  *  output images and filter IO types.
  *
  * \ingroup Streamed
+ *
+ * \ingroup OTBObjectList
  */
 template <class TInputImageList, class TOutputImageList, class TFilter>
 class ITK_EXPORT ImageListToImageListApplyFilter
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
index aef1b4b9105f8a13cfd0b2582b52ce88e40adf3d..7db9fc83f30e4445ddc31fcd30e11ba137ec1dc4 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
@@ -27,6 +27,8 @@ namespace otb
  *  to produce an image list.
  * \ingroup Images
  * \ingroup Lists
+ *
+ * \ingroup OTBObjectList
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ImageListToImageListFilter
diff --git a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
index 093435c6769f67888f4f961805b8cb9b40e84f73..259224ae17ec8fdefe19ad2e7e83af16c3ee3c62 100644
--- a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
@@ -32,6 +32,8 @@ namespace otb
  *
  *
  * \ingroup Streamed
+ *
+ * \ingroup OTBObjectList
  */
 
 template <class TInputImageType>
diff --git a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
index d6e8ff654439ca6216415c780ade6aaa103f745a..5df80bdf8b880b657fc36fa77bf0dd736468c3a2 100644
--- a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * Casting is done through standard cast operation.
  *
  * \ingroup Streamed
+ *
+ * \ingroup OTBObjectList
  */
 template <class TImageList, class TVectorImage>
 class ITK_EXPORT ImageListToVectorImageFilter
diff --git a/Modules/Core/ObjectList/include/otbObjectList.h b/Modules/Core/ObjectList/include/otbObjectList.h
index 0cb82c7a8d1b67674845a87a9fdfb29dfe524858..9e66210f2b88091129ccebdc21cd2aa50ed00c72 100644
--- a/Modules/Core/ObjectList/include/otbObjectList.h
+++ b/Modules/Core/ObjectList/include/otbObjectList.h
@@ -29,6 +29,8 @@ namespace otb
  *
  * ObjectList stores SmartPointer to ObjectType in a std::vector data structure. It provides the same
  * methods and iterators interfaces.
+ *
+ * \ingroup OTBObjectList
  */
 template <class TObject>
 class ITK_EXPORT ObjectList : public itk::DataObject
@@ -137,6 +139,8 @@ public:
 
   /** \class Iterator
    *  \brief Iterator of the object list.
+ *
+ * \ingroup OTBObjectList
    */
   class ITK_EXPORT Iterator
   {
@@ -244,6 +248,8 @@ private:
   };
   /** \class ConstIterator
    *  \brief ConstIterator of the object list.
+ *
+ * \ingroup OTBObjectList
    */
   class ITK_EXPORT ConstIterator
   {
@@ -334,6 +340,8 @@ private:
   };
   /** \class ReverseIterator
    *  \brief ReverseIterator of the object list.
+ *
+ * \ingroup OTBObjectList
    */
   class ITK_EXPORT ReverseIterator
   {
@@ -426,6 +434,8 @@ private:
   };
   /** \class ReverseConstIterator
    *  \brief ReverseConstIterator of the object list.
+ *
+ * \ingroup OTBObjectList
    */
   class ITK_EXPORT ReverseConstIterator
   {
diff --git a/Modules/Core/ObjectList/include/otbObjectListSource.h b/Modules/Core/ObjectList/include/otbObjectListSource.h
index 05860d90a9853af70c3ca46dae50f0d344752f40..007b33ddac6330a05c5b38209c1a9518bc41639e 100644
--- a/Modules/Core/ObjectList/include/otbObjectListSource.h
+++ b/Modules/Core/ObjectList/include/otbObjectListSource.h
@@ -37,6 +37,8 @@ namespace otb
    * class derived from ObjectList or other implementations.
    *
    * \ingroup ObjectListFilter
+ *
+ * \ingroup OTBObjectList
  */
 template <class TOutputList>
 class ITK_EXPORT ObjectListSource : public itk::ProcessObject
diff --git a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
index 0e97aebabb9322df7adc0ec63fb15f55f2084247..9ed6cb632ebeaebf3d31250e4705dcc4ea326d26 100644
--- a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
+++ b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
@@ -36,6 +36,8 @@ namespace otb
    *
    *
    * \ingroup ObjectListFilter
+ *
+ * \ingroup OTBObjectList
  */
 template <class TInputList, class TOutputList>
 class ITK_EXPORT ObjectListToObjectListFilter : public otb::ObjectListSource<TOutputList>
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
index 22d972f92db3552e555aa7596e483985305f29a9..2555e22d1c4cf66f53982f6cd03c8bbc22d5f4e7 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
@@ -31,6 +31,8 @@ namespace otb
  *
  *
    * \ingroup ObjectListFilter
+ *
+ * \ingroup OTBObjectList
  */
 template <class TInputList, class TOutputList, class TFunction>
 class ITK_EXPORT UnaryFunctorObjectListBooleanFilter :
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
index 63b92e669ba8df75ea069cc23e4a7c5b7c942c6c..ac644bdede8ddb2f3caffbe4bb90bb8ede71926d 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
@@ -31,6 +31,8 @@ namespace otb
   *
   *
   * \ingroup ObjectListFilter
+ *
+ * \ingroup OTBObjectList
  */
 template <class TInputList, class TOutputList, class TFunction>
 class ITK_EXPORT UnaryFunctorObjectListFilter :
diff --git a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
index 055a17d2edeee4a3b4f3e6468499a8090ccc4b4e..e4650e8a3ce7e1ad3599011d12f06ce3edee720b 100644
--- a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * defines the SetInput() method for defining the input to a filter.
  *
  * \ingroup ImageFilters
+ *
+ * \ingroup OTBPointSet
  */
 template <class TInputImage, class TOutputPointSet>
 class ITK_EXPORT ImageToPointSetFilter : public PointSetSource<TOutputPointSet>
diff --git a/Modules/Core/PointSet/include/otbPointSetAndValuesFunction.h b/Modules/Core/PointSet/include/otbPointSetAndValuesFunction.h
index cd60cae36f0fe8d8cefa371cab8cb45e61973981..ef4a9cbe22dadb56bbefe6bb5b68320d7805d1bc 100644
--- a/Modules/Core/PointSet/include/otbPointSetAndValuesFunction.h
+++ b/Modules/Core/PointSet/include/otbPointSetAndValuesFunction.h
@@ -27,6 +27,8 @@ namespace otb
 {
 /** \class PointSetAndValuesFunction
  *  \brief Base class for function needing a point set and a set of associated value to compute the output.
+ *
+ * \ingroup OTBPointSet
  */
 template <class TPointSet, class TValue, class TCoordRep = double>
 class ITK_EXPORT PointSetAndValuesFunction
diff --git a/Modules/Core/PointSet/include/otbPointSetExtractROI.h b/Modules/Core/PointSet/include/otbPointSetExtractROI.h
index dd14e156d828db2a2a9211380f6e0a10d4dfed23..ffb7a76c8376092baf93e87d658a41543119fc2d 100644
--- a/Modules/Core/PointSet/include/otbPointSetExtractROI.h
+++ b/Modules/Core/PointSet/include/otbPointSetExtractROI.h
@@ -34,6 +34,8 @@ namespace otb
  *
  *
  * \ingroup PointSetFilters
+ *
+ * \ingroup OTBPointSet
  */
 template <class TInputPointSet, class TOutputPointSet>
 class ITK_EXPORT PointSetExtractROI :
diff --git a/Modules/Core/PointSet/include/otbPointSetFunction.h b/Modules/Core/PointSet/include/otbPointSetFunction.h
index ff52a2114ccd3e2e3d7514b7423063de622a1f61..784c4a5c4c6c56620b8ffb72d7111570b5b79d94 100644
--- a/Modules/Core/PointSet/include/otbPointSetFunction.h
+++ b/Modules/Core/PointSet/include/otbPointSetFunction.h
@@ -29,6 +29,8 @@ namespace otb
  * \brief Calculate the density in the neighborhood of a pixel
  *
  * \ingroup SpatialFunctions
+ *
+ * \ingroup OTBPointSet
  */
 template <class TPointSet, class TOutput>
 class ITK_EXPORT PointSetFunction :
diff --git a/Modules/Core/PointSet/include/otbPointSetSource.h b/Modules/Core/PointSet/include/otbPointSetSource.h
index f2313b56de0907ab2ffc85f83ef06384c41eef31..a91a5b408496be20031fb001b47aa4e099f98f5b 100644
--- a/Modules/Core/PointSet/include/otbPointSetSource.h
+++ b/Modules/Core/PointSet/include/otbPointSetSource.h
@@ -34,6 +34,8 @@ namespace otb
  * of data.
  *
  * \ingroup DataSources
+ *
+ * \ingroup OTBPointSet
  */
 
 template <class TOutputPointSet>
diff --git a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
index 60f12a8c92d6b738bb6d4a05a3f695af18ae127e..35647727557d8914de17cf1abaa2d8dbaccda1a4 100644
--- a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * defines the SetInput() method for defining the input to a filter.
  *
  * \ingroup PointSetFilters
+ *
+ * \ingroup OTBPointSet
  */
 template <class TInputPointSet, class TOutputPointSet>
 class ITK_EXPORT PointSetToPointSetFilter : public PointSetSource<TOutputPointSet>
diff --git a/Modules/Core/PointSet/include/otbRandomPointSetSource.h b/Modules/Core/PointSet/include/otbRandomPointSetSource.h
index 1b99c9f44a1904cb4d6283cf8a5d3407b164851b..553dbd40416f4e5cc793f5dc8c8257226bbf1c4f 100644
--- a/Modules/Core/PointSet/include/otbRandomPointSetSource.h
+++ b/Modules/Core/PointSet/include/otbRandomPointSetSource.h
@@ -36,6 +36,8 @@ namespace otb
  * \code SetMinPoint \endcode and \code SetMaxPoint \endcode methods.
  *
  * \ingroup DataSources
+ *
+ * \ingroup OTBPointSet
  */
 
 template <class TOutputPointSet>
diff --git a/Modules/Core/PointSet/include/otbSimplePointCountStrategy.h b/Modules/Core/PointSet/include/otbSimplePointCountStrategy.h
index c767bdd76ea1dbfd3b7fab7571bb6a6cb26766ad..d2f443f09122deb4fe985e76a33f33e299bd5751 100644
--- a/Modules/Core/PointSet/include/otbSimplePointCountStrategy.h
+++ b/Modules/Core/PointSet/include/otbSimplePointCountStrategy.h
@@ -32,6 +32,8 @@ namespace otb
  * The filter will walk over all the pixels in the input image, and for
  * each one of them it will do the following:
 
+ *
+ * \ingroup OTBPointSet
  */
 
 template<class TPointSet, class TRadiusType, class TIndexType>
diff --git a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
index 73f6039af90fcd2d1569c2a2275d188e315e37db..91227d388176336f0e66e156fed8bdb2fe5707f4 100644
--- a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
@@ -28,6 +28,8 @@ namespace otb
 /** \class ThresholdImageToPointSetFilter
  * \brief Produce a PointSet according to filtering conditions
  *
+ *
+ * \ingroup OTBPointSet
  */
 
 template <class TInputImage,
diff --git a/Modules/Core/PointSet/include/otbTransformPointSetFilter.h b/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
index 22fc26c9078982c591ade6a5b2680f6c6ce95587..620a06086b30d4f8baa4d111413a48c0243a84d5 100644
--- a/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
@@ -33,6 +33,8 @@ namespace otb
  * have to take care of transforming this data by other means.
  *
  * \ingroup PointSetFilters
+ *
+ * \ingroup OTBPointSet
  */
 template <class TInputPointSet, class TOutputPointSet, class TTransform>
 class ITK_EXPORT TransformPointSetFilter :
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
index 9a71e394bf0578b762e1d0ffcfa0f16e460fb670..5fd838de308f22350f856fb9803304c541260154 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
@@ -34,6 +34,8 @@ namespace otb
  * allocate the output image. This filter copies the input image in
  * the output image.
  *
+ *
+ * \ingroup OTBSpatialObjects
  */
 
 template <class TInputImage, class TOutputImage>
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
index 060db608bd090132e04bf67f54328f7ff4d5a143..7563d8552e7906ee20b439a393027a7384de11cb 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
@@ -32,6 +32,8 @@ namespace otb
  *
  *
  *
+ *
+ * \ingroup OTBSpatialObjects
  */
 
 template <class TInputImage, class TOutputImage>
diff --git a/Modules/Core/SpatialObjects/include/otbFillGapsFilter.h b/Modules/Core/SpatialObjects/include/otbFillGapsFilter.h
index ef405ef695379e2a22e40259f38e5e6b03f59e63..98e23e6cb533aba20c9323ef34c231235214abce 100644
--- a/Modules/Core/SpatialObjects/include/otbFillGapsFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbFillGapsFilter.h
@@ -26,6 +26,8 @@ namespace otb
 {
 /** \class FillGapsFilter
  * \brief To be documented
+ *
+ * \ingroup OTBSpatialObjects
  */
 class ITK_EXPORT FillGapsFilter : public itk::ProcessObject
 {
diff --git a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
index a6be5e3a5f3b69f0b19f2045b70dde0703e9f8ea..714ae00355bf84cc00b087fbe28f731b10e2a09d 100644
--- a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
@@ -30,6 +30,8 @@ namespace otb
  * ImageToLineSpatialObjectListFilter is the base class for all process objects
  * that output list of LineSpatialObject.
  *
+ *
+ * \ingroup OTBSpatialObjects
  */
 
 template <class TInputImage>
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
index b4c2e266351cd0297a6ed458fb3f53fe3c7492d4..c65adda4ce3f8e6cf4b3aec1e6b9f146eb4fd4a2 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
@@ -29,6 +29,8 @@ namespace otb
  * The Line is basically defined by a set of points.
  *
  * \sa LineSpatialObjectPoint
+ *
+ * \ingroup OTBSpatialObjects
  */
 template <unsigned int VDimension = 3>
 class ITK_EXPORT LineSpatialObject
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h
index febd276cedd2e10170b532e14e864d582beaf857..a41adde25156107958539ca742b8a8149c526c54 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h
@@ -28,6 +28,8 @@ namespace otb
 {
 /** \class LineSpatialObjectList
  * \brief TODO
+ *
+ * \ingroup OTBSpatialObjects
  */
 
 class ITK_EXPORT LineSpatialObjectList :        public std::list<itk::LineSpatialObject<2>::Pointer>,
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
index 7563c4c7646e5d4a18b581fd62945625d41d069a..333ea8bdc1963e1fb5a8d651a7624be427d92aaf 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
@@ -29,6 +29,8 @@ namespace otb
  *         as input.
  *
  *
+ *
+ * \ingroup OTBSpatialObjects
  */
 
 template <class TLinesList, class TPointSet>
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
index 1004750886d06cf235811dff8643df9a4d338e2d..76803062b31043a37ed6eec1a8d9e759400365e3 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
@@ -27,6 +27,8 @@ namespace otb
  * \class SpatialObjectSource
  * \brief Base class for filters producing a SpatialObject as output.
  * \ingroup DataSources
+ *
+ * \ingroup OTBSpatialObjects
  */
 template <class TSpatialObject>
 class ITK_EXPORT SpatialObjectSource
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
index dd15cde8ccd1aa521ac15a2e52747dda31d53851..190e02d48aab056498ea298d2e0590ed48b33a1b 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
@@ -32,6 +32,8 @@ namespace otb
  *  the maximum size of the object's bounding box is used.
  *  The spacing of the image is given by the spacing of the input
  *  Spatial object.
+ *
+ * \ingroup OTBSpatialObjects
  */
 template <class TInputSpatialObject, class TOutputImage>
 class ITK_EXPORT SpatialObjectToImageDrawingFilter : public itk::ImageSource<TOutputImage>
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
index 1f1ed7b8662a0c692e79ada1c9999e3d9f351d43..eab1aa67a8095ec7e88f36eb311da59ebb1ddcd4 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
@@ -33,6 +33,8 @@ namespace otb
  *
  * \sa ImageFileWriter
  * \sa StreamingImageVirtualFileWriter
+ *
+ * \ingroup OTBStreaming
  */
 template<class TImage>
 class ITK_EXPORT NumberOfDivisionsStrippedStreamingManager : public StreamingManager<TImage>
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
index 88b903b326db0945b75dd7913ef136ac8b2be803..e8498fd0c993b19d6329c89537f8832f3b579f2a 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
@@ -32,6 +32,8 @@ namespace otb
  *
  * \sa ImageFileWriter
  * \sa StreamingImageVirtualFileWriter
+ *
+ * \ingroup OTBStreaming
  */
 template<class TImage>
 class ITK_EXPORT NumberOfDivisionsTiledStreamingManager : public StreamingManager<TImage>
diff --git a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
index 0d88bb73e648b94c2dc03ef9daebc72491e045c4..1c539cf143bc2ff56fc2de63fe7000809c6e6877 100644
--- a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
@@ -33,6 +33,8 @@ namespace otb
  *
  * \sa ImageFileWriter
  * \sa StreamingImageVirtualFileWriter
+ *
+ * \ingroup OTBStreaming
  */
 template<class TImage>
 class ITK_EXPORT NumberOfLinesStrippedStreamingManager : public StreamingManager<TImage>
diff --git a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
index 94d782c02bd257f2838c1fb36a479a3089675ad6..9c04b81c12ba5af8681ca4f1384196f280a5b5a8 100644
--- a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
+++ b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
@@ -37,6 +37,8 @@ namespace otb
  *
  * \sa StreamingStatisticsImageFilter
  * \sa StreamingStatisticsVectorImageFilter
+ *
+ * \ingroup OTBStreaming
  */
 template <class TFilter>
 class ITK_EXPORT PersistentFilterStreamingDecorator
diff --git a/Modules/Core/Streaming/include/otbPersistentImageFilter.h b/Modules/Core/Streaming/include/otbPersistentImageFilter.h
index 87d78f2202c5f16572dae4d689f5bc005c0e4ce6..894ad10d690e16f93db41edddc68c08ff177caa6 100644
--- a/Modules/Core/Streaming/include/otbPersistentImageFilter.h
+++ b/Modules/Core/Streaming/include/otbPersistentImageFilter.h
@@ -37,6 +37,8 @@ namespace otb
  *
  * \sa StatisticsImageFilter
  * \sa StatisticsVectorImageFilter
+ *
+ * \ingroup OTBStreaming
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT PersistentImageFilter
diff --git a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
index bfcf83f34347a5da92bd452dbeaa032498af6112..02eb558f7f7d9c2deb08c29df7cd170f024146e3 100644
--- a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
+++ b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
@@ -57,6 +57,8 @@ namespace otb
  *  biased depending on the filters in the upstream pipeline. The bias
  *  correction factor parameters allows to compensate this bias to the first
  *  order.
+ *
+ * \ingroup OTBStreaming
  */
 class ITK_EXPORT PipelineMemoryPrintCalculator :
   public itk::Object
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
index 5c6a2859f34a196e84f97b000adc94722e87f009..42f8e9f5867bea954f74a17b6bf5b553dc331796 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
@@ -39,6 +39,8 @@ namespace otb
  * \sa ImageRegionAdaptativeSplitter
  * \sa ImageFileWriter
  * \sa StreamingImageVirtualFileWriter
+ *
+ * \ingroup OTBStreaming
  */
 template<class TImage>
 class ITK_EXPORT RAMDrivenAdaptativeStreamingManager : public StreamingManager<TImage>
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
index 4c7290545029064a15c492ef114d9a54d36b22ef..c787dcf4d3ee09448da25b78222d2c9ce4c17d72 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
@@ -34,6 +34,8 @@ namespace otb
  *
  * \sa ImageFileWriter
  * \sa StreamingImageVirtualFileWriter
+ *
+ * \ingroup OTBStreaming
  */
 template<class TImage>
 class ITK_EXPORT RAMDrivenStrippedStreamingManager : public StreamingManager<TImage>
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
index 8a48e30b996514d84acc50bc584bede0d4815088..5ff6a46655b086057db18df97f5eb429f7ac975e 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
@@ -33,6 +33,8 @@ namespace otb
  *
  * \sa ImageFileWriter
  * \sa StreamingImageVirtualFileWriter
+ *
+ * \ingroup OTBStreaming
  */
 template<class TImage>
 class ITK_EXPORT RAMDrivenTiledStreamingManager : public StreamingManager<TImage>
diff --git a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
index 0c26f5d4f414178d45793a7c53897e3f8f72633f..df23e7cc6e394045dee036a67f35142f408821b4 100644
--- a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
+++ b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
@@ -49,6 +49,8 @@ namespace otb
  * \sa PersistentImageFilter
  * \sa PersistentStatisticsImageFilter
  * \sa PersistentImageStreamingDecorator.
+ *
+ * \ingroup OTBStreaming
  */
 template <class TInputImage >
 class ITK_EXPORT StreamingImageVirtualWriter : public itk::ImageToImageFilter<TInputImage, TInputImage>
diff --git a/Modules/Core/Streaming/include/otbStreamingManager.h b/Modules/Core/Streaming/include/otbStreamingManager.h
index 10345733a859be2198c688e842c113fed1c9c0e0..107d9fbf37bec6dbba57f8d5499e1d5f18533384 100644
--- a/Modules/Core/Streaming/include/otbStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbStreamingManager.h
@@ -43,6 +43,8 @@ namespace otb
  *
  * \sa ImageFileWriter
  * \sa StreamingImageVirtualFileWriter
+ *
+ * \ingroup OTBStreaming
  */
 template<class TImage>
 class ITK_EXPORT StreamingManager : public itk::Object
diff --git a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
index da1e73ba4e1917e31d9f0a145226b3800449f6a4..7c579ba232d8e3ede8a85bf62dc53f97fa99dd9b 100644
--- a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
@@ -36,6 +36,8 @@ namespace otb
  *
  * \sa ImageFileWriter
  * \sa StreamingImageVirtualFileWriter
+ *
+ * \ingroup OTBStreaming
  */
 template<class TImage>
 class ITK_EXPORT TileDimensionTiledStreamingManager : public StreamingManager<TImage>
diff --git a/Modules/Core/Transform/include/otbCompositeTransform.h b/Modules/Core/Transform/include/otbCompositeTransform.h
index 8318f1e446133f20031bb75b47cfecf470b3a974..48f09faa36c64b532f61b7d3ab167d0c00152a77 100644
--- a/Modules/Core/Transform/include/otbCompositeTransform.h
+++ b/Modules/Core/Transform/include/otbCompositeTransform.h
@@ -35,6 +35,8 @@ namespace otb
 *
  *
 * \ingroup Transform
+ *
+ * \ingroup OTBTransform
 */
 
 //typedef enum
diff --git a/Modules/Core/Transform/include/otbForwardSensorModel.h b/Modules/Core/Transform/include/otbForwardSensorModel.h
index b85c2b7fa316df358f95f80b3aa28096ad09600a..a58c21a9adecbb1209240a8af4bc7bcafa637d22 100644
--- a/Modules/Core/Transform/include/otbForwardSensorModel.h
+++ b/Modules/Core/Transform/include/otbForwardSensorModel.h
@@ -37,6 +37,8 @@ namespace otb
  *
  * \ingroup Transform
  * \ingroup Projection
+ *
+ * \ingroup OTBTransform
  */
 
 template <class TScalarType,
diff --git a/Modules/Core/Transform/include/otbGenericMapProjection.h b/Modules/Core/Transform/include/otbGenericMapProjection.h
index c53897f49d077a64f5412f9ac69d8e5a095792a2..d3796f80d497083a41f0d33a693dbd412dbbb81d 100644
--- a/Modules/Core/Transform/include/otbGenericMapProjection.h
+++ b/Modules/Core/Transform/include/otbGenericMapProjection.h
@@ -48,6 +48,8 @@ enum TransformationDirection
  *
  * \ingroup Projection
  *
+ *
+ * \ingroup OTBTransform
  **/
 
 template <TransformDirection::TransformationDirection TDirectionOfMapping,
diff --git a/Modules/Core/Transform/include/otbGenericRSTransform.h b/Modules/Core/Transform/include/otbGenericRSTransform.h
index 7cc13ff6f496259280af2eb9730929f0ad5ce0b1..5db6fa1bc581b9d1bb5f47d61210d5e703821096 100644
--- a/Modules/Core/Transform/include/otbGenericRSTransform.h
+++ b/Modules/Core/Transform/include/otbGenericRSTransform.h
@@ -37,6 +37,8 @@ enum TransformAccuracy {UNKNOWN, ESTIMATE, PRECISE};
  *
  * \ingroup Projection
  *
+ *
+ * \ingroup OTBTransform
  **/
 
 template <class TScalarType = double,
diff --git a/Modules/Core/Transform/include/otbGeocentricTransform.h b/Modules/Core/Transform/include/otbGeocentricTransform.h
index 8112e259d5d5786ddca4876b08684e2d51694857..ec9562c3244e46e2032d7d3ec5a2a0da2de61b07 100644
--- a/Modules/Core/Transform/include/otbGeocentricTransform.h
+++ b/Modules/Core/Transform/include/otbGeocentricTransform.h
@@ -27,6 +27,8 @@ namespace otb
  *
  * \brief Convert coordinates from geocentric (X, Y, Z) to geographic (lon, lat, h)
  *
+ *
+ * \ingroup OTBTransform
  */
 template <TransformDirection::TransformationDirection TDirectionOfMapping,
     class TScalarType = double,
diff --git a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
index c88191d5549342578f7f3e397f6295a33614f1e3..3918474e448d5d99c6f0a296642ae2c69727eaac 100644
--- a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
+++ b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
@@ -43,6 +43,8 @@ namespace otb {
  *
  * \sa GenericRSTransform
  * \ingroup Projection
+ *
+ * \ingroup OTBTransform
  **/
 
 template<class TImage>
diff --git a/Modules/Core/Transform/include/otbInverseSensorModel.h b/Modules/Core/Transform/include/otbInverseSensorModel.h
index 176900ff93d95e8d0430649d0dc7d47910b4dc60..fb4238fb07e698c1bb2ff675824a18e7c2393c85 100644
--- a/Modules/Core/Transform/include/otbInverseSensorModel.h
+++ b/Modules/Core/Transform/include/otbInverseSensorModel.h
@@ -38,6 +38,8 @@ namespace otb
  *
  * \ingroup Transform
  * \ingroup Projection
+ *
+ * \ingroup OTBTransform
  */
 template <class TScalarType,
     unsigned int NInputDimensions = 2,
diff --git a/Modules/Core/Transform/include/otbLogPolarTransform.h b/Modules/Core/Transform/include/otbLogPolarTransform.h
index f9778c64ac725f0a9e9c59edc47351c430975ce8..9f0da81acb0e1bc452b3d3268236fee69d14c6e8 100644
--- a/Modules/Core/Transform/include/otbLogPolarTransform.h
+++ b/Modules/Core/Transform/include/otbLogPolarTransform.h
@@ -39,6 +39,8 @@ namespace otb
  *
  * \sa InverseLogPolarTransform
  * \ingroup Transform
+ *
+ * \ingroup OTBTransform
  */
 template <class TScalarType>
 class ITK_EXPORT LogPolarTransform
diff --git a/Modules/Core/Transform/include/otbSensorModelBase.h b/Modules/Core/Transform/include/otbSensorModelBase.h
index cb076ff4e279e5a476ee26c031be70a485f509e3..b74f23977e7e06e8f096faaa11198c24061a8093 100644
--- a/Modules/Core/Transform/include/otbSensorModelBase.h
+++ b/Modules/Core/Transform/include/otbSensorModelBase.h
@@ -37,6 +37,8 @@ namespace otb
  *
  * \ingroup Projection
  *
+ *
+ * \ingroup OTBTransform
  */
 template <class TScalarType,
     unsigned int NInputDimensions = 3,
diff --git a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
index ad3ee83c30137365851ccd4c34d64aaa5604f7db..4ebdfce5c43e1299bb7195712b8ad2df55b1e3c9 100644
--- a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
+++ b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
@@ -41,6 +41,8 @@ namespace otb
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBTransform
  */
 
 template <class TInputImage, class TOutputImage, class TDisplacementField>
diff --git a/Modules/Core/Transform/include/otbTransform.h b/Modules/Core/Transform/include/otbTransform.h
index 4aca4473322ba075ab68716b1743c505e8e236b1..688179fe46e572cd2e1a81759757be62c56d6dcc 100644
--- a/Modules/Core/Transform/include/otbTransform.h
+++ b/Modules/Core/Transform/include/otbTransform.h
@@ -28,6 +28,8 @@ namespace otb
  * \brief Class to overload method passed to virtual pure in ITK V4.
  *
  *
+ *
+ * \ingroup OTBTransform
  */
 template< class TScalarType,
           unsigned int NInputDimensions = 3,
diff --git a/Modules/Core/VectorDataBase/include/otbDataNode.h b/Modules/Core/VectorDataBase/include/otbDataNode.h
index f536f3a786b5968e8aaab83602ea26ef76cde04e..9765f7795568a06586843c69a0dbd0bc9a57901c 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNode.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNode.h
@@ -65,6 +65,8 @@ enum
  * - the precision of the value associated with objects such as lines or polygons (default double)
  *
  * \sa VectorData
+ *
+ * \ingroup OTBVectorDataBase
  */
 template <class TPrecision = double, unsigned VDimension = 2, class TValuePrecision = double>
 class DataNode
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h b/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h
index 7024b5c5a7fcfb6a8e71336c6a94c6a79421e9d5..afbb478f3fe9e72f18938479316972d7630dcdd6 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h
@@ -38,6 +38,8 @@ namespace otb
   * \ingroup Functions
   * \sa DataNodeImageFunction
   * \sa DataNodeVectorDataFunction
+ *
+ * \ingroup OTBVectorDataBase
  */
 
 template <class TDataNode, class TOutput>
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
index 0ee929c42b1b7d8d97210ee64c85d759ed944a69..5234c09b40ecadcdd78e587965cafaafd3725ad5 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
@@ -32,6 +32,8 @@ namespace otb
   *
   * \ingroup Functions
   * \sa NDVIDataNodeFeatureFunction
+ *
+ * \ingroup OTBVectorDataBase
  */
 
 template <
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
index a25fff2e54cb423ec8544fc9a99d03f6393bdbcf..2e10601596e806a930a9c506f0b5cd891f51a681 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
@@ -31,6 +31,8 @@ namespace otb
   *
   * \ingroup Functions
   * \sa
+ *
+ * \ingroup OTBVectorDataBase
  */
 
 template <
diff --git a/Modules/Core/VectorDataBase/include/otbGISConnectionImplementation.h b/Modules/Core/VectorDataBase/include/otbGISConnectionImplementation.h
index bfd9f61543aee0a15ce1b6a21a648046b95c5ee5..e4145bea2486a9a68b93f7260b6180df75cc2a89 100644
--- a/Modules/Core/VectorDataBase/include/otbGISConnectionImplementation.h
+++ b/Modules/Core/VectorDataBase/include/otbGISConnectionImplementation.h
@@ -27,6 +27,8 @@ namespace otb
  * \brief Base class for GIS DB connection implementations
  *
  *
+ *
+ * \ingroup OTBVectorDataBase
  */
 
 template <class TransactorType>
diff --git a/Modules/Core/VectorDataBase/include/otbGISTable.h b/Modules/Core/VectorDataBase/include/otbGISTable.h
index 9a0be97318d82ee902e51868d1374bbc9fe8d60b..d4a8e8e109b03f824a00244571ac6c6ba06ec1ba 100644
--- a/Modules/Core/VectorDataBase/include/otbGISTable.h
+++ b/Modules/Core/VectorDataBase/include/otbGISTable.h
@@ -31,6 +31,8 @@ namespace otb
  * \sa GISTableFileReader
  * \sa GISTableFileWriter
  *
+ *
+ * \ingroup OTBVectorDataBase
  */
 template <class TConnectionImplementation, class TPrecision = double, unsigned int TSpatialDimension = 2>
 class GISTable
diff --git a/Modules/Core/VectorDataBase/include/otbGISTableSource.h b/Modules/Core/VectorDataBase/include/otbGISTableSource.h
index f5713e5672f884a4c924920261bf3c165456a7a9..eeeaf010ab904748fbfe925b8a6ad5947eb162c9 100644
--- a/Modules/Core/VectorDataBase/include/otbGISTableSource.h
+++ b/Modules/Core/VectorDataBase/include/otbGISTableSource.h
@@ -31,6 +31,8 @@ namespace otb
  *
  * \ingroup IO
  *
+ *
+ * \ingroup OTBVectorDataBase
  */
 
 template <class TOutputGISTable>
diff --git a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
index 824572eca8043948369959f87c9ae2518527eeed..0816817871801db661c6fc31758600be7be8db7e 100644
--- a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
+++ b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
@@ -31,6 +31,8 @@ namespace otb
  * The precision of the value can be set.
  *
  * \sa itk::PolyLineParametricPath.
+ *
+ * \ingroup OTBVectorDataBase
  */
 template <class TValue, unsigned int VDimension = 2>
 class ITK_EXPORT PolyLineParametricPathWithValue
diff --git a/Modules/Core/VectorDataBase/include/otbPolygon.h b/Modules/Core/VectorDataBase/include/otbPolygon.h
index fb19c026ebe9dbbd6d3a978dcc14e744a9a36c24..6f57b94fef836e455be083e1ec0141c3eddf988b 100644
--- a/Modules/Core/VectorDataBase/include/otbPolygon.h
+++ b/Modules/Core/VectorDataBase/include/otbPolygon.h
@@ -34,6 +34,8 @@ namespace otb
  * as IsInside, IsOnEdge, IsTouching, IsCrossing.
  *
  * \sa otb::PolyLineParametricPathWithValue
+ *
+ * \ingroup OTBVectorDataBase
  */
 template<class TValue = double>
 class ITK_EXPORT Polygon
diff --git a/Modules/Core/VectorDataBase/include/otbRemoteSensingRegion.h b/Modules/Core/VectorDataBase/include/otbRemoteSensingRegion.h
index 55d509f0f8d534d884a56df2f4f8e7bde8441b27..5739ca4a4feb1d4a2cfdb8be6a449c062a721ddd 100644
--- a/Modules/Core/VectorDataBase/include/otbRemoteSensingRegion.h
+++ b/Modules/Core/VectorDataBase/include/otbRemoteSensingRegion.h
@@ -47,6 +47,8 @@ namespace otb
  * images).
  *
  * \sa VectorDataExtractROI
+ *
+ * \ingroup OTBVectorDataBase
  */
 
 template <class TType>
diff --git a/Modules/Core/VectorDataBase/include/otbVectorData.h b/Modules/Core/VectorDataBase/include/otbVectorData.h
index 51bc331f70e628c6165c93ba5b858fbc855b096b..3be1c89cbcbd6b87b5c5f7753b76a40776bae7fa 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorData.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorData.h
@@ -48,6 +48,8 @@ namespace otb
  * \sa VectorDataFileReader
  * \sa VectorDataFileWriter
  *
+ *
+ * \ingroup OTBVectorDataBase
  */
 template <class TPrecision = double, unsigned int VDimension = 2, class TValuePrecision = double>
 class VectorData
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h b/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h
index ca21bf4f782bc52ecb1d9adcd6cad381ef2de94e..c6ed12cce984e2a9c907353d2f5e21fee2fdabbe 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h
@@ -49,6 +49,8 @@ namespace otb
  *
  * \ingroup IOFilters
  *
+ *
+ * \ingroup OTBVectorDataBase
  */
 class ITK_EXPORT VectorDataIOBase : public itk::LightProcessObject
 {
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h b/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h
index 30021bd07a53f773a416f28d572cec57532aee46..5788d0873ec49ea08bb288df4abe31be4c599211 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h
@@ -36,6 +36,8 @@ namespace otb
  *
  * \todo add the accessor to enable modifying/updating the data.
  *
+ *
+ * \ingroup OTBVectorDataBase
  */
 
 class VectorDataKeywordlist
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
index c71d58dbc55ab50ddee154f532803d5416beec0b..a1397fb92b7db9702ba7ea5da7ccf6e47d5effb8 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
@@ -30,6 +30,8 @@ namespace otb
  *   \brief Compute public properties of the vectordata
  *
  * \sa VectorData
+ *
+ * \ingroup OTBVectorDataBase
  */
 
 template <class TVectorData>
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataSource.h b/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
index 5a97920ee6ea4abeb03a304fdef1ffe87883186d..d2e57fe9953c9e96630f7a881a8f8c139b88ff2c 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
@@ -31,6 +31,8 @@ namespace otb
  *
  * \ingroup IO
  *
+ *
+ * \ingroup OTBVectorDataBase
  */
 
 template <class TOutputVectorData>
diff --git a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
index 95a795bbe99b827e19bc55ac898752ba3e3753bf..41530eb4a7375d8a6421dff071c4b813d1560701 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class CloudDetectionFilter
  * \brief Applies cloud detection functor to an image.
+ *
+ * \ingroup OTBCloudDetection
  */
 template <class TInputImage, class TOutputImage, class TFunction = Functor::CloudDetectionFunctor<
         typename TInputImage::PixelType, typename TOutputImage::PixelType> >
diff --git a/Modules/Detection/CloudDetection/include/otbCloudDetectionFunctor.h b/Modules/Detection/CloudDetection/include/otbCloudDetectionFunctor.h
index 026fd420cbeeb843ccf07c899f2e8ef5faedb0bb..1487c20dbfa9ffee01c6f3061255dcc548153526 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudDetectionFunctor.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudDetectionFunctor.h
@@ -25,6 +25,8 @@ namespace otb
 /** \class CloudDetectionFunctor
  *  \brief This functor first uses CloudEstimatorFunctor
  *  \brief And then binarise the image with two thresholds
+ *
+ * \ingroup OTBCloudDetection
  */
 namespace Functor
 {
diff --git a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
index ff65133e4328b638412d5b692207c490782ad083..89260e2b2d38f99ac08dd7f6237a8dd8f5f9bc64 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
@@ -31,6 +31,8 @@ namespace otb
  * Applies a color reversal.
  *
  * \example FeatureExtraction/CloudDetectionExample.cxx
+ *
+ * \ingroup OTBCloudDetection
  */
 template <class TInputImage, class TOutputImage, class TFunction = Functor::SpectralAngleFunctor<
         typename TInputImage::PixelType, typename TOutputImage::PixelType> >
diff --git a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFunctor.h b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFunctor.h
index 70949b8179064bb9167fa65b5bacf25dacc5987a..9eaa4ab785b1bde78f980a1d23ee1e52c54ef290 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFunctor.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFunctor.h
@@ -30,6 +30,8 @@ namespace Functor
  *  This functor first computes the spectral angle according to a reference pixel.
  *  Then multiplies the result by a Gaussian coefficient
  *  And reverse the pixel values.
+ *
+ * \ingroup OTBCloudDetection
  */
 
 template<class TInput, class TOutputValue>
diff --git a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
index 64c468b970a75de51763f9bab0938d103a46a94a..3351c36c547f1a73a12f724baf996169a7f7e94a 100644
--- a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
+++ b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
@@ -46,6 +46,8 @@ public:
  *
  *  This class inherits PersistentImageFilter and provides the Reset/Synthesize functions,
  *  plus the ThreadedGenerateData function implementing the image function evaluation
+ *
+ * \ingroup OTBObjectDetection
  */
 template <class TInputImage, class TVectorData, class TFunctionType, class TListSample, class TLabel>
 class ITK_EXPORT PersistentDescriptorsListSampleGenerator :
@@ -230,6 +232,8 @@ private:
  *  The label is read from the vector data using the data field "Class", read as an int
  *
  *  This class is streaming capable and multithreaded
+ *
+ * \ingroup OTBObjectDetection
  */
 template <class TInputImage, class TVectorData, class TListSample, class TLabel, class TOutputPrecision = double, class TCoordRep = double>
 class ITK_EXPORT DescriptorsListSampleGenerator :
diff --git a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
index dbc5c412b9abc2db3400273aaeebcfafed4d5d8a..88dc5df298f153e9b97982343240254994f32bfa 100644
--- a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
@@ -37,6 +37,8 @@ namespace otb
  *  FlusserMomentsImageFunction to an existing
  *  MetaImageFunction through the method Create.
  *
+ *
+ * \ingroup OTBObjectDetection
  */
 
 template <class TImageType, class TCoordRep = double, class TPrecision = double>
diff --git a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
index 77326211b89da3f843f503ad952d5be96e914bb9..80e4af8bcdb291fba2cddf3e89d787d9ed7d0846 100644
--- a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
@@ -36,6 +36,8 @@ namespace otb
  *  FourierMellinDescriptorsImageFunction to an existing
  *  MetaImageFunction through the method Create.
  *
+ *
+ * \ingroup OTBObjectDetection
  */
 
 template <class TImageType, class TCoordRep = double, class TPrecision = double>
diff --git a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
index 68b1911515cd5fce393c108079bfa7e46ba753dd..a8c4a2fe2d4c4808a0494ae988d8030b0f859f59 100644
--- a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
@@ -37,6 +37,8 @@ namespace otb
  *  HaralickTexturesImageFunction to an existing
  *  MetaImageFunction through the method Create.
  *
+ *
+ * \ingroup OTBObjectDetection
  */
 
 template <class TImageType, class TCoordRep = double, class TPrecision = double>
diff --git a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
index b76a0b4e0155cfa3231f922c90c549ce872fe0d9..b632f94ec83cc2cb34665d3e80ff9efcb607f3c9 100644
--- a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
+++ b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
@@ -43,6 +43,8 @@ namespace otb
  *  (using "Class" as a default key).
  *  The field is retrieved by GetFieldAsInt(), thus must be int-compatible
  *
+ *
+ * \ingroup OTBObjectDetection
  */
 template <class TVectorData>
 class ITK_EXPORT LabeledSampleLocalizationGenerator :
diff --git a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
index 650006465169c70a4e8b484f3def0492aaae75ac..ab8c43ee5885068188bf28bd2754f979208e02f8 100644
--- a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
@@ -37,6 +37,8 @@ namespace otb
  *  LocalHistogramImageFunction to an existing MetaImageFunction
  *  through the method Create.
  *
+ *
+ * \ingroup OTBObjectDetection
  */
 
 template <class TImageType, class TCoordRep = double, class TPrecision = double>
diff --git a/Modules/Detection/ObjectDetection/include/otbMultiChannelIFFactory.h b/Modules/Detection/ObjectDetection/include/otbMultiChannelIFFactory.h
index ee0b437308f5bb2c8b2febe886986a702da8b401..f4751363284bc73c2722bef84edd6d7e1de61949 100644
--- a/Modules/Detection/ObjectDetection/include/otbMultiChannelIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbMultiChannelIFFactory.h
@@ -36,6 +36,8 @@ namespace otb
  *  call an ImageFunctionFactory for each band of the input image or
  *  once if the image type is otb::Image.
  *
+ *
+ * \ingroup OTBObjectDetection
  */
 
 template <class TIFFactory, class TInputImage>
diff --git a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
index 806b6053c29d90fe46337d3004aad22951c2459f..9de74d093f397f3c960232771f5ce9f30580590e 100644
--- a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
@@ -37,6 +37,8 @@ namespace otb
  *  RadiometricMomentsImageFunction to an existing MetaImageFunction
  *  through the method Create.
  *
+ *
+ * \ingroup OTBObjectDetection
  */
 
 template <class TImageType, class TCoordRep = double, class TPrecision = double>
diff --git a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
index 4a61e8912289c7a37119a6ee81ceed11342836c7..66bdb8a9596ba0524e62344447a1d6ab813d23e5 100644
--- a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
+++ b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
@@ -48,6 +48,8 @@ namespace otb
  *
  *
  *
+ *
+ * \ingroup OTBObjectDetection
  */
 
 template <class TPrecision = double, class TCoordRep = double>
diff --git a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
index 137eae43b3de7b5f57f8723ff92d1b9c5fefe076..57c2fbd5d12f09052fad261a461a0f653c3eb7a8 100644
--- a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
@@ -67,6 +67,8 @@ namespace otb
  * \sa RemoveTortuousPathListFilter
  * \sa LinkPathListFilter
  * \sa LikelihoodPathListFilter
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TInputImage, class TOutputPath>
 class ITK_EXPORT GenericRoadExtractionFilter
diff --git a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
index d1f258f67c99d7106498f4d77be5eebffc2ab7ab..f144fdbaab6038d920865913ea6ad4ca0f17d069 100644
--- a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
@@ -30,6 +30,8 @@ namespace otb
 /** \class ImageToPathListAlignFilter
  * \brief Base class used to implement filter to extract align points or group of points and give the coordinates.
  *
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TInputImage, class TOutputPath>
 class ITK_EXPORT ImageToPathListAlignFilter : public ImageToPathListFilter<TInputImage, TOutputPath>
diff --git a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
index 4b07882c5db8485bae9f6fe22529c1dd167593c0..53e02888ec1c792b03589bef3be33a0864f09856 100644
--- a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
@@ -31,6 +31,8 @@ namespace otb
  * (using a PolyLineImageConstIterator) divided by the number of points in the
  * path
  *
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TPath, class TImage>
 class ITK_EXPORT LikelihoodPathListFilter
diff --git a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
index ca5d5836ccdc5fb2e113d8b1dfa3088d31e0d4e5..ac84cda4baffa0689eb87f02c4ea2f402dad9285 100644
--- a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
@@ -39,6 +39,8 @@ namespace otb
  *
    * \ingroup PathFilters
  *
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TPath>
 class ITK_EXPORT LinkPathListFilter
diff --git a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
index 7cda01913f801d9217737e833aca1203d486404a..c5b9917dabe4af5dad0378fe687fe117084756f4 100644
--- a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * SetInput() method set the modulus image input and
  * SetInputDirection() set the image direction input.
  *
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TInputImage,
     class TInputImageDirection,
diff --git a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
index aedaf53b8ee6a3eb8a9faa95bb24380d2f6e56ee..d207d34c2f8e1d0d1000d1fa8a9b6fddfd08fef7 100644
--- a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
@@ -44,6 +44,8 @@ namespace otb
  * gradient vectors.
  *  \ingroup Streamed
  *  \ingroup Threaded
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TInputImage, class TOutputModulus, class TOutputDirection>
 class ITK_EXPORT NeighborhoodScalarProductFilter
diff --git a/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h b/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h
index ae37c0d0ef0b0850fd10cbb1c3307fe15a6d854a..3f632bcd2a896d67be4c412d7f2695a9d035192a 100644
--- a/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h
@@ -31,6 +31,8 @@ namespace Functor
  *  \brief This functor is used by the NonMaxRemovalByDirectionFilter
  *  \sa NonMaxRemovalByDirectionFilter
  *  \ingroup Functor
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TInput1, class TInput2, class TOutput>
 class NonMaxRemovalByDirectionFunctor
@@ -98,6 +100,8 @@ public:
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TInputModulus, class TInputDirection, class TOutputImage>
 class ITK_EXPORT NonMaxRemovalByDirectionFilter
diff --git a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
index 644ba8a6527d5a42a5f663e468ab2563a3a6339f..928f9f0e51ceca8da7ac7ab7ed91b74f82f17f9d 100644
--- a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
@@ -45,6 +45,8 @@ namespace otb
  *
    * \ingroup PathFilters
  *
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TPath>
 class ITK_EXPORT ParallelLinePathListFilter
diff --git a/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h b/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h
index 498cabbff3923aef5830195961a8c75c30ec971e..60a84bf77b3080763a3038a28b0e59315d80498f 100644
--- a/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h
@@ -30,6 +30,8 @@ namespace Functor
  *  Used by the RemoveIsolatedByDirectionFilter.
  *  \sa RemoveIsolatedByDirectionFilter
  *  \ingroup Functor
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TInput1, class TInput2, class TOutput>
 class RemoveIsolatedByDirectionFunctor
@@ -71,6 +73,8 @@ public:
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TInputModulus, class TInputDirection, class TOutputImage>
 class ITK_EXPORT RemoveIsolatedByDirectionFilter
diff --git a/Modules/Detection/RoadExtraction/include/otbRemoveTortuousPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbRemoveTortuousPathListFilter.h
index 8a7e1bc47c452ddbdc906fd7df85dd3715034e15..5cbc16273948e9b5252a4ec36aab7bb0ee309433 100644
--- a/Modules/Detection/RoadExtraction/include/otbRemoveTortuousPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRemoveTortuousPathListFilter.h
@@ -46,6 +46,8 @@ namespace otb
    *
    * \example FeatureExtraction/ExtractRoadByStepsExample.cxx
    *
+ *
+ * \ingroup OTBRoadExtraction
  */
 
 //   template <class TPath>
diff --git a/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h b/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
index 4e3095847bea76871b6d8aa9ed2db93685800c3b..6feb2644d8f76fdf947ad984dbb5c5ccaf4de5ea 100644
--- a/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
@@ -34,6 +34,8 @@ namespace Functor
  *
  * \example FeatureExtraction/ExtractRoadByStepsExample.cxx
  *
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TInput1, class TInput2, class TOutput>
 class RemoveWrongDirectionFunctor
@@ -67,6 +69,8 @@ public:
  * \sa NeighborhoodScalarProductFilter
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TInputModulus, class TInputDirection, class TOutputImage>
 class ITK_EXPORT RemoveWrongDirectionFilter
diff --git a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
index 85bb156b5ff0a7ac6f6fb94715b1291ac7e342ab..c934227476d1d15439da17630980d02989e0dc5a 100644
--- a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
@@ -52,6 +52,8 @@ namespace otb
  *
  * \example FeatureExtraction/ExtractRoadExample.cxx
  *
+ *
+ * \ingroup OTBRoadExtraction
  */
 template <class TInputImage, class TOutputPath>
 class ITK_EXPORT RoadExtractionFilter
diff --git a/Modules/Detection/RoadExtraction/include/otbSimplifyPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbSimplifyPathListFilter.h
index 279791de7d0105611be1f6eb5c289cdfbbcd676d..b4bc6c9881a2e7c443657eeb9f9f46cef2fd261c 100644
--- a/Modules/Detection/RoadExtraction/include/otbSimplifyPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbSimplifyPathListFilter.h
@@ -57,6 +57,8 @@ namespace otb
    *
    * \example FeatureExtraction/ExtractRoadByStepsExample.cxx
    *
+ *
+ * \ingroup OTBRoadExtraction
  */
 
 template <class TPath>
diff --git a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
index 8635b00d65058de9fd1d78615171b702ae65afc2..7545483e5c749ac3bf05241d25fb521d0fbac01b 100644
--- a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
@@ -45,6 +45,8 @@ namespace otb
   * \ingroup VectorDataFilter
   * \sa VectorDataToSpecificDescriptionFilterBase
   * \sa VectorDataToBuildingDescriptionFilter
+ *
+ * \ingroup OTBRoadExtraction
  */
 
 template <class TVectorData, class TOpticalImage>
diff --git a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
index dfa8e789c37692063948301d69d2aed151cda8c2..867af0a779f7f943ef6204f6ced4bec701016305 100644
--- a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
+++ b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
@@ -40,6 +40,8 @@ namespace Functor
 /** \class RadiometricNonWaterNonVegetationIndexFunctor
  *  \brief This functor computes ndwi and ndvi of an image
  *  \brief in order to find urban areas and generate a grayscale image
+ *
+ * \ingroup OTBUrbanArea
  */
 template<class TInput, class TOutput = double>
 class RadiometricNonWaterNonVegetationIndexFunctor
@@ -90,6 +92,8 @@ protected:
 /** \class RadiometricNonWaterNonVegetationDetectionFunctor
  *  \brief This functor uses computes RadiometricNonWaterNonVegetationIndexFunctor
  *  \brief and appli a threshold to produce a binary image
+ *
+ * \ingroup OTBUrbanArea
  */
 template<class TInput, class TOutput>
 class RadiometricNonWaterNonVegetationDetectionFunctor
@@ -140,6 +144,8 @@ protected:
 /** \class UrbanAreaDetectionImageFilter
  *  \brief This filter uses associated functors to produce a binary or grayscale image
  *  \brief where the white areas represents the urban areas.
+ *
+ * \ingroup OTBUrbanArea
  */
 template <class TInputImage, class TOutputImage,
     class TFunction = Functor::RadiometricNonWaterNonVegetationIndexFunctor<
diff --git a/Modules/Feature/Corner/include/otbHarrisImageFilter.h b/Modules/Feature/Corner/include/otbHarrisImageFilter.h
index 4abb345b8deb59da15a7191c24c3923860c55770..c066f5d904ed47cc9baa20ee1e4676c414ecc49d 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageFilter.h
+++ b/Modules/Feature/Corner/include/otbHarrisImageFilter.h
@@ -45,6 +45,8 @@ The output of the detector is \f$[det(\mu) - \alpha trace^2(\mu)\f$.
 
 The interest points can then be extracted with a thresholding filter.
  *
+ *
+ * \ingroup OTBCorner
  */
 
 template <class TInputImage, class TOutputImage>
diff --git a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
index f14958b303eaa3b3a0a24986775d22d77d22ac30..2c2d8d91b0973bf6af6b722b2207a697e2852134 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
+++ b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
@@ -26,6 +26,8 @@ namespace otb
 
 /** \class HarrisImageToPointSetFilter
  * \brief TODO
+ *
+ * \ingroup OTBCorner
  */
 
 template <class TInputImage,
diff --git a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
index 7b49e0c3c00830181f2bd89e6d01f3ea8b9f82a2..c4da86c681a5e3e93b495ad542101a96d6749541 100644
--- a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
+++ b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
@@ -30,6 +30,8 @@ namespace otb
 
 /** \class LineSpatialObjectListToRightAnglePointSetFilter
  * \brief TODO
+ *
+ * \ingroup OTBCorner
  */
 
 template <class TImage, class TLinesList, class TPointSet>
diff --git a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
index 8f6928d0dede3f7a824835e86fe7651bb2459261..db6c0dcca4865b92cda0c6d94a5d953e42b0ad39 100644
--- a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
+++ b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
@@ -37,6 +37,8 @@ namespace otb
  *  firsts vertex of each line features as a segment.
  *
  *
+ *
+ * \ingroup OTBCorner
  */
 
 template <class TVectorData>
diff --git a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
index 22aee973f6f5565accaa26288650b8fc256d92ff..f8e3c53f44ec06a951674abb465efd3ede4390ad 100644
--- a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
+++ b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
@@ -40,6 +40,8 @@ namespace otb
  * within its neighborhood is computed.
  *
  * The output is a map of key points density.
+ *
+ * \ingroup OTBDensity
  */
 
 template <class TInputImage, class TOutputImage, class TDetector>
diff --git a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
index 6db85d75f3ac7c5861e228512a30536cc4dfbe52..e124e78626fa003ecfb2b3d06866d591673779a9 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
@@ -30,6 +30,8 @@ namespace otb
  *
  *
  * \ingroup PointSetFunctions
+ *
+ * \ingroup OTBDensity
  */
 template <class TPointSet, class TOutput>
 class ITK_EXPORT PointSetDensityEpanechnikovFunction : public PointSetFunction<TPointSet, TOutput>
diff --git a/Modules/Feature/Density/include/otbPointSetDensityFunction.h b/Modules/Feature/Density/include/otbPointSetDensityFunction.h
index c7a1300a0aa2ca89c25417c18f0fd64412ade945..971e0436f984e5f16dcd13745780150448ccbb5e 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityFunction.h
@@ -29,6 +29,8 @@ namespace otb
  *
  *
  * \ingroup PointSetFunctions
+ *
+ * \ingroup OTBDensity
  */
 template <class TPointSet, class TOutput>
 class ITK_EXPORT PointSetDensityFunction : public PointSetFunction<TPointSet, TOutput>
diff --git a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
index adc6c5b3b86f42c2dd15cc612501f31d47a9aba9..1415469f759549559237f1cc8dbf2fdcd403576d 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
@@ -30,6 +30,8 @@ namespace otb
  *
  *
  * \ingroup PointSetFunctions
+ *
+ * \ingroup OTBDensity
  */
 template <class TPointSet, class TOutput>
 class ITK_EXPORT PointSetDensityGaussianFunction : public PointSetFunction<TPointSet, TOutput>
diff --git a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
index fb9c923a8d269b491fd094557e206e40ec62cbcd..c898ccebb5cb7d1ec728f4ccc0dc65ac320bd57b 100644
--- a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
+++ b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
@@ -31,6 +31,8 @@ namespace otb
 
 /** \class PointSetToDensityImageFilter
  *  \brief Draw the density of a point set on an image
+ *
+ * \ingroup OTBDensity
  */
 
 template <class TInputPointSet, class TOutputImage,
diff --git a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
index 105a826280cd26b1a0245754f3940cd8506787e3..7c06b5bb240fecac584ec8c315aa20e73e097527 100644
--- a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
@@ -41,6 +41,8 @@ namespace otb
  * \note the Fourier transform image is coded from 0.0 to 1.0
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBDescriptors
  */
 
 template <class TPixel,
diff --git a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
index 615333d9b0f7f412b58b6e5b91cabbc3839a5f79..88ee4305610211f1af20db20695a5c176aa792ba 100644
--- a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
+++ b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
@@ -51,6 +51,8 @@ namespace otb
  * coordinate representation type (e.g. float or double).
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBDescriptors
  */
 
 template <class TInputImage, class TCoordRep = double>
diff --git a/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h b/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h
index 8adeabfe479408b1ecc46b76297b1bab61daea20..06de52a3f39a9df37769bb6029b3ea09fdf7b2dc 100644
--- a/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h
@@ -25,6 +25,8 @@ namespace otb
 
 /** \class HessianToScalarImageFilter
  * \brief TODO
+ *
+ * \ingroup OTBDescriptors
  */
 
 namespace Functor
diff --git a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
index dc864dfa6d596e1cf9e79ed7183ba81692fe6c5f..1dba5813fb688b88beeba0cabc96594ae33787c8 100644
--- a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
+++ b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
@@ -60,6 +60,8 @@ namespace otb
  * coordinate representation type (e.g. float or double).
 
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBDescriptors
  */
 
 template <class TInputImage, class TOutputPrecision = double, class TCoordRep = double >
diff --git a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
index dffce7d20932fdfb69b192a981a8cf41ff7a6ed7..59c6748426ae11e5d2e2cba8d6287d9fccb848d8 100644
--- a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
@@ -39,6 +39,8 @@ namespace Functor
  * The First  component is  : Dxx
  * The Second component is  : Dyy
  * The Third  component is  : Dxy
+ *
+ * \ingroup OTBDescriptors
  */
 template <class TInput, class TOutput>
 class HessianDeterminant
@@ -75,6 +77,8 @@ public:
  *  of each pixel's matrix is computed.
  *
  *  \sa itk::HessianRecursiveGaussianImageFilter
+ *
+ * \ingroup OTBDescriptors
  */
 template <class TInputImage, class TOutputImage, class TPrecision = double>
 class ITK_EXPORT ImageToHessianDeterminantImageFilter
diff --git a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
index 057b9895e0d390a6fb4980088768a0587fd8505f..093f614cae5aa484805cb8209065f0032b987ade 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
@@ -43,6 +43,8 @@ namespace Functor
 {
 /** \class MagnitudeFunctor
  *  \brief This functor computes the magnitude of a covariant vector.
+ *
+ * \ingroup OTBDescriptors
  */
 template <class TInputPixel, class TOutputPixel>
 class MagnitudeFunctor
@@ -58,6 +60,8 @@ public:
 /** \class OrientationFunctor
  *  \brief This functor computes the orientation of a cavariant vector<br>
  *   Orientation values lies between 0 and 2*Pi.
+ *
+ * \ingroup OTBDescriptors
  */
 template <class TInputPixel, class TOutputPixel>
 class OrientationFunctor
@@ -104,6 +108,8 @@ public:
  *
  * \example FeatureExtraction/SIFTExample.cxx
  *
+ *
+ * \ingroup OTBDescriptors
  */
 template <class TInputImage, class TOutputPointSet>
 class ITK_EXPORT ImageToSIFTKeyPointSetFilter
diff --git a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
index ac4ca91a62a22b2aad8417c598b02b958433a3f9..73cc5bcd44dd59543dee08c8183cbd0e533dcc30 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
@@ -54,6 +54,8 @@ namespace otb
  * Orientation is expressed in degree in the range of [0, 360]
  *
  *  \sa otb::ImageToDeterminantHessianImage
+ *
+ * \ingroup OTBDescriptors
  */
 
 template <class TInputImage, class TOutputPointSet>
diff --git a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
index 270e71572b4b0a3655bd81b7b8799fa8e8eafa33..39f5f54bcd1e7e15b0cde95ffd9c7db7c8c8eedb 100644
--- a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
+++ b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
@@ -41,6 +41,8 @@ namespace otb
  *   \sa Landmark
  *   \sa PointSet
  *   \sa EuclideanDistanceMetric
+ *
+ * \ingroup OTBDescriptors
  */
 template <class TPointSet, class TDistance = itk::Statistics::EuclideanDistanceMetric<typename TPointSet::PixelType> >
 class ITK_EXPORT KeyPointSetsMatchingFilter
diff --git a/Modules/Feature/Descriptors/include/otbLandmark.h b/Modules/Feature/Descriptors/include/otbLandmark.h
index 83b5dec4145b6b7d3f9350fb6f366e60007ef2df..75552969d9149cfb4c0dc724b1199a11f3cefc52 100644
--- a/Modules/Feature/Descriptors/include/otbLandmark.h
+++ b/Modules/Feature/Descriptors/include/otbLandmark.h
@@ -30,6 +30,8 @@ namespace otb
  * It is used to represent match between keypoint like SIFT keypoint for instance.
  *
  * The class TLandmarkData can be used to store any information on the matching.
+ *
+ * \ingroup OTBDescriptors
  */
 template <class TPoint, class TPointData, class TLandmarkData = TPointData>
 class ITK_EXPORT Landmark
diff --git a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
index cbd4dcbb7694cc449f717993fbffc1c8646ddf66..e07a0af4a1e95999bc62f272fb3b8eb1d86c7821 100644
--- a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
@@ -42,6 +42,8 @@ namespace otb
  * \sa ImageToSIFTKeyPointSetFilter
  *
  * \example FeatureExtraction/SIFTFastExample.cxx
+ *
+ * \ingroup OTBDescriptors
  */
 template <class TInputImage, class TOutputPointSet>
 class ITK_EXPORT SiftFastImageFilter
diff --git a/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h b/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h
index 76d6f316b6cfe838c2a40900d24eadf43b51f333..ab9f09cba63cd4a2908f3c7ef8c5f8808703ab3a 100644
--- a/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h
+++ b/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h
@@ -34,12 +34,16 @@ namespace otb
    \f[ \sigma(x, y)=\frac{xy}{1-x-y+2xy} \f] with \f$ x, y \in [0, 1] \f$.
  *
  *
+ *
+ * \ingroup OTBEdge
  */
 
 namespace Functor
 {
 /** \class AssociativeSymmetricalSum
  * \brief Functor used with the AssociativeSymmetricalSumImageFilter.
+ *
+ * \ingroup OTBEdge
  */
 template<class TInput1, class TInput2, class TOutput>
 class ITK_EXPORT AssociativeSymmetricalSum
diff --git a/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.h b/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.h
index 20b4f53d88ef34e7a0edd94277496f896af18d68..c6c4c16265b705c63dd40aaacc3a9d0f5a1c3db4 100644
--- a/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.h
@@ -34,6 +34,8 @@ namespace otb
  * detector by croos-correlation) and a filter that produces a fusion of
  * those two line detector filters.
  *
+ *
+ * \ingroup OTBEdge
  */
 
 template <class TInputImage,
diff --git a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
index 66b4f33b94328f1369befd6c0953ab383779f1b8..7aebf96e79bc964ccf765c601a8401e470787727 100644
--- a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
+++ b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
@@ -31,6 +31,8 @@ namespace otb
  *  \brief This composite filter computes the density of the edges around a pixel.
  *
  *
+ *
+ * \ingroup OTBEdge
  */
 
 template <class TInputImage, class TOutputImage, class TEdgeDetector, class TDensityCount>
diff --git a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
index 16a4791ba70a1e2851093bb161b83b05f9b54420..2915a7249a0c7e48f3bcd21dff75bab1b7d6c63f 100644
--- a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
@@ -31,6 +31,8 @@ namespace otb
  *  The used edge detection filter is given as template of the class.
  *  The class only supports Image.
  *
+ *
+ * \ingroup OTBEdge
  */
 
 template <class TInputImage, class TOutputImage, class TEdgeDetection>
diff --git a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
index fd08f40f4a531f069e4a007377481e85a5a733d4..04d6c3d0c3b9e39f5a61150f01caf5fced574f19 100644
--- a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
+++ b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
@@ -38,6 +38,8 @@ namespace otb
  *   - otb::FillGapsFilter
  *   - otb::DrawLineSpatialObjectListFilter
  *
+ *
+ * \ingroup OTBEdge
  */
 
 template <class TInputImage,
diff --git a/Modules/Feature/Edge/include/otbGaborFilterGenerator.h b/Modules/Feature/Edge/include/otbGaborFilterGenerator.h
index 9fbf5c7f86e5f7e5f6ab04dca5a0c0449ebaa28e..40073b7b56c64416d266da617f37e5048255e3de 100644
--- a/Modules/Feature/Edge/include/otbGaborFilterGenerator.h
+++ b/Modules/Feature/Edge/include/otbGaborFilterGenerator.h
@@ -64,6 +64,8 @@ namespace otb
  * - \f$ v_0    \f$ : y spatial frenquency of the sinusoidal carrier (GetV0()/SetV0())
  * - \f$ \phi   \f$ : Phase of the sinusoidal carrier (GetPhi()/SetPhi())
  *
+ *
+ * \ingroup OTBEdge
  */
 
 template <class TPrecision>
diff --git a/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h b/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h
index 3a72dd5729db31e95db9d7a5560a00d4dad77e63..2458433b08e3014ac3de133702cce4b0e18a3019 100644
--- a/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h
@@ -27,6 +27,8 @@ namespace Functor
 {
 /** \class HorizontalSobelOperator
  * \brief Performs the calculation of horizontal Sobel derivation
+ *
+ * \ingroup OTBEdge
  */
 template < class TInput, class TOutput >
 class HorizontalSobelOperator
@@ -54,6 +56,8 @@ public:
 
 /** \class HorizontalSobelVectorImageFilter
  * \brief Implements the Horizontal Sobel Gradient to be processed on a vector image
+ *
+ * \ingroup OTBEdge
  */
 template < class TInputImage, class TOutputImage >
 class ITK_EXPORT HorizontalSobelVectorImageFilter
diff --git a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
index eabc008e0234de00ede105bc1663831145a7b4f6..74e3a2e13bbfdd30a149d49882e126880afe8733 100644
--- a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
+++ b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
@@ -54,6 +54,8 @@ namespace otb
  * \ingroup ImageFeatureExtraction
  * \sa LineSpatialObject
  *
+ *
+ * \ingroup OTBEdge
  * */
 
 template<typename TInputPixelType, typename TOutputPixelType>
diff --git a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
index 77b9659d8a7847a67f491597cee2b8147a2115de..3b4c2939831ebe9ec3dbd28a2a00f1d327c2bf87 100644
--- a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
@@ -26,6 +26,8 @@ namespace otb
  *\class LineCorrelationDetectorImageFilter
  * \brief To be documented
  *
+ *
+ * \ingroup OTBEdge
  */
 
 template <class TInputImage,
diff --git a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
index cf8cf2b43d81172db893ac41d7bef07e36cdda32..e16bccbee2194deac29fbb450e223e62f3c6ebc9 100644
--- a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
+++ b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
@@ -44,6 +44,8 @@ namespace otb
  * The output is an image of intensity of detection and an image of
  * direction of the line fo each pixel.
  *
+ *
+ * \ingroup OTBEdge
  */
 
 template <class TInputImage,
diff --git a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
index acf17df14e1c5130c17a04197fa8f99fdfe08a99..ee9553d2b0b19c312c72a01a9676f3dfc2b7ac59 100644
--- a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
@@ -56,6 +56,8 @@ namespace otb
  * the interval \f$ [0, 1] \f$.
  *
  *
+ *
+ * \ingroup OTBEdge
  */
 template <class TInputImage,
     class TOutputImage,
diff --git a/Modules/Feature/Edge/include/otbLineSegmentDetector.h b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
index 900d9ca5cb98caa234012e21a705d7779438f7a0..a6151f6785e75bc7b1dcb533228546abb35db5bd 100644
--- a/Modules/Feature/Edge/include/otbLineSegmentDetector.h
+++ b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
@@ -33,6 +33,8 @@ namespace Functor
 {
 /** \class MagnitudeFunctor
  *  \brief This functor computes the magnitude of a covariant vector.
+ *
+ * \ingroup OTBEdge
  */
 template <class TInputPixel, class TOutputPixel>
 class MagnitudeFunctor
@@ -48,6 +50,8 @@ public:
 /** \class OrientationFunctor
  *  \brief This functor computes the orientation of a covariant vector<br>
  *   Orientation values lies between -Pi and Pi.
+ *
+ * \ingroup OTBEdge
  */
 template <class TInputPixel, class TOutputPixel>
 class OrientationFunctor
@@ -79,6 +83,8 @@ public:
  *  And Website :
  *  http://www.ipol.im/pub/algo/gjmr_line_segment_detector/
  *
+ *
+ * \ingroup OTBEdge
  */
 
 template <class TInputImage, class TPrecision = double>
diff --git a/Modules/Feature/Edge/include/otbLocalHoughFilter.h b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
index 15270340c7b0730ebd361ce12c8c9e7f5bcb1119..1a1ce959abe93937da1ce40c57411da57948db0d 100644
--- a/Modules/Feature/Edge/include/otbLocalHoughFilter.h
+++ b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
@@ -38,6 +38,8 @@ namespace otb
  * looking for, the variance of the accumulator blurring (default = 5) and
  * the radius of the disc to remove from the accumulator (default = 10).
  *
+ *
+ * \ingroup OTBEdge
  */
 
 template <class TInputImage>
diff --git a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
index 9a500aea96d3ec0357dbd6321e7dc8a30783a0bb..2255ec283a346d78bf945690def3884a6d02001f 100644
--- a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
+++ b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
@@ -41,6 +41,8 @@ namespace otb
  *
  * \sa PersistentImageFilter
  *
+ *
+ * \ingroup OTBEdge
  */
 template<class TInputImage, class TOutputPath>
 class ITK_EXPORT PersistentVectorizationImageFilter :
diff --git a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
index 337da8384142a503ac34ec5de99f31310e529a88..90130a6818f1b1bd49d4187f47726891edb997e2 100644
--- a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
+++ b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
@@ -40,6 +40,8 @@ namespace otb
  * image filters which are the image of intensity of detection and
  * the image of direction.
  *
+ *
+ * \ingroup OTBEdge
  */
 
 template <class TInputImage, class TOutputImage>
diff --git a/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h b/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h
index 944b85ef4e9426a10c02b72e4722661664628874..b1e985b97f7382c01200afb9def53269e0022844 100644
--- a/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h
@@ -29,6 +29,8 @@ namespace Functor
 {
 /** \class SobelOperator
  * \brief Performs the calculation of Sobel derivation
+ *
+ * \ingroup OTBEdge
  */
 template < class TInput, class TOutput >
 class SobelOperator
@@ -63,6 +65,8 @@ public:
 
 /** \class SobelVectorImageFilter
  * \brief Implements the  Sobel Gradient to be processed on a vector image
+ *
+ * \ingroup OTBEdge
  */
 template < class TInputImage, class TOutputImage >
 class ITK_EXPORT SobelVectorImageFilter
diff --git a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
index 15ac07bcdd9990721eb96b31aad7604594141f7a..9ac7b3afd15a8ac48c93b95db713beeed6013218 100644
--- a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
+++ b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
@@ -44,6 +44,8 @@ namespace otb
  *
  * \sa PersistentImageToVectorDataFilter
  *
+ *
+ * \ingroup OTBEdge
  */
 template <class TImageType>
 class PersistentStreamingLineSegmentDetector
diff --git a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
index 8559ad2b5eed62b8f92cfce15e793015de0ea8e2..a4f06b19e9c6f4f9b2dec1313df7501ef8f280dd 100644
--- a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
@@ -50,6 +50,8 @@ namespace otb
  * where if  \f[ \mu_{1}>\mu_{2} s_{i}=+1 \f]
  * else if \f[ \mu_{1}<\mu_{2} s_{i}=-1 \f]
  *
+ *
+ * \ingroup OTBEdge
  */
 
 template <class TInputImage, class TOutputImage, class TOutputImageDirection = TOutputImage>
diff --git a/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h b/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h
index 46231ac9511889fe14b93abce4d006a6d21e8eea..2983377272b7796be25ce0bd369b5c9f3553e93c 100644
--- a/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h
@@ -27,6 +27,8 @@ namespace Functor
 {
 /** \class VerticalSobelOperator
  * \brief Performs the calculation of vertical Sobel derivation
+ *
+ * \ingroup OTBEdge
  */
 template < class TInput, class TOutput >
 class VerticalSobelOperator
@@ -54,6 +56,8 @@ public:
 
 /** \class VerticalSobelVectorImageFilter
  * \brief Implements the Vertical Sobel Gradient to be processed on a vector image
+ *
+ * \ingroup OTBEdge
  */
 template < class TInputImage, class TOutputImage >
 class ITK_EXPORT VerticalSobelVectorImageFilter
diff --git a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
index 0862b672865268480c3c377128d406328bc5e8d8..18ad7e351a85d42cdfd69f0ba98c5f21c6e57094 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
+++ b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
@@ -44,6 +44,8 @@ namespace otb
  *   - and the coordinate representation type (e.g. float or double).
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBMoments
  */
 template <class TInputPath,
     class TOutput = std::complex<double>,
diff --git a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
index 86a930dbd1dab6fec5115b832c0e4f291533ac63..46b36263650bc19663976e3a4244b88b6141e57d 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
@@ -45,6 +45,8 @@ namespace otb
  * coordinate representation type (e.g. float or double).
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBMoments
  */
 
 template <class TInputImage, class TCoordRep = double>
diff --git a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
index ea5ef83be48b2d46d430b45f2a1b6746a4e91d6c..1ed4926e351915a9cfb5bada1b2df90836ea862b 100644
--- a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
@@ -59,6 +59,8 @@ namespace otb
  * coordinate representation type (e.g. float or double).
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBMoments
  */
 
 template <class TInputImage, class TCoordRep = double >
diff --git a/Modules/Feature/Moments/include/otbFlusserPathFunction.h b/Modules/Feature/Moments/include/otbFlusserPathFunction.h
index 60fc6f2b62e945c86ef7dab6b3cfaba76d011f82..0d63785e6a7b602aa04cb5a21739b6251e0b4b08 100644
--- a/Modules/Feature/Moments/include/otbFlusserPathFunction.h
+++ b/Modules/Feature/Moments/include/otbFlusserPathFunction.h
@@ -54,6 +54,8 @@ namespace otb
  * coordinate representation type (e.g. float or double).
  *
  * \ingroup PathFunctions
+ *
+ * \ingroup OTBMoments
  */
 
 template <class TInputPath,
diff --git a/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h b/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h
index a5900915fa6b7abb02e3a961c3ad782a51a2ab4c..504b28c77a7f88d186457b639e3269f5c24703a4 100644
--- a/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h
+++ b/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h
@@ -28,6 +28,8 @@ namespace otb
  * \brief Virtual class for the Geometric moments for an path function
  *
  * \ingroup PathFunctions
+ *
+ * \ingroup OTBMoments
  */
 
 template <class TInputPath,
diff --git a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
index f7aeea99654e136426ab1b9ebd0b6e6fe6ebc098..3583aaf8f063fe9a811b996e5b5c670509590d89 100644
--- a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
@@ -55,6 +55,8 @@ namespace otb
  * coordinate representation type (e.g. float or double).
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBMoments
  */
 
 template <class TInputImage, class TCoordRep = double>
diff --git a/Modules/Feature/Moments/include/otbHuPathFunction.h b/Modules/Feature/Moments/include/otbHuPathFunction.h
index 96168a3b1c9f1796dd312015c80c182a6aa7732c..d855bd526145ec6297becdd49a7813e05f07ba49 100644
--- a/Modules/Feature/Moments/include/otbHuPathFunction.h
+++ b/Modules/Feature/Moments/include/otbHuPathFunction.h
@@ -50,6 +50,8 @@ namespace otb
  * path type (e.g. PolyLineParametricPath<2> ).
  *
  * \ingroup FunctionFunctions
+ *
+ * \ingroup OTBMoments
  */
 
 template <class TInputPath,
diff --git a/Modules/Feature/Moments/include/otbImageToLabelMapWithAttributesFilter.h b/Modules/Feature/Moments/include/otbImageToLabelMapWithAttributesFilter.h
index 0c6c80d5115374835aaee710a9dfa93921bbad48..79f02b79aab7b7042eeab125739793de7572f965 100644
--- a/Modules/Feature/Moments/include/otbImageToLabelMapWithAttributesFilter.h
+++ b/Modules/Feature/Moments/include/otbImageToLabelMapWithAttributesFilter.h
@@ -38,6 +38,8 @@ namespace otb
  * radiometric attributes for each LabelObject.
  *
  * It is suitable to be used with otb::LabelMapWithAdjacency<otb::AttributesMapLabelObject>
+ *
+ * \ingroup OTBMoments
  */
 template <class TInputImage, class TLabeledImage, class TLabel, class TLabelObject >
 class ITK_EXPORT ImageToLabelMapWithAttributesFilter
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsFunctor.h b/Modules/Feature/Moments/include/otbRadiometricMomentsFunctor.h
index 03e79412acbc2e16a0bb6f5d78ee07136feb4d6c..3f29154a7da6ad0745042ded13382adf6821e474 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsFunctor.h
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsFunctor.h
@@ -29,6 +29,8 @@ namespace Functor
  *  \brief
  *
  *  \ingroup Functor
+ *
+ * \ingroup OTBMoments
  */
 template <class TNeighIter, class TPrecision = float>
 class RadiometricMomentsFunctor
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
index 33a6458229cca005bb16ba44331f79bbd2aa8387..cf9702b0366f248e2c8576947ab2ff1b061dc9b4 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
@@ -34,6 +34,8 @@ namespace otb
  * This class is templated over the input image and the output image.
  *
  * \ingroup ImageFilters
+ *
+ * \ingroup OTBMoments
  */
 
 
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
index 29416d75f520f2ba12398ffc328977df892605b7..97d8ef27637889fdce75c2da2d724acfc80efee2 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
@@ -36,6 +36,8 @@ namespace otb
  * coordinate representation type (e.g. float or double).
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBMoments
  */
 
 
diff --git a/Modules/Feature/Moments/include/otbRealMomentPathFunction.h b/Modules/Feature/Moments/include/otbRealMomentPathFunction.h
index ec8b76ad48192484098e54d38866e50e00bf8c97..59429902f8ac208b5c37e781cb34636a6ec5bd75 100644
--- a/Modules/Feature/Moments/include/otbRealMomentPathFunction.h
+++ b/Modules/Feature/Moments/include/otbRealMomentPathFunction.h
@@ -29,6 +29,8 @@ namespace otb
  * \brief Virtual class for the Real moments for a path
  *
  * \ingroup PathFunctions
+ *
+ * \ingroup OTBMoments
  */
 
 template <class TInputPath,
diff --git a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
index 0ee1d13a3d483dd404056073b0e7991500b618b8..2451b080ad4ac187eded30a7fb5a0499363b58c4 100644
--- a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
@@ -31,6 +31,8 @@ namespace otb
  * Calculate the real moment values over a specified neighborhood.
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBMoments
  */
 
 template <class TInputImage, class TCoordRep = double>
diff --git a/Modules/Feature/Moments/include/otbShapeAttributesLabelMapFilter.h b/Modules/Feature/Moments/include/otbShapeAttributesLabelMapFilter.h
index dbaba7eba4896a0d6a2cb0c5bc49c17856e10791..6583fbfaa3f5d3479da577a2b651f5a5340570a5 100644
--- a/Modules/Feature/Moments/include/otbShapeAttributesLabelMapFilter.h
+++ b/Modules/Feature/Moments/include/otbShapeAttributesLabelMapFilter.h
@@ -38,6 +38,8 @@ namespace Functor
 *   \brief Functor to compute shape attributes of one LabelObject.
 *
 *   \sa ShapeAttributesLabelMapFilter
+ *
+ * \ingroup OTBMoments
 */
 template <class TLabelObject, class TLabelImage>
 class ShapeAttributesLabelObjectFunctor
@@ -196,6 +198,8 @@ private:
  * \sa itk::ShapeLabelMapFilter
  *
  * \ingroup ImageEnhancement  MathematicalMorphologyImageFilters
+ *
+ * \ingroup OTBMoments
  */
 template<class TImage,
     class TLabelImage = Image<typename TImage::PixelType,
diff --git a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
index 0c20cc5bedc10c089e0f732264bb0580fa9b6e11..988a3e5b11943afd5ca831eedf5cb5fd788d9755 100644
--- a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
@@ -49,6 +49,8 @@ namespace otb
  *
  * \ingroup PathFilters
  * \ingroup ImageFilters
+ *
+ * \ingroup OTBSeamCarving
  */
 
 template <class TInputImage, class TOutputPath>
diff --git a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
index 38f2115c22a6056c7c7a93e4eee004e29a4c6add..c0068f0e328eef859bd4f3186658e308de50f76a 100644
--- a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
@@ -53,6 +53,8 @@ namespace otb
   *
   * \ingroup PathFilters
   * \ingroup ImageFilters
+ *
+ * \ingroup OTBSeamCarving
   */
 
 template <class TInputImage, class TInputPath, class TOutputImage>
diff --git a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
index 0552303df301060e2881c5bf3b9ffe1e2ade7c10..aee9615e959893f9c8722de36d9078e8b06fc48b 100644
--- a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
+++ b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
@@ -55,6 +55,8 @@ namespace otb
 * features. Systems, Signals and Image Processing, 2008. IWSSIP 2008. 15th
 * International Conference on , vol., no., pp.141,144, 25-28 June 2008
 * doi: 10.1109/IWSSIP.2008.4604387
+ *
+ * \ingroup OTBTextures
 */
 
 template <class TPixel>
diff --git a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h
index d2c791d6daa9bf62cbd29ceb5b4f9fd97a14feeb..aeafe075f4f6b873b9bcfde999ad215fc871d059 100644
--- a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h
+++ b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h
@@ -90,6 +90,8 @@ namespace otb {
  * \sa GreyLevelCooccurrenceMatrixTextureCoefficientsCalculator
  * \sa ScalarImageTextureCalculator
  *
+ *
+ * \ingroup OTBTextures
  */
 
 template <typename THistogram>
diff --git a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
index 075dda7bce27480efdb74cc35f04931936b163a0..e02961472390f03563e8d928bfff241994ef513c 100644
--- a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
+++ b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
@@ -82,6 +82,8 @@ namespace otb
  * \sa otb::GreyLevelCo-occurrenceIndexedList
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBTextures
  */
 
 
diff --git a/Modules/Feature/Textures/include/otbSFSTexturesFunctor.h b/Modules/Feature/Textures/include/otbSFSTexturesFunctor.h
index f12153350f10963ff85de29fe32abc3c69552363..8ab7ab1b437e6368936b3eb041c724ba0335f0ac 100644
--- a/Modules/Feature/Textures/include/otbSFSTexturesFunctor.h
+++ b/Modules/Feature/Textures/include/otbSFSTexturesFunctor.h
@@ -47,6 +47,8 @@ namespace otb
  *  vol. 4, n. 2, 2007, pp 260-264
  *
  * \ingroup Textures
+ *
+ * \ingroup OTBTextures
  */
 
 namespace Functor
diff --git a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
index ddf98a9e02c65532e0c45e5d62be07eb13218774..19a6a5debd510242e3b8039c772ed389d26f908b 100644
--- a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
+++ b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
@@ -47,6 +47,8 @@ namespace otb
  *
  * \sa SFSTexturesFunctor
  * \ingroup Textures
+ *
+ * \ingroup OTBTextures
 */
 
 template <class TInputImage, class TOutputImage>
diff --git a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
index 811d14e8fa6e9a6b4345a06f8e644a6a33dc66da..fa8910fdccdf21f7635b7f58efea838854726c50 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
@@ -93,6 +93,8 @@ namespace otb
  * \ingroup Streamed
  * \ingroup Threaded
  *
+ *
+ * \ingroup OTBTextures
  */
 template<class TInpuImage, class TOutputImage>
 class ScalarImageToAdvancedTexturesFilter : public itk::ImageToImageFilter
diff --git a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
index 2af02ba4b7b0f72bba9b675bce61d4dc5dacf43d..4e343fc963a37070e7569f79968aa8d14a4ed7fe 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
@@ -63,6 +63,8 @@ namespace otb
  * \ingroup Streamed
  * \ingroup Threaded
  *
+ *
+ * \ingroup OTBTextures
  */
 template<class TInpuImage, class TOutputImage>
 class ScalarImageToHigherOrderTexturesFilter : public itk::ImageToImageFilter
diff --git a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
index b179674cf37f825e5eb0d6681a6f6bfe76f8b6fa..028c46ab8eab1c01e56551573d8d0e350139744c 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
@@ -39,6 +39,8 @@ namespace otb
  *
  * \sa otb::GreyLevelCooccurrenceIndexedList
  *
+ *
+ * \ingroup OTBTextures
  */
 
 template<class TInpuImage, class TOutputImage>
diff --git a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
index cf543eafc6e4519dda1110d180e68cb2401ebd0a..02f8a230056e2317719760e16d545fe661e6f3bd 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
@@ -94,6 +94,8 @@ namespace otb
  * \ingroup Streamed
  * \ingroup Threaded
  *
+ *
+ * \ingroup OTBTextures
  */
 template<class TInpuImage, class TOutputImage>
 class ScalarImageToTexturesFilter : public itk::ImageToImageFilter
diff --git a/Modules/Feature/Textures/include/otbTextureImageFunction.h b/Modules/Feature/Textures/include/otbTextureImageFunction.h
index 2009dbc8fa5f1fd6f01693fc27b32ae12ba2b7bb..31517f4bbed41001682ea098e1113719b7f02001 100644
--- a/Modules/Feature/Textures/include/otbTextureImageFunction.h
+++ b/Modules/Feature/Textures/include/otbTextureImageFunction.h
@@ -34,6 +34,8 @@ namespace otb
  *
  * \ingroup ImageFunctions
    * \ingroup Textures
+ *
+ * \ingroup OTBTextures
  */
 template <class TInputImage, class TFunctor, class TCoordRep = float>
 class ITK_EXPORT TextureImageFunction :
diff --git a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
index 64ee4ff48f9611919a92c813b10fda9781583afc..df99c4979f2fdcd216f45b0ada68dbb74c5d2ddc 100644
--- a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
@@ -34,6 +34,8 @@ namespace otb
  * operation to be applied.  A Functor style is used.
  *
  * \ingroup IntensityImageFilters   Multithreaded
+ *
+ * \ingroup OTBChangeDetection
  */
 template <class TInputImage1, class TInputImage2,
     class TOutputImage, class TFunction>
diff --git a/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h b/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
index 09e4fa796732fc68a9cfd9a76b390373632f148c..0af665394b87f7b7d69f8ce5caf414792585ee84 100644
--- a/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
+++ b/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
@@ -47,6 +47,8 @@ namespace otb
  * (e.g. all 2D, or all 3D, or all ND)
  *
  * \ingroup IntensityImageFilters Multithreaded
+ *
+ * \ingroup OTBChangeDetection
  */
 
 template <class TInputImage1, class TInputImage2, class TOutputImage>
diff --git a/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h b/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
index 8cc1c20db40e686c078e9c740662693861d8bf52..c9a896537e104295e179f14a654d6b2c0dd18b13 100644
--- a/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
+++ b/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
@@ -46,6 +46,8 @@ namespace otb
  * (e.g. all 2D, or all 3D, or all ND)
  *
  * \ingroup IntensityImageFilters Multithreaded
+ *
+ * \ingroup OTBChangeDetection
  */
 
 template <class TInputImage1, class TInputImage2, class TOutputImage>
diff --git a/Modules/Filtering/ChangeDetection/include/otbCrossCorrelation.h b/Modules/Filtering/ChangeDetection/include/otbCrossCorrelation.h
index 08653634647a5603193dc189c6c6eec505548f88..63112445a7a947f1b6a0eae31df414b7c68e66c4 100644
--- a/Modules/Filtering/ChangeDetection/include/otbCrossCorrelation.h
+++ b/Modules/Filtering/ChangeDetection/include/otbCrossCorrelation.h
@@ -36,6 +36,8 @@ namespace Functor
  * - cast the \c double value resulting to the pixel type of the output image
  * - store the casted value into the output image.
  *
+ *
+ * \ingroup OTBChangeDetection
  */
 
 template<class TInput1, class TInput2, class TOutput>
diff --git a/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
index 6aaa4d5e0ddbb980005566cfc43d725bb03e9810..d6d08dddb32b3395867e90ec2149b8d2fe0a9dc6 100644
--- a/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
@@ -47,6 +47,8 @@ namespace otb
  * (e.g. all 2D, or all 3D, or all ND)
  *
  * \ingroup IntensityImageFilters Multithreaded
+ *
+ * \ingroup OTBChangeDetection
  */
 
 template <class TInputImage1, class TInputImage2, class TOutputImage>
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
index 5f869fa795ebbbaee244dcdf4207c4f6cd46bfd0..84ea1ceee6564a4e24529b3d7fc922e9693d6915 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
@@ -29,6 +29,8 @@ namespace otb
 /** \class CumulantsForEdgeworth
  * \brief Helper class for KullbackLeiblerDistanceImageFilter. Please refer to KullbackLeiblerDistanceImageFilter.
  *
+ *
+ * \ingroup OTBChangeDetection
  */
 template <class TInput>
 class CumulantsForEdgeworth
@@ -84,6 +86,8 @@ namespace Functor
 /** \class KullbackLeiblerDistance
  * \brief Functor for KullbackLeiblerDistanceImageFilter. Please refer to KullbackLeiblerDistanceImageFilter.
  *
+ *
+ * \ingroup OTBChangeDetection
  */
 template <class TInput1, class TInput2, class TOutput>
 class KullbackLeiblerDistance
@@ -134,6 +138,8 @@ public:
  * http://www.math.ucdavis.edu/~saito/publications
  *
  * \ingroup IntensityImageFilters Multithreaded
+ *
+ * \ingroup OTBChangeDetection
  */
 template <class TInputImage1, class TInputImage2, class TOutputImage>
 class ITK_EXPORT KullbackLeiblerDistanceImageFilter :
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
index 416c00559661cc845384fc499a74aeb40d1307bd..370a0384a24c9032b34934963fa3d2613ddc8087 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
@@ -35,6 +35,8 @@ namespace otb
 /** \class CumulantsForEdgeworthProfile
   * \brief Helper class for KullbackLeiblerProfileImageFilter. Please refer to KullbackLeibleProfileImageFilter.
   *
+ *
+ * \ingroup OTBChangeDetection
   */
 template <class TInput>
 class CumulantsForEdgeworthProfile
@@ -95,6 +97,8 @@ namespace Functor
 /** \class KullbackLeiblerProfile
  * \brief Functor for KullbackLeiblerProfileImageFilter. Please refer to KullbackLeiblerProfileImageFilter.
  *
+ *
+ * \ingroup OTBChangeDetection
  */
 template<class TInput1, class TInput2, class TOutput>
 class KullbackLeiblerProfile
@@ -152,6 +156,8 @@ protected:
  *  TOutput is expected to be a itk::VariableLengthVector< TPixel > and comes from an otbVectorImage< TPixel, 2 >
  *
  * \ingroup IntensityImageFilters Multithreaded
+ *
+ * \ingroup OTBChangeDetection
  */
 template <class TInputImage1, class TInputImage2, class TOutputImage>
 class ITK_EXPORT KullbackLeiblerProfileImageFilter :
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
index 561d01d6f54be755b21ba243d689661c483475d3..511f219c2b421bf6772c7d10a885c4d8d52d1ac8 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
@@ -58,12 +58,16 @@ namespace otb
  * http://www.math.ucdavis.edu/~saito/publications
  *
  * \sa CumulantsForEdgeworth
+ *
+ * \ingroup OTBChangeDetection
  */
 namespace Functor
 {
 /** \class KullbackLeiblerSupervizedDistance
  * \brief Functor for KullbackLeiblerSupervizedDistanceImageFilter. Please refer to KullbackLeiblerSupervizedDistanceImageFilter.
  *
+ *
+ * \ingroup OTBChangeDetection
  */
 template <class TInput1, class TInput2, class TInputROIImage, class TOutput>
 class KullbackLeiblerSupervizedDistance
diff --git a/Modules/Filtering/ChangeDetection/include/otbLHMI.h b/Modules/Filtering/ChangeDetection/include/otbLHMI.h
index 83589769d659eee760952dbd11dd70a7a4db85d4..e61ae24116d25d6ae4096e9b40e6aceea02224ce 100644
--- a/Modules/Filtering/ChangeDetection/include/otbLHMI.h
+++ b/Modules/Filtering/ChangeDetection/include/otbLHMI.h
@@ -37,6 +37,8 @@ namespace Functor
  * - compute the value of the LHMI
  * - cast the \c double value resulting to the pixel type of the output image
  *
+ *
+ * \ingroup OTBChangeDetection
  */
 
 template<class TInput1, class TInput2, class TOutput>
diff --git a/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h b/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h
index 02491ccdb2537b46f69ce3257671ed6c06247bf4..c397eba14e309d3291cc0308d4af9b866f2cf8bf 100644
--- a/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h
+++ b/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h
@@ -47,6 +47,8 @@ namespace otb
  * (e.g. all 2D, or all 3D, or all ND)
  *
  * \ingroup IntensityImageFilters Multithreaded
+ *
+ * \ingroup OTBChangeDetection
  */
 
 template <class TInputImage1, class TInputImage2, class TOutputImage>
diff --git a/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
index cc23d0d43f42c2b998233711336925a28c992c18..02448bc2aa8126db1cbdc8d175f8a6f906c9be60 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
@@ -45,6 +45,8 @@ namespace otb
  * (e.g. all 2D, or all 3D, or all ND)
  *
  * \ingroup IntensityImageFilters Multithreaded
+ *
+ * \ingroup OTBChangeDetection
  */
 
 template <class TInputImage1, class TInputImage2, class TOutputImage>
diff --git a/Modules/Filtering/ChangeDetection/include/otbMeanRatio.h b/Modules/Filtering/ChangeDetection/include/otbMeanRatio.h
index d62cf7f68206a62e5303007bedee706472ba9ec9..431c9b7cf4ada51954b6760667bc36ed269b9332 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMeanRatio.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMeanRatio.h
@@ -32,6 +32,8 @@ namespace otb
  *
 
  * \ingroup Functor
+ *
+ * \ingroup OTBChangeDetection
  */
 namespace Functor
 {
diff --git a/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h
index cbc08d43d386d740328cec95a466f012907e534c..9010d7db27008b1a7a65bf4e250f995e763bd9b9 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h
@@ -43,6 +43,8 @@ namespace otb
  * (e.g. all 2D, or all 3D, or all ND)
  *
  * \ingroup IntensityImageFilters Multithreaded
+ *
+ * \ingroup OTBChangeDetection
  */
 
 template <class TInputImage1, class TInputImage2, class TOutputImage>
diff --git a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
index c8579c8c8d98fb395e9ab447515f3d07054ea360..134cbe974b4c0fe66f97032477915f28dc34db12 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
@@ -71,6 +71,8 @@ namespace otb
  * the Matlab code using Octave.
  *
  * \ingroup Streamed, Multithreaded
+ *
+ * \ingroup OTBChangeDetection
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT MultivariateAlterationDetectorImageFilter
diff --git a/Modules/Filtering/ColorMap/include/otbAmplitudePhaseToRGBFunctor.h b/Modules/Filtering/ColorMap/include/otbAmplitudePhaseToRGBFunctor.h
index ddf4fd3ba83e3925a1a928e80f3ea005b9021def..f49c4ef8a0b92254c738111b6b0a7ef49945685d 100644
--- a/Modules/Filtering/ColorMap/include/otbAmplitudePhaseToRGBFunctor.h
+++ b/Modules/Filtering/ColorMap/include/otbAmplitudePhaseToRGBFunctor.h
@@ -40,6 +40,8 @@ namespace Functor
  * Amplitude and phase can be obtained using the itk::ComplexToModulusImageFilter
  * and itk::ComplexToPhaseImageFilter for example.
  *
+ *
+ * \ingroup OTBColorMap
  */
 template<class TInput1, class TInput2 = TInput1, class TInput3 = TInput1, class TOutput = TInput1>
 class ITK_EXPORT AmplitudePhaseToRGBFunctor
diff --git a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
index 1ea9bd5f50cba0db33561b9d4563ebe8c0a055d9..f4842f0d0f3404f9ca19108ab518ed75278d6c5f 100644
--- a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
+++ b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
@@ -34,6 +34,8 @@ namespace Functor {
  * http://www.insight-journal.org/browse/publication/285
  * http://hdl.handle.net/1926/1452
  *
+ *
+ * \ingroup OTBColorMap
  */
 template<class TScalar, class TRGBPixel>
 class ITK_EXPORT ReliefColormapFunctor
diff --git a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
index ec17b60ad19c5e8d4068bfa61064f05c0165e493..901e41a56868b833ec6d683d462d4b421483c474 100644
--- a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
+++ b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
@@ -34,6 +34,8 @@ namespace Functor
  *
  * \sa ScalarToRainbowRGBPixelFunctor
  *
+ *
+ * \ingroup OTBColorMap
  */
 template<class TRGBPixel>
 class ITK_EXPORT HSVToRGBFunctor
@@ -124,6 +126,8 @@ namespace Functor
  *
  * \example BasicFilters/DEMToRainbowExample.cxx
  *
+ *
+ * \ingroup OTBColorMap
  */
 template<class TScalar, class TRGBPixel = itk::RGBPixel<unsigned char> >
 class ITK_EXPORT ScalarToRainbowRGBPixelFunctor
diff --git a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
index d51541727827b75e51045ba383b1c77b953a2736..579c16d999eb354947e415f4ef2b925130c70f4c 100644
--- a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
+++ b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
@@ -57,6 +57,8 @@ namespace otb
  * \ingroup IntensityImageFilters
  * \ingroup Streamed
  * \ingroup MultiThreaded
+ *
+ * \ingroup OTBConvolution
  */
 template <class TInputImage, class TOutputImage, class TBoundaryCondition =
       itk::ZeroFluxNeumannBoundaryCondition<TInputImage>,
diff --git a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
index 42295a0b969c9712b82824ad9d7d68f7229c6383..0bf29163ce457527d12ce7c02fe29337fa428f8e 100644
--- a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
+++ b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
@@ -53,6 +53,8 @@ namespace otb
  * \ingroup ShouldBeThreaded
  * \ingroup Streamed
  * \ingroup IntensityImageFilters
+ *
+ * \ingroup OTBConvolution
  */
 template <class TInputImage, class TOutputImage,
     class TBoundaryCondition = itk::ZeroFluxNeumannBoundaryCondition<TInputImage> >
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
index 838c11321ddd35fd167dee49ef3b185fa711b2fd..6a9aa40b56a27a9cf9b5b5ee45111d586628d6cd 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
@@ -30,6 +30,8 @@ namespace otb {
  * This class performs the projections of the 2 input images to a set of N
  * output images according to N angular values
  *
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template < class TInputImage, class TOutputImage, class TPrecision >
 class ITK_EXPORT AngularProjectionBinaryImageFilter
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
index a21cc3e976aeb4471614594dee36fe53507e0409..0026f829f32edb2a516f431eca067800e3c1d52d 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
@@ -32,6 +32,8 @@ namespace otb {
  * The angle value are considered to come from a itk::FixedArray...
  *
  * \ingroup Threaded
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template < class TInputImage, class TOutputImage, class TAngleArray, class TPrecision >
 class ITK_EXPORT AngularProjectionImageFilter
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
index b40d17ac29bea1908434e8c05cde83817c040f81..6e40202da9a3880878c97cfa468f67f3687f87cf 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
@@ -38,6 +38,8 @@ namespace otb {
  *
  * \sa AngularProjectionImageListFilter
  *
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template < class TInputImage, class TOutputImage, class TAngleList, class TPrecision >
 class ITK_EXPORT AngularProjectionSetImageFilter
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
index cdfdb09cee6db6806b5e82cab32fe23c2452bc8e..06a40b25f3ab7038b044ea5fbb14356e3d12b38c 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
@@ -27,6 +27,8 @@ namespace otb
  * \brief Applies the Inner product to an vector image.
  * Implement the itk::ImagePCAShapeModelEstimator algorithms in streaming capabilities
  * Use by the  InnerProductPCAImageFilter composite filter
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT EstimateInnerProductPCAImageFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
index 284be55bb19773b1d27021741869506ef0388aff..65b44b163a39cc6514c4bd61b3221f84d2a337ec 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
@@ -31,6 +31,8 @@ namespace otb
  * The estimation of the covariance matrix has persistent capabilities...
  *
  * \sa PCAImageFilter
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template <class TInputImage, class TOutputImage, Transform::TransformDirection TDirectionOfTransformation >
 class ITK_EXPORT FastICAImageFilter
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
index b1502acada8e8e288e0e8c446cf50e7ed7a5e02c..3866a549b46c3cad9b355667ba0baf549edc7a46 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
@@ -34,6 +34,8 @@ namespace otb
  *
  * \ingroup Multithreaded
  * \sa FastICAImageFilter
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT FastICAInternalOptimizerVectorImageFilter
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
index f193445db1017ebf9c3a86a433d75bc50d066c80..fe918f5865befa97c9098752c585a116166e5396 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
@@ -56,6 +56,8 @@ namespace otb
  * the membership function objects and populates them.
  *
  * \sa itk::ImagePCAShapeModelEstimator
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT InnerProductPCAImageFilter
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
index 37cce74d8c3e9a129700788c49272d5d9afac399..9ae62f88e1e186bebba8ad86399886961404c44e 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
@@ -36,6 +36,8 @@ namespace otb {
  *
  * \sa otbStreamingStatisticsVectorImageFilter
  * \sa PCAImageFiler
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template <class TInputImage, class TOutputImage,
             class TNoiseImageFilter,
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
index f0316148052f988c8872a6cbf06b39caf7089202..72d3caf02dcfc8d33e480fcf7fcf2f7d936cbe15 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
@@ -59,6 +59,8 @@ namespace otb
 
  * \ingroup Multithreaded, Streamed
  * \sa otbPCAImageFilter
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT MaximumAutocorrelationFactorImageFilter
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
index 64537ef9491850e760276cafbb11d3f32a43a083..54faab6f56a43ae26066d91259a304290c4c4017 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
@@ -39,6 +39,8 @@ namespace otb {
  *
  * \sa otbStreamingStatisticsVectorImageFilter
  * \sa MNFImageFilter
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template <class TInputImage, class TOutputImage,
             class TNoiseImageFilter,
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
index 36018f54cac349191a0d62162b8f51f7e713db51..becc1d390e33cf237a0439e24ba320179fb519cc 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
@@ -30,6 +30,8 @@ namespace otb
  *  \brief  The aim of the class is to normalise vector images using a vector coefficient values.
  *
  * \ingroup VectorImage
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT NormalizeInnerProductPCAImageFilter : public itk::InPlaceImageFilter<TInputImage, TOutputImage>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
index 0577ef7c532b457dc3b6dbcaf667ba624b41ddb1..859c1243712540bec19cd7e91bba372d6e820710 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
@@ -39,6 +39,8 @@ namespace otb
  *
  * \sa otbStreamingStatisticsVectorImageFilter
  * \sa MatrixMultiplyImageFilter
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template <class TInputImage, class TOutputImage, Transform::TransformDirection TDirectionOfTransformation >
 class ITK_EXPORT PCAImageFilter
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
index 13c237888ae3d0e013d7cd5c13e36e636a14f869..b399c92b77bf6a274bf7afcbea64fc3078bed7fb 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
@@ -36,6 +36,8 @@ namespace otb {
  * the most significant coeff (up to a threashold).
  *
  * \ingroup Threaded
+ *
+ * \ingroup OTBDimensionalityReduction
  */
 template < class TInputImageList, class TOutputSampleList, unsigned int VNbInputImages >
 class SparseWvltToAngleMapperListFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbAlphaBlendingFunctor.h b/Modules/Filtering/ImageManipulation/include/otbAlphaBlendingFunctor.h
index c1469c2d2261a9b7303b80693ec184b721ea1476..5201c34ccaef6096e382ab014c13c7d1a71d01fb 100644
--- a/Modules/Filtering/ImageManipulation/include/otbAlphaBlendingFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbAlphaBlendingFunctor.h
@@ -34,6 +34,8 @@ namespace Functor
  * \f$ \alpha_{pix} \f$ is retrieved from the second pixel RGBA
  * \f$ \alpha_{glo} \f$ is provided by the SetAlpha() method (1.0 by default)
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 
 template<class TInputPixel1, class TInputPixel2, class TOutputPixel>
diff --git a/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h b/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h
index 053797318073d84397756adb0bf9ade2d6ee9b05..b6706bbe4ef9321d84fa17ef3422d28f955035c2 100644
--- a/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h
@@ -30,6 +30,8 @@ namespace Function
 *  \ingroup Visualization
 *
 * \sa PhaseFunctor ChannelSelectorFunctor
+ *
+ * \ingroup OTBImageManipulation
 */
 template <class TInputPixel>
 class AmplitudeFunctor : public ChannelSelectorFunctor<TInputPixel>
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
index a840c5d534cb11738f06e9f1edc7b36581d3fde9..c2eb3ffbb2c61348f43e1c82e0e8713c8bd06f15 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
@@ -37,6 +37,8 @@ namespace otb
  *
  * \example ChangeDetection/ChangeDetectionFrameworkExample.cxx
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage1, class TInputImage2,
     class TOutputImage, class TFunction>
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
index 8c30f2536b95cbb9875858784c1781a0b813f592..c52e658d07e8960ec9c82436787c68ea2d73ca55 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * operation to be applied.  A Functor style is used.
  *
  * \ingroup IntensityImageFilters   Multithreaded
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage1, class TInputImage2,
     class TOutputImage, class TFunction>
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
index 1c92c19bfcb5e01e4c27c3e460c3a6b5ac667774..a327a6bcaa8154be56ef3f328e6e836b60d3cbf8 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
@@ -40,6 +40,8 @@ namespace otb
  * coordinate representation type (e.g. float or double ).
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TCoordRep = float>
 class ITK_EXPORT BinaryImageDensityFunction :
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
index 4b216c62acf02da9b8f85033839d18cb6d86b664..0f4862f8a315ea5cd918b2460da94d8aa2950c43 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
@@ -34,6 +34,8 @@ namespace otb
  * at each bound in case a security margin has to be kept.
  *
  * \sa ImageToImageRCC8Calculator
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage>
 class ITK_EXPORT BinaryImageMinimalBoundingRegionCalculator
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
index 070962b3776d734c56fb368453f605353ecbbbaa..79bfe9c030eefec689e15fcf7b053865439dd894 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
@@ -27,6 +27,8 @@ namespace otb
 /** \class BinaryImageToDensityImageFilter
  *  \brief This class performs a streaming isotropic shrinking operation without smoothing.
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputImage, class TCountFunction>
 class ITK_EXPORT BinaryImageToDensityImageFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinarySpectralAngleFunctor.h b/Modules/Filtering/ImageManipulation/include/otbBinarySpectralAngleFunctor.h
index 7233d261a4fd626bed2f122a1e817c8df1721ad8..b56db8e7c9530c240b59093499f78d68cdf94c3b 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinarySpectralAngleFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinarySpectralAngleFunctor.h
@@ -28,6 +28,8 @@ namespace otb
  *
  *  It can be used as a functor in a BinaryFunctorImageFilter to
  *  compute the pixel-by-pixel spectral angles.
+ *
+ * \ingroup OTBImageManipulation
  */
 namespace Functor
 {
diff --git a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
index c3650ab232ca49062d405db896ffac9fcf78f19c..8197ec2e66992e6b22caf9c1df006398735b0dd0 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
@@ -41,6 +41,8 @@ namespace otb {
  *
  * \ingroup Streamed
  * \sa EuclideanDistanceMetricWithMissingValue
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage>
 class ITK_EXPORT BoxAndWhiskerImageFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
index d9ff8a99781ad184f701180fe5bf45064325a4ae..d0c779983caa77795bdd6153f754f9c0dd8b9c32 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
@@ -33,6 +33,8 @@ namespace otb
  *
  * Adapt the itkChangeLabelImageFilter for multichannel images.
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 
 namespace Functor {
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
index e8225ed4a73e89237c2419434a7a4f0e4f3fb062..3679dd4446684962cc9d905595711c19638f8ac9 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
@@ -37,6 +37,8 @@ namespace otb
  * The pixels must support the operators >= and <=.
  *
  * \ingroup IntensityImageFilters Multithreaded
+ *
+ * \ingroup OTBImageManipulation
  */
   template <class TInputImage, class TOutputImage=TInputImage>
   class ITK_EXPORT ClampImageFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
index 40929195b455db6da15e0dbb72be86a700c7ef76..900df35a42744956acbdf0ce2c2c66c74ae12043 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
@@ -37,6 +37,8 @@ namespace otb
  * The pixels must support the operators >= and <=.
  *
  * \ingroup IntensityImageFilters Multithreaded
+ *
+ * \ingroup OTBImageManipulation
  */
   template <class TInputImage, class TOutputImage=TInputImage>
   class ITK_EXPORT ClampVectorImageFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
index e6424e46b2ee2f63ba89b00f876a51bbeef04458..1c205000babf75ece3361b59632365486b7e11ce 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
@@ -30,6 +30,8 @@ namespace Functor {
  *
  * \brief TODO
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 template<class TInput, class TOutput>
 class ConcatenateScalarValueFunctor
@@ -85,6 +87,8 @@ private:
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ConcatenateScalarValueImageFilter :
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
index 054b7705d6774605defd5a060feb37d514686c46..0b99e1edbd85638311ac7223cb314bc5eeab18de 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
@@ -26,6 +26,8 @@ namespace otb
 /** \class ConcatenateVectorImageFilter
  * \brief This filter concatenates the vector pixel of the first
  * image with the vector pixel of the second image.
+ *
+ * \ingroup OTBImageManipulation
  */
 template<class TInputImage1, class TInputImage2, class TOutputImage>
 class ITK_EXPORT ConcatenateVectorImageFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbDEMToImageGenerator.h b/Modules/Filtering/ImageManipulation/include/otbDEMToImageGenerator.h
index b80e0d1563f0c7fde0eb081a51d88debe83f9a1d..dcec3d60acf099558a4f5bef197a8cdc7fb78203 100644
--- a/Modules/Filtering/ImageManipulation/include/otbDEMToImageGenerator.h
+++ b/Modules/Filtering/ImageManipulation/include/otbDEMToImageGenerator.h
@@ -41,6 +41,8 @@ namespace otb
  *
  * \example IO/DEMToImageGenerator.cxx
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TDEMImage>
 class ITK_EXPORT DEMToImageGenerator :
diff --git a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
index 90ce20420c5dd05e079820011c36578f465e8fca..9a6331b18a641bbce69dcfee59622cff88066d07 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
@@ -42,6 +42,8 @@ namespace otb
  * \sa SpatialFunctionImageFilter
  * \sa ImageFunction
  * \ingroup ImageFilters
+ *
+ * \ingroup OTBImageManipulation
  */
 
 template <class TInputImage, class TOutputImage, class TFunction>
diff --git a/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h b/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h
index 110ef27f73a8c7f0b69e7bec81405415fb2b4b82..ea5d1367d52d02e831831628634f6f2394eacdf3 100644
--- a/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h
@@ -32,6 +32,8 @@ namespace otb
  *  a value between 0 and 1.
  *
  *  \example BasicFilters/HillShadingExample.cxx
+ *
+ * \ingroup OTBImageManipulation
 */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT HillShadingFilter :
diff --git a/Modules/Filtering/ImageManipulation/include/otbHillShadingFunctor.h b/Modules/Filtering/ImageManipulation/include/otbHillShadingFunctor.h
index a7cba5eddbbd47bf14b68add2a6becf8a440b8dd..4a62f6fd29854fead54871b1adb0defeb5dbf8dc 100644
--- a/Modules/Filtering/ImageManipulation/include/otbHillShadingFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbHillShadingFunctor.h
@@ -34,6 +34,8 @@ namespace Functor
  *
  *  \ingroup Functor
  *  \example BasicFilters/HillShadingExample.cxx
+ *
+ * \ingroup OTBImageManipulation
 */
 template<class TInput1, class TInput2 = TInput1, class TOutput = TInput1>
 class HillShadeModulationFunctor
@@ -61,6 +63,8 @@ public:
  *
  *  \ingroup Functor
  *  \example BasicFilters/HillShadingExample.cxx
+ *
+ * \ingroup OTBImageManipulation
 */
 template <class TNeighIter, class TInputImage, class TOutput>
 class HillShadingFunctor
diff --git a/Modules/Filtering/ImageManipulation/include/otbImageToImageListFilter.h b/Modules/Filtering/ImageManipulation/include/otbImageToImageListFilter.h
index 4e0bb89348b3727b305d86c05c878c9a48d78b12..246ea4e5e100d02722a1066b9edab4e8458a4623 100644
--- a/Modules/Filtering/ImageManipulation/include/otbImageToImageListFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbImageToImageListFilter.h
@@ -29,6 +29,8 @@ namespace otb
  *
  * \ingroup Images
  * \ingroup Lists
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ImageToImageListFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h b/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h
index 80caff27976469cc3b4e0e9c950a5745b961bedc..06178f8be9aa7eb9975c6f79f6e9a9a68586f222 100644
--- a/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h
@@ -31,6 +31,8 @@ namespace Functor
  *  a size of 1.
  * \ingroup Functor
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInput, class TOutput>
 class VectorCast
@@ -62,6 +64,8 @@ public:
  * \brief This is a helper class that convert an otb::Image into a single-channel otb::VectorImage.
  * \ingroup Singlethreaded
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputVectorImage>
 class ITK_EXPORT ImageToVectorImageCastFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbInverseLogPolarTransform.h b/Modules/Filtering/ImageManipulation/include/otbInverseLogPolarTransform.h
index 5b75e7e5602ac5f8a3bb20268c4d76e1969844f8..746deb73f2094f59b0986fde1bcb84fe3529a20f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbInverseLogPolarTransform.h
+++ b/Modules/Filtering/ImageManipulation/include/otbInverseLogPolarTransform.h
@@ -37,6 +37,8 @@ namespace otb
  *
  * \sa LogPolarTransform
  * \ingroup  Transform
+ *
+ * \ingroup OTBImageManipulation
  */
 
 template <class TScalarType>
diff --git a/Modules/Filtering/ImageManipulation/include/otbLocalActivityVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbLocalActivityVectorImageFilter.h
index a42227743d62d1ef13df30fff435396c29023115..658a8cffa88d8b3e32556111947c28f0e4326657 100644
--- a/Modules/Filtering/ImageManipulation/include/otbLocalActivityVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbLocalActivityVectorImageFilter.h
@@ -29,6 +29,8 @@ namespace Functor
 {
 /** \class LocalActivityOperator
  * \brief Performs the calculation of LocalActivity derivation
+ *
+ * \ingroup OTBImageManipulation
  */
 template < class TInput, class TOutput >
 class LocalActivityOperator
@@ -76,6 +78,8 @@ public:
 
 /** \class LocalActivityVectorImageFilter
  * \brief Implements the  LocalActivity Gradient to be processed on a vector image
+ *
+ * \ingroup OTBImageManipulation
  */
 template < class TInputImage, class TOutputImage >
 class ITK_EXPORT LocalActivityVectorImageFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h
index 912c789fd16024334c9063696e7f59d1c2a051be..bb878ab949685cd5d538878539007f0592ff964e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h
@@ -29,6 +29,8 @@ namespace Functor
 {
 /** \class LocalGradientOperator
  * \brief Performs the calculation of LocalGradient derivation
+ *
+ * \ingroup OTBImageManipulation
  */
 template < class TInput, class TOutput >
 class LocalGradientOperator
@@ -59,6 +61,8 @@ public:
 
 /** \class LocalGradientVectorImageFilter
  * \brief Implements the 3x3 Local Gradient to be processed on a vector image
+ *
+ * \ingroup OTBImageManipulation
  */
 template < class TInputImage, class TOutputImage >
 class ITK_EXPORT LocalGradientVectorImageFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h
index de54e3da3604859290397babba5ea528df59bbcb..454b11df33b6a8276d70dab2976785a52ae2c060 100644
--- a/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class Log10ThresholdedImageFilter
  * \brief Computes the 10 * vcl_log10(x) pixel-wise with a threshold for the lowest values
+ *
+ * \ingroup OTBImageManipulation
  */
 namespace Functor
 {
diff --git a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
index c11290c673baaa10eef5a080629d2091733a0485..ab3e1d38111e100fb306f9ff6906a165502e06d7 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
@@ -39,6 +39,8 @@ namespace otb
  * For example, if the image has 2 bands, the matrix is \f$ \begin{pmatrix} \alpha & \beta \\ \gama & \delta \end{pmatrix} \f$
  * The pixel \f$ [a, b] \f$ will give the output pixel \f$ [\alpha.a + \beta.b, \gamma.a + \delta.b  ]. \f$
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 
 template <class TInputImage, class TOutputImage, class TMatrix = vnl_matrix<typename itk::NumericTraits<typename TInputImage::InternalPixelType>::RealType> >
diff --git a/Modules/Filtering/ImageManipulation/include/otbMeanFunctor.h b/Modules/Filtering/ImageManipulation/include/otbMeanFunctor.h
index 2c83d7926af1e64f41fa7a4f5ecb1a596cc4ac0c..9f513fbf195bbfb271fe4fc66d5f87cf0c07ad44 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMeanFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbMeanFunctor.h
@@ -24,6 +24,8 @@ namespace Functor
 {
 /** \class MeanFunctor
  *  \brief This functor generate the mean value of a component pixels
+ *
+ * \ingroup OTBImageManipulation
  */
 template<class TInput, class TOutputValue>
 class MeanFunctor
diff --git a/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h
index c3b064fc66796a37fc85bac8735914df9f974ce6..3f6cfbaf029dc5f12eabe1893f95ca00e5604fe7 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h
@@ -25,6 +25,8 @@ namespace otb
 
 /** \class MultiplyByScalarImageFilter
  * \brief TODO
+ *
+ * \ingroup OTBImageManipulation
  */
 
 namespace Functor
diff --git a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
index 328b6470601b26a572bed16e602e98413f5914f5..7c950734ec9ee0327ed0dac2e32510637dcab489 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
@@ -39,6 +39,8 @@ namespace otb
  * \sa ImageListToImageListApplyFilter
  * \sa ImageListToVectorImageFilter
  * \ingroup Streamed
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputImage, class TFilter>
 class ITK_EXPORT PerBandVectorImageFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h b/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h
index c6b9c273d7071f301de0faa5d0737a8d05362f90..2dd917adb48d7ce19a4b4545172be509f5cab7c3 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h
@@ -30,6 +30,8 @@ namespace Function
 *  \ingroup Visualization
 *
 * \sa AmplitudeFunctor ChannelSelectorFunctor
+ *
+ * \ingroup OTBImageManipulation
 */
 template <class TInputPixel>
 class PhaseFunctor : public ChannelSelectorFunctor<TInputPixel>
diff --git a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
index 8715963f00d7b7666f8140362448c90b674cff95..0f8fad7126dce8669dc24da47f08adb84618ecfe 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
@@ -36,6 +36,8 @@ namespace Functor
  * \class MaskFunctor
  * \brief Output is a InputPixel if MaskPixel is m_Background and a
  * defined other value (m_ObjectColor) otherwise.
+ *
+ * \ingroup OTBImageManipulation
  */
 
 template<class TInputPixel, class TMaskPixel, class TOutputPixel>
@@ -111,6 +113,8 @@ protected:
  *  It is useful for publications for instance.
  *
  * \sa itkImageToImageFilter
+ *
+ * \ingroup OTBImageManipulation
  **/
 
 template <class TInputImage, class TMaskImage = otb::Image<unsigned char, 2> >
diff --git a/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h
index c89bb1bf21daf049cc5a6ef27d0ffbf3d33ed033..e3aed3ade939c53d7f17c42e0529a4b0de7b408c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h
@@ -29,6 +29,8 @@ namespace otb
  *
  * \sa RealAndImaginaryImageToComplexImageFilter
  * \ingroup Multithreaded
+ *
+ * \ingroup OTBImageManipulation
  */
 
 namespace Function {
diff --git a/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h
index 481f7e2f3bec3c6676658ec0504bd98d230afe54..9525b667dc36b64a1dfea3aae0c6881cf7b5536d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h
@@ -29,6 +29,8 @@ namespace otb
  *
  * \sa RealImageToComplexImageFilter
  * \ingroup Multithreaded
+ *
+ * \ingroup OTBImageManipulation
  */
 
 namespace Function {
diff --git a/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h b/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h
index 25d04fca23f1fdce4756e43b6082af0cab4f6127..7341aadfc7f8b4c4090db0d3bc7057a947486814 100644
--- a/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h
@@ -40,6 +40,8 @@ namespace Accessor
  * to the types defined as template parameters
  *
  * \ingroup ImageAdaptors
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TPixelType, class TExternalType>
 class ITK_EXPORT ShiftScalePixelAccessor
@@ -96,6 +98,8 @@ private:
  * types following C++ default casting rules.
  *
  * \ingroup ImageAdaptors
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TImage, class TOutputPixelType>
 class ITK_EXPORT ShiftScaleImageAdaptor : public
diff --git a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
index ffb9138ba3c6dffb4b4b275f9f7592f031e6632e..26422e340c0538841ed32fb43599e91d54a85c47 100644
--- a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
@@ -38,6 +38,8 @@ namespace Functor
  *
  *  TInput and TOutput type are supposed to be of type itk::VariableLengthVector.
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 template<class TInput, class TOutput>
 class VectorShiftScale
@@ -142,6 +144,8 @@ private:
  *
  *  \ingroup IntensityImageFilters
  *  \ingroup MultiThreaded
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputImage = TInputImage>
 class ITK_EXPORT ShiftScaleVectorImageFilter :
diff --git a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
index 37be0ff50ad21ab3e5c9cfed1c134492839e446c..b8cf7b4782d1de9083d0ac740cecfcaa88405957 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
@@ -44,6 +44,8 @@ namespace otb
  * \ingroup IntensityImageFilters
  * \ingroup Threading
  * \ingroup Streamed
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT SpectralAngleDistanceImageFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleFunctor.h b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleFunctor.h
index 3ed0c0fce0b88467516cabdad814eb6cca8cb037..4ce398a881f39fc6e1f31f5ccc95726a327ebd13 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleFunctor.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class SpectralAngleFunctor
  *  \brief This functor computes the spectral angle according to a reference pixel.
+ *
+ * \ingroup OTBImageManipulation
  */
 namespace Functor
 {
diff --git a/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h b/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h
index af361ce25796d87c05fe14155e9839fafb312389..c2ac2a812a45ed94e366264dc86cd8ce49665b25 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h
+++ b/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h
@@ -28,6 +28,8 @@ namespace Functor
 
 /** \class SqrtSpectralAngleFunctor
  *  \brief This functor computes the square root of a spectral angle according to a reference pixel.
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputVectorPixel, class TOutputPixel>
 class SqrtSpectralAngleFunctor : public SpectralAngleFunctor<TInputVectorPixel, TOutputPixel>
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
index a4e8de15647b85f32d642ebcbbd01ccb626fa069..64ac35e8cfdac171c92511f49a0e48d34d57404d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
@@ -47,6 +47,8 @@ namespace otb
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 template<class TInputImage>
 class ITK_EXPORT PersistentInnerProductVectorImageFilter :
@@ -149,6 +151,8 @@ private:
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBImageManipulation
  */
 
 template<class TInputImage>
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
index d0acce8c329ab76568c32872671fd701162efef6..e8b18f4eb5cdb3a59a466dea4db012318301cc48 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
@@ -47,6 +47,8 @@ namespace otb
  * \sa StreamingTraits
  * \sa StatisticsImageFilter
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBImageManipulation
  */
 template<class TInputImage, class TInputImage2>
 class ITK_EXPORT PersistentMatrixTransposeMatrixImageFilter :
@@ -197,6 +199,8 @@ private:
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBImageManipulation
  */
 
 template<class TInputImage1, class TInputImage2>
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
index 2e98aac1a62ab3b09c41a3ee581395defb6f2c5a..841117429ac4d12b5f4a3a83dae272d5164816ba 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
@@ -48,6 +48,8 @@ namespace otb
  *
  * \ingroup Projection
  *
+ *
+ * \ingroup OTBImageManipulation
  **/
 
 template <class TInputImage, class TOutputImage,
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
index 66c842e64f397d61d98d549c2588bbe2416cb610..c985e4447f40204a3f5c2b3cf3431e195930e2db 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
@@ -159,6 +159,8 @@ private:
  * \ingroup Streamed
  * \ingroup Multithreaded
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 template<class TInputImage, class TOutputImage = TInputImage>
 class ITK_EXPORT PersistentShrinkImageFilter :
@@ -251,6 +253,8 @@ private:
  * \ingroup Streamed
  * \ingroup Multithreaded
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 template<class TInputImage, class TOutputImage = TInputImage>
 class ITK_EXPORT StreamingShrinkImageFilter :
diff --git a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
index 2adca675624eb3ded66b7de16e72e6ca903ec6e1..e0e1e615423060a160fd253477b496c0ffa6d90c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
@@ -36,6 +36,8 @@ namespace otb
  * The pixels must support the operators >= and <=.
  *
  * \ingroup IntensityImageFilters Multithreaded
+ *
+ * \ingroup OTBImageManipulation
  */
   template <class TInputImage, class TOutputImage=TInputImage>
   class ITK_EXPORT ThresholdVectorImageFilter : public itk::ImageToImageFilter<TInputImage, TOutputImage>
diff --git a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
index 840c1e34dafbeff971d301e46c0a40854ff9901b..dd37ff9d79d83b45187a04e05c8834c50cbc5081 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
@@ -43,6 +43,8 @@ namespace otb
  *
  * \ingroup Streamed
  * \ingroup MultiThreaded
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TImage>
 class ITK_EXPORT TileImageFilter :
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
index 70e20d4b20cf0e74045ec0f7a99e0c6763e91b75..8b1f93d2450cfd5be162baf08c2f90ebf466148d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
@@ -33,6 +33,8 @@ namespace otb
  * operation to be applied.  A Functor style is used.
  *
  * \ingroup IntensityImageFilters   Multithreaded
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputImage, class TFunction>
 class ITK_EXPORT UnaryFunctorNeighborhoodImageFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
index e0e596ff1e4015ae44791909339fe6aa657cb90f..c9b5d1bd81c7221786b9d45904015f9c22fe3c0e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
@@ -33,6 +33,8 @@ namespace otb
  * operation to be applied.  A Functor style is used.
  *
  * \ingroup IntensityImageFilters   Multithreaded
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputImage, class TFunction>
 class ITK_EXPORT UnaryFunctorNeighborhoodWithOffsetImageFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
index 4b9a679b8722c4775afca364875daed31e7ff242..fdb2713907d792a5b822a8870d1c9050b736c0f6 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * operation to be applied.  A Functor style is used.
  *
  * \ingroup IntensityImageFilters   Multithreaded
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputImage, class TFunction>
 class ITK_EXPORT UnaryFunctorWithIndexImageFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
index 8834e20892a38e805d260533fa72515b3c4911a6..cb1a41967b154d88de16c6bcf4c83c7608aefff9 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
@@ -38,6 +38,8 @@ namespace otb
  *
  * \ingroup Functor
  * \ingroup VectorImage
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputImage, class TFunction>
 class ITK_EXPORT UnaryImageFunctorWithVectorImageFilter : public itk::InPlaceImageFilter<TInputImage, TOutputImage>
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
index e6d26066494af16700f8258f16d9407c44b192c9..18a45eb160c0e9b95d099bf59339c8f446968732 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
@@ -34,6 +34,8 @@ namespace otb
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT VectorImageTo3DScalarImageFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h
index 1cef32081ca3f5e3bb38a8c0cca5f97f1f5faa75..4bbb5f79fcf75babe0c06581ced9560828a9e54a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h
@@ -49,6 +49,8 @@ public:
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBImageManipulation
  */
 
 template <class TInputImage, class TOutputImage>
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorImageToImageListFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorImageToImageListFilter.h
index a401172e63142a685820543d4599118ed4c1b9d3..997c730463e1d9039a3650b05216abdb23277023 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorImageToImageListFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorImageToImageListFilter.h
@@ -34,6 +34,8 @@ namespace otb
  * to avoid break the output
  *
  * \ingroup Streamed
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TVectorImageType, class TImageList>
 class ITK_EXPORT VectorImageToImageListFilter
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
index 39fb925aa10ff324df8712d5f9b3e70b6779cb76..9c80e7ffd11218691cee1cc0f555c88bb059670d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
@@ -36,6 +36,8 @@ namespace Functor
  *
  *  TInput and TOutput type are supposed to be of type itk::VariableLengthVector.
  *
+ *
+ * \ingroup OTBImageManipulation
  */
 template<typename TInput, typename  TOutput>
 class VectorAffineTransform
@@ -202,6 +204,8 @@ private:
  *
  *  \ingroup IntensityImageFilters
  *  \ingroup MultiThreaded
+ *
+ * \ingroup OTBImageManipulation
  */
 template <class TInputImage, class TOutputImage = TInputImage>
 class ITK_EXPORT VectorRescaleIntensityImageFilter
diff --git a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
index 2498502849da2359b3e724ac390c3086a521ca74..487224a17ea94a7163ff35e3a992f905b1c451ae 100644
--- a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
@@ -41,6 +41,8 @@ namespace otb
  * \f$ (i_{p}, j_{p})\f$ : the coordinates of the pixels belonging to \f$ \eta_{p} \subset \eta_{s} \f$
  * \f$ C_{s}\f$ : the variation coefficient computed over \f$ \eta_{p}\f$
  *
+ *
+ * \ingroup OTBImageNoise
  */
 
 template <class TInputImage, class TOutputImage>
diff --git a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
index 11c024b0bbfea6117a17eaaf5b6bd0633ab5ba40..e6e7179b415611d255e5d97ed2a849340ad11f83 100644
--- a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
@@ -37,6 +37,8 @@ namespace otb
 \f$L\f$ the image number of looks and
 \f$C_r = \frac{\sqrt{Var(I)}}{E[I]} \f$ and  \f$Var(I) = E[I^2] - E[I]^2\f$.
  *
+ *
+ * \ingroup OTBImageNoise
  */
 
 template <class TInputImage, class TOutputImage>
diff --git a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
index 56b1cf41bd459d08528a471b00805d47c0f465c1..1411a0b5c741259ce0af906150c8be862b85ca72 100644
--- a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
+++ b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
@@ -73,6 +73,8 @@ namespace otb
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBMathParser
  */
 
 template< class TImage >
diff --git a/Modules/Filtering/MathParser/include/otbBandMathXImageFilter.h b/Modules/Filtering/MathParser/include/otbBandMathXImageFilter.h
index e5a27e9c90d4aaff3074eed0ce94027db8969031..5d4cbf8081fe9dac2349174e2d78a51f3e004c7b 100644
--- a/Modules/Filtering/MathParser/include/otbBandMathXImageFilter.h
+++ b/Modules/Filtering/MathParser/include/otbBandMathXImageFilter.h
@@ -55,6 +55,8 @@ namespace otb
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBMathParser
  */
 
 template< class TImage >
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
index 5135b4726ff0b1dc9a2e9ddc0d98343d9d3c3737..ebf63c6cf36f6c1dcf164dc72edb3ac4c7c3109c 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
@@ -65,6 +65,8 @@ namespace otb
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBMathParser
  */
 
 template<class TInputImage, class TOutputImage, class TFunction = Functor::MaskMuParserFunctor<
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
index ae6ed49023a79bb79a692d174a4622628ff67e76..9ba384f7f0084f043b206f3507ce8f8056d93184 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
@@ -43,10 +43,14 @@ namespace otb
  *
  * \sa Parser
  *
+ *
+ * \ingroup OTBMathParser
  */
 
 /** \class MaskMuParserFunctor
  *  \brief This functor use MuParser to evaluate and process mathematical expression
+ *
+ * \ingroup OTBMathParser
  */
 namespace Functor
 {
diff --git a/Modules/Filtering/MathParser/include/otbOBIAMuParserFunctor.h b/Modules/Filtering/MathParser/include/otbOBIAMuParserFunctor.h
index 87bb75afb1fb97662ae5c368ff57eb4782376c25..0979d2dab9b2a7e768d3d2963a6a765f44fb615d 100644
--- a/Modules/Filtering/MathParser/include/otbOBIAMuParserFunctor.h
+++ b/Modules/Filtering/MathParser/include/otbOBIAMuParserFunctor.h
@@ -42,10 +42,14 @@ namespace otb
  *
  * \sa Parser
  *
+ *
+ * \ingroup OTBMathParser
  */
 
 /** \class OBIAMuParserFunctor
  *  \brief This functor use MuParser to evaluate and process mathematical expression
+ *
+ * \ingroup OTBMathParser
  */
 namespace Functor
 {
diff --git a/Modules/Filtering/MathParser/include/otbParser.h b/Modules/Filtering/MathParser/include/otbParser.h
index 2fc3c8533f83ce20b8fe2ff988fac28ca058408c..10a02a21eee22d43cc63929b520350f24c2bba6f 100644
--- a/Modules/Filtering/MathParser/include/otbParser.h
+++ b/Modules/Filtering/MathParser/include/otbParser.h
@@ -33,6 +33,8 @@ class ParserImpl;
  *
  * \sa BandMathImageFilter
  *
+ *
+ * \ingroup OTBMathParser
  */
 class ITK_EXPORT Parser : public itk::LightObject
 {
diff --git a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
index 749475f9ff50327ac5ac29a593a25dd40e002cdc..d9fcbddb9370ea4b996c7fe00b9327f11faef904 100644
--- a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
+++ b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
@@ -35,6 +35,8 @@ namespace otb
   * \ingroup Functions
   * \sa DataNodeImageFunction
   * \sa SpectralAngleDataNodeFeatureFunction
+ *
+ * \ingroup OTBMathParser
   */
 
 template <
diff --git a/Modules/Filtering/MathParser/include/otbParserX.h b/Modules/Filtering/MathParser/include/otbParserX.h
index aa4ca431ac82f57c26e774cacf39e1425f631423..7bb954ef928173719802f4818e5f4a5b1296346f 100644
--- a/Modules/Filtering/MathParser/include/otbParserX.h
+++ b/Modules/Filtering/MathParser/include/otbParserX.h
@@ -34,6 +34,8 @@ class ParserXImpl;
  *
  * \sa BandMathImageFilter
  *
+ *
+ * \ingroup OTBMathParser
  */
 class ITK_EXPORT ParserX : public itk::LightObject
 {
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
index 02eea1d24ed2a73e0bfff52fb471a1b7aac3d08b..f8bd0adb2a4645022162c662ec43a9a65f5b3c27 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
@@ -45,6 +45,8 @@ namespace otb
  * \ingroup MultiScale
  * \sa MorphologicalPyramidSynthesisFilter, OpeningClosingMorphologicalFilter,
  * ClosingOpeningMorphologicalFilter
+ *
+ * \ingroup OTBMorphologicalPyramid
  */
 template <class TInputImage, class TOutputImage, class TMorphoFilter>
 class ITK_EXPORT MorphologicalPyramidAnalysisFilter
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
index 918bcea4caf19d2f6ec84a480cc5cc3a50f292b9..369d46cd047f854c7e698ff2c3f5861ef659774f 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
@@ -34,6 +34,8 @@ namespace MorphologicalPyramid
  *
  * \sa MorphologicalPyramidAnalyseFilter
  * \sa MorphologicalPyramidSynthesisFilter
+ *
+ * \ingroup OTBMorphologicalPyramid
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT MRToMSConverter
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
index b89474f48426c9f1c4a837ac3471ddcf5f57a4e9..83c831fae5c34025eba711ff1d753a9589af7265 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
@@ -39,6 +39,8 @@ namespace MorphologicalPyramid
  * \sa ResampleImageFilter
  * \sa LinearInterpolateImageFunction
  * \sa ScaleTransform
+ *
+ * \ingroup OTBMorphologicalPyramid
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT Resampler
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
index 940c18594a19400e79dc3a44d4ab33e32e6393fb..08e8e2b3ac92449278583dd26d3ae16d7abb8bd9 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
@@ -51,6 +51,8 @@ namespace otb
  * \ingroup MultiScale
  * \sa MorphologicalPyramidSynthesisFilter, OpeningClosingMorphologicalFilter,
  * ClosingOpeningMorphologicalFilter, Segmenter, MRToMSConverter, Resampler
+ *
+ * \ingroup OTBMorphologicalPyramid
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT MorphologicalPyramidSegmentationFilter
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
index 1ddd313c76aa99624a5d242fdd0f64492b1daf33..20be5dfd66d77cdb3bd864976d3fe0a0d20a901c 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
@@ -41,6 +41,8 @@ namespace MorphologicalPyramid
  * \sa ResampleImageFilter
  * \sa LinearInterpolateImageFunction
  * \sa ScaleTransform
+ *
+ * \ingroup OTBMorphologicalPyramid
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT Segmenter
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
index 79379de0e3f4680e3b9010720dea830e02c14630..904786e17bbb17fb57afcf981dae8de9df338f01 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
@@ -39,6 +39,8 @@ namespace otb
  * \ingroup MultiScale
  * \sa MorphologicalPyramidAnalyseFilter
  * \sa MorphologicalPyramidResampler
+ *
+ * \ingroup OTBMorphologicalPyramid
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT MorphologicalPyramidSynthesisFilter
diff --git a/Modules/Filtering/Path/include/otbAddCarvingPathFilter.h b/Modules/Filtering/Path/include/otbAddCarvingPathFilter.h
index 64861ab2ba56d7096064f8bd4767bd2a83fb1343..f450547489301136a9bf254c1f26842433cf17a5 100644
--- a/Modules/Filtering/Path/include/otbAddCarvingPathFilter.h
+++ b/Modules/Filtering/Path/include/otbAddCarvingPathFilter.h
@@ -52,6 +52,8 @@ namespace otb
   *
   * \ingroup PathFilters
   * \ingroup ImageFilters
+ *
+ * \ingroup OTBPath
   */
 
 template <class TInputImage, class TInputPath, class TOutputImage>
diff --git a/Modules/Filtering/Path/include/otbBreakAngularPathListFilter.h b/Modules/Filtering/Path/include/otbBreakAngularPathListFilter.h
index 7af4fc2176b6d072bbf69dd0fab36d9fe7085df0..5fb086314d315dcb7b2e3f3f4e0083684be163ca 100644
--- a/Modules/Filtering/Path/include/otbBreakAngularPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbBreakAngularPathListFilter.h
@@ -28,6 +28,8 @@ namespace otb
    *
    * \example FeatureExtraction/ExtractRoadByStepsExample.cxx
    *
+ *
+ * \ingroup OTBPath
  */
 template <class TPath>
 class ITK_EXPORT BreakAngularPathListFilter
diff --git a/Modules/Filtering/Path/include/otbClosePathFunctor.h b/Modules/Filtering/Path/include/otbClosePathFunctor.h
index 609d4a02f4af68fbc1e7ece0f61faba041720f60..dec07b272e217ec320d31b22701936fc3812f983 100644
--- a/Modules/Filtering/Path/include/otbClosePathFunctor.h
+++ b/Modules/Filtering/Path/include/otbClosePathFunctor.h
@@ -31,6 +31,8 @@ namespace otb
 * \sa UnaryFunctorObjectListFilter
 *
  *  \ingroup Functor
+ *
+ * \ingroup OTBPath
  */
 template <class TInput, class TOutput>
 class ClosePathFunctor
diff --git a/Modules/Filtering/Path/include/otbCompacityPathFunction.h b/Modules/Filtering/Path/include/otbCompacityPathFunction.h
index e7a46244a7842ed70a07de2dc702d37b86d57fa6..52d5eb9f6fcebf9366f90442a9223fa7b6f1e1d3 100644
--- a/Modules/Filtering/Path/include/otbCompacityPathFunction.h
+++ b/Modules/Filtering/Path/include/otbCompacityPathFunction.h
@@ -34,6 +34,8 @@ namespace otb
  * The result value is comprise between 0.0 and 1.0
  *
  * \ingroup PathFunctions
+ *
+ * \ingroup OTBPath
  */
 
 template <class TInputPath,
diff --git a/Modules/Filtering/Path/include/otbDrawPathFilter.h b/Modules/Filtering/Path/include/otbDrawPathFilter.h
index 62a1025d0c576d82c03333fac65d813067236b00..670203f4dcb95a752b3650817305cc29ab7fe89b 100644
--- a/Modules/Filtering/Path/include/otbDrawPathFilter.h
+++ b/Modules/Filtering/Path/include/otbDrawPathFilter.h
@@ -35,6 +35,8 @@ namespace otb
  *
  * \ingroup PathFilters
  * \ingroup ImageFilters
+ *
+ * \ingroup OTBPath
  */
 
 template <class TInputImage, class TInputPath, class TOutputImage>
diff --git a/Modules/Filtering/Path/include/otbDrawPathListFilter.h b/Modules/Filtering/Path/include/otbDrawPathListFilter.h
index c3b4e459914cc88afae390889de0135fa85414e8..bdeb1565ea23459a00d49c035fa229a97d1d872e 100644
--- a/Modules/Filtering/Path/include/otbDrawPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbDrawPathListFilter.h
@@ -39,6 +39,8 @@ namespace otb
  *
  * \ingroup PathListFilters
  * \ingroup PathLists
+ *
+ * \ingroup OTBPath
  */
 
 template <class TInputImage, class TInputPath, class TOutputImage>
diff --git a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
index 8765edc7be841fa34120055220b6a340fa2e9e78..f54a400d5c6c4fa25c73e2830e8b790da518edb4 100644
--- a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
+++ b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
@@ -30,6 +30,8 @@ namespace otb
  * <b>Limitations:</b> This filter is currently working with integer position
  * for the polygon vertices. It should be optimized for continuous positions.
  *
+ *
+ * \ingroup OTBPath
  */
 template <class TPath, class TImage>
 class ITK_EXPORT ImageFittingPolygonListFilter
diff --git a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
index 45958c117108c40404a697c0b7a179e0af0ef1e2..69b9a335d7ccea0ce0fa50c45dd2044708007a14 100644
--- a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
@@ -47,6 +47,8 @@ namespace otb
  *
  * This leads to consistant result for geometric descriptors (for instance compacity).
  * \sa ImageToPathFilter
+ *
+ * \ingroup OTBPath
  */
 
 template <class TInputImage, class TOutputPath>
diff --git a/Modules/Filtering/Path/include/otbImageToPathFilter.h b/Modules/Filtering/Path/include/otbImageToPathFilter.h
index c4ea22ac9f2c9184ba6f67e747b74bacc8507437..cb8f74a17ff2ca84e462820082304cd6ef21faae 100644
--- a/Modules/Filtering/Path/include/otbImageToPathFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToPathFilter.h
@@ -26,6 +26,8 @@ namespace otb
  * \class ImageToPathFilter
  * \brief Base class for filters taking an image as input, and producing an
  * output of type Path.
+ *
+ * \ingroup OTBPath
  */
 template <class TInputImage, class TOutputPath>
 class ITK_EXPORT ImageToPathFilter
diff --git a/Modules/Filtering/Path/include/otbImageToPathListFilter.h b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
index 382a241c0384a78cc4406a20d6535fe13400fe50..9c26ba83586ca7e536d01c8012a551503f5a68b2 100644
--- a/Modules/Filtering/Path/include/otbImageToPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
@@ -27,6 +27,8 @@ namespace otb
  *
  * \ingroup PathListFilters
  * \ingroup PathLists
+ *
+ * \ingroup OTBPath
  */
 
 template <class TInputImage, class TOutputPath>
diff --git a/Modules/Filtering/Path/include/otbOrientationPathFunction.h b/Modules/Filtering/Path/include/otbOrientationPathFunction.h
index 234aed491326b90070fe127066b8cc1ac11be0d3..e1b1b19ff89ff57624b3377324baa20d7164ea3f 100644
--- a/Modules/Filtering/Path/include/otbOrientationPathFunction.h
+++ b/Modules/Filtering/Path/include/otbOrientationPathFunction.h
@@ -30,6 +30,8 @@ namespace otb
  * The result value is in radian.
  *
  * \ingroup PathFunctions
+ *
+ * \ingroup OTBPath
  */
 
 template <class TInputPath,
diff --git a/Modules/Filtering/Path/include/otbPathFunction.h b/Modules/Filtering/Path/include/otbPathFunction.h
index 0bb14e0eeb35ca543b4b7028e6e4161036320faf..568007a1da1178179e3178cb7ad1a01e014118a3 100644
--- a/Modules/Filtering/Path/include/otbPathFunction.h
+++ b/Modules/Filtering/Path/include/otbPathFunction.h
@@ -38,6 +38,8 @@ namespace otb
  * \sa Path
  *
  * \ingroup PathFunction
+ *
+ * \ingroup OTBPath
  */
 template <class TInputPath,
     class TOutput>
diff --git a/Modules/Filtering/Path/include/otbPathLengthFunctor.h b/Modules/Filtering/Path/include/otbPathLengthFunctor.h
index fc17eb16502fe2f039d167f6655dbeaeca417db2..f8dd25a0f7c44ab6e30611ac3137aa45f994417f 100644
--- a/Modules/Filtering/Path/include/otbPathLengthFunctor.h
+++ b/Modules/Filtering/Path/include/otbPathLengthFunctor.h
@@ -31,6 +31,8 @@ namespace otb
  * and returns true if it is above the threshold, false otherwise.
  *
  *  \ingroup Functor
+ *
+ * \ingroup OTBPath
  */
 template <class TInput1>
 class PathLengthFunctor
diff --git a/Modules/Filtering/Path/include/otbPathListSource.h b/Modules/Filtering/Path/include/otbPathListSource.h
index 401df329ef31ec4d676cc166208f98e4d2474a17..74f760bfaf2f0cc2270e10abc1c3a076edc5d4b2 100644
--- a/Modules/Filtering/Path/include/otbPathListSource.h
+++ b/Modules/Filtering/Path/include/otbPathListSource.h
@@ -34,6 +34,8 @@ namespace otb
  * \ingroup DataSources
  * \ingroup Paths
  * \ingroup Lists
+ *
+ * \ingroup OTBPath
  */
 
 template <class TOutputPath>
diff --git a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
index 1f11cb38e93bd3b76e2161d40ed5ba7a989f446d..366c866d805ee3fdff00f18f994528dcc3ab1803 100644
--- a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
+++ b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
@@ -38,6 +38,8 @@ namespace otb
  *  an histogram from a list of path. Internally it creates a List that is feed into
  *  the ListSampleToHistogramGenerator.
  *
+ *
+ * \ingroup OTBPath
  */
 
 template<class TPath, class TFunction>
diff --git a/Modules/Filtering/Path/include/otbPathListToPathListFilter.h b/Modules/Filtering/Path/include/otbPathListToPathListFilter.h
index 06cf8765e0657215a4f0e24909d21dfcce059d40..53a38c2c11c5f3c253421910b46b678f64845ec7 100644
--- a/Modules/Filtering/Path/include/otbPathListToPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbPathListToPathListFilter.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class PathListToPathListFilter
  *  \brief Base class for filter taking a PathList as input a returning a PathList.
+ *
+ * \ingroup OTBPath
  */
 template <class TPath>
 class ITK_EXPORT PathListToPathListFilter
diff --git a/Modules/Filtering/Path/include/otbPathMeanDistanceFunctor.h b/Modules/Filtering/Path/include/otbPathMeanDistanceFunctor.h
index 5bea2c9304e132a35c34bb172b26a3c86957a4cf..7d632d99d4e2e3084a4eb22925481cdab3b13d2a 100644
--- a/Modules/Filtering/Path/include/otbPathMeanDistanceFunctor.h
+++ b/Modules/Filtering/Path/include/otbPathMeanDistanceFunctor.h
@@ -33,6 +33,8 @@ namespace otb
  * \sa UnaryFunctorObjectListBooleanFilter
  *
  *  \ingroup Functor
+ *
+ * \ingroup OTBPath
  */
 template <class TInput1>
 class PathMeanDistanceFunctor
diff --git a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
index 6614b43e97cb23f58bdb916981c9b390d4012e00..55faa32a1e1fd1c4ee20f5f3f4752e5fd54e5a2f 100644
--- a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
+++ b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
@@ -36,6 +36,8 @@ namespace otb
  * \sa LineIterator
  * \sa LineConstIterator
  * \sa PolyLineImageIterator
+ *
+ * \ingroup OTBPath
  */
 template <class TImage, class TPath>
 class ITK_EXPORT PolyLineImageConstIterator
diff --git a/Modules/Filtering/Path/include/otbPolyLineImageIterator.h b/Modules/Filtering/Path/include/otbPolyLineImageIterator.h
index 004f20e71fb910b3da20c51402144563c09c6832..f5aa814348403f930f8db87f4c1ac3a5e4cc8299 100644
--- a/Modules/Filtering/Path/include/otbPolyLineImageIterator.h
+++ b/Modules/Filtering/Path/include/otbPolyLineImageIterator.h
@@ -34,6 +34,8 @@ namespace otb
  * \sa LineIterator
  * \sa LineConstIterator
  * \sa PolyLineImageConstIterator
+ *
+ * \ingroup OTBPath
  */
 template <class TImage, class TPath>
 class ITK_EXPORT PolyLineImageIterator
diff --git a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
index 84aa6763d01cbb40834cec4ac738241945a4f922..a402cb52b1e05b5ce101d644f5d8ac56463b2d10 100644
--- a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
@@ -34,6 +34,8 @@ namespace otb
 /** \class RegionImageToRectangularPathListFilter
  * \brief Base class used to implement filter to model regions by rectangles.
  *
+ *
+ * \ingroup OTBPath
  */
 template <class TInputImage, class TOutputPath>
 class ITK_EXPORT RegionImageToRectangularPathListFilter : public ImageToPathListFilter<TInputImage, TOutputPath>
diff --git a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
index 70a47f868ae4968d5f0a356e4b67a9087a7f2efb..0bab24269f91b1c61aa49e418d328f0e988c9464 100644
--- a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
@@ -36,6 +36,8 @@ namespace otb
  *  detection. Path with less than three vertices are not kept by the filter.
  *
  * \ingroup PathListSource
+ *
+ * \ingroup OTBPath
  */
 template <class TInputModulus, class TInputDirection, class TOutputPath>
 class ITK_EXPORT VectorizationPathListFilter
diff --git a/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerImageFilter.h b/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerImageFilter.h
index a982cba35d2eea7f09b33c7928cedb7c960b1bc5..11aff0d012419391e95809ce63755aceacc39aaa 100644
--- a/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerImageFilter.h
@@ -70,6 +70,8 @@ namespace Functor {
  * \sa MuellerToCircularPolarisationImageFilter
  * \sa MuellerToReciprocalCovarianceFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template< class TInput, class TOutput>
 class MuellerToPolarisationDegreeAndPowerFunctor
@@ -199,6 +201,8 @@ private:
  * \ingroup SARPolarimetry
  * \sa MuellerToPolarisationDegreeAndPowerFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT MuellerToPolarisationDegreeAndPowerImageFilter :
diff --git a/Modules/Filtering/Polarimetry/include/otbMuellerToReciprocalCovarianceImageFilter.h b/Modules/Filtering/Polarimetry/include/otbMuellerToReciprocalCovarianceImageFilter.h
index e9dade6a2267956f3ca83ea6bcd4f866e44e3102..26ac0e5470207740a37447551324c499a33afb2a 100644
--- a/Modules/Filtering/Polarimetry/include/otbMuellerToReciprocalCovarianceImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbMuellerToReciprocalCovarianceImageFilter.h
@@ -57,6 +57,8 @@ namespace Functor {
  * \sa MuellerToCircularPolarisationImageFilter
  * \sa MuellerToPolarisationDegreeAndPowerImageFilter
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 
 template< class TInput, class TOutput>
@@ -132,6 +134,8 @@ public:
  * \ingroup SARPolarimetry
  * \sa MuellerToReciprocalCovarianceFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT MuellerToReciprocalCovarianceImageFilter :
diff --git a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
index afe0ad0080beff8cd60b7c1fbd1ae2b421a4bb13..900da39d185e58f9b1920102c66073ec31cc5c17 100644
--- a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
@@ -36,6 +36,8 @@ namespace otb
  * \sa PolarimetricSynthesisFilter
  * \sa PolarimetricSynthesisFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 
 template <class TInputImage, class TOutputImage,
diff --git a/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h b/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
index 84b2d6294dde0e21a282794f6dc99cd68cdfde12..f6c401b75ec2cde06e6d161f38cb63f5d5ffcc39 100644
--- a/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
+++ b/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
@@ -44,6 +44,8 @@ typedef enum
 *  HH_HV_VH_VV (0), HH_HV_VV (1), HH_VH_VV (2), HH_HV(3), VH_VV (4), HH_VV (5).
 *
 * \ingroup SARPolarimetry
+ *
+ * \ingroup OTBPolarimetry
 */
 
 class ITK_EXPORT PolarimetricData : public itk::DataObject
diff --git a/Modules/Filtering/Polarimetry/include/otbPolarimetricSynthesisFunctor.h b/Modules/Filtering/Polarimetry/include/otbPolarimetricSynthesisFunctor.h
index 2b5c20925dbf3ada5a1d86f25ef3902b168a5717..0877fbb161e2966d2d51e1565a7f288bb348d34b 100644
--- a/Modules/Filtering/Polarimetry/include/otbPolarimetricSynthesisFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbPolarimetricSynthesisFunctor.h
@@ -35,6 +35,8 @@ namespace Functor
  *  \ingroup Functor
  *  \ingroup SARPolarimetry
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInput1, class TInput2, class TInput3, class TInput4, class TOutput>
 class PolarimetricSynthesisFunctor
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalCoherencyToReciprocalMuellerImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalCoherencyToReciprocalMuellerImageFilter.h
index 13bc49e53e8da76d0fb7680bd9ffe336da9e6742..1081c263d908c91f7411bbadcc837b028aa0275d 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalCoherencyToReciprocalMuellerImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalCoherencyToReciprocalMuellerImageFilter.h
@@ -54,6 +54,8 @@ namespace Functor {
  *
  * \ingroup SARPolarimetry
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template< class TInput, class TOutput>
 class ReciprocalCoherencyToReciprocalMuellerFunctor
@@ -111,6 +113,8 @@ private:
  * \ingroup SARPolarimetry
  * \sa ReciprocalCoherencyToReciprocalMuellerFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ReciprocalCoherencyToReciprocalMuellerImageFilter :
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToCoherencyDegreeImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToCoherencyDegreeImageFilter.h
index 1e0336f6b10a3ae9d76adf3a91bcbe38aaabb059..2ffb1b9a225273a1bf89aed98b38130345773247 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToCoherencyDegreeImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToCoherencyDegreeImageFilter.h
@@ -41,6 +41,8 @@ namespace Functor {
  * \sa MLCToCircularCoherencyDegreeImageFilter
  * \sa ReciprocalCovarianceToCoherencyImageFilter
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 
 template< class TInput, class TOutput>
@@ -116,6 +118,8 @@ private:
  * \ingroup SARPolarimetry
  * \sa ReciprocalCovarianceToCoherencyDegreeFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ReciprocalCovarianceToCoherencyDegreeImageFilter :
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h
index 0e65277a0f41dd5de8a1c1befcea9258f3a7047b..3ad4b0b79e093552605135c1ac7be75493ead173 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h
@@ -46,6 +46,8 @@ namespace Functor {
  * \sa CovarianceToCircularCoherencyDegreeImageFilter
  * \sa ReciprocalCovarianceToReciprocalCoherencyDegreeImageFilter
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template< class TInput, class TOutput>
 class ReciprocalCovarianceToReciprocalCoherencyFunctor
@@ -113,6 +115,8 @@ private:
  *
  * \ingroup SARPolarimetry
  * \sa ReciprocalCovarianceToReciprocalCoherencyFunctor
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ReciprocalCovarianceToReciprocalCoherencyImageFilter :
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFilter.h
index f673f550435a3cab028da4191fb06a28e0fa980c..f1747c595c0ad69b2f819cec9376e9b79634e1e3 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFilter.h
@@ -52,6 +52,8 @@ namespace Functor {
  *
  * \ingroup SARPolarimetry
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template< class TInput, class TOutput>
 class ReciprocalHAlphaFunctor
@@ -210,6 +212,8 @@ private:
  *
  * \ingroup SARPOlarimetry
  * \sa ReciprocalHAlphaFunctor
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ReciprocalHAlphaImageFilter :
diff --git a/Modules/Filtering/Polarimetry/include/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h
index f62f9cd8c86b5a327f8fdba0d53aab40fb31e713..227b46a90d9f99523c1e70ece1d0784f24ad4b7b 100644
--- a/Modules/Filtering/Polarimetry/include/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h
@@ -58,6 +58,8 @@ namespace Functor {
  * \sa CovarianceToCoherencyDegreeImageFilter
  * \sa CovarianceToCoherencyImageFilter
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template< class TInput, class TOutput>
 class ReciprocalLinearCovarianceToReciprocalCircularCovarianceFunctor
@@ -125,6 +127,8 @@ private:
  *
  * \ingroup SARPolarimetry
  * \sa ReciprocalLinearCovarianceToReciprocalCircularCovarianceFunctor
+ *
+ * \ingroup OTBPolarimetry
  */
  template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter :
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
index e9bbb07770a7f3f25028c31d1e7535e1a219ab33..1df4e8c8a268fdad4cea5e0015f87b45ea2369f2 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
@@ -50,6 +50,8 @@ namespace otb
  *  \sa SinclairToCovarianceMatrixFunctor
  *  \sa SinclairToMuelleMatrixrFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 
 template <class TInputImageHH, class TInputImageHV,
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
index f08f5a718d69d6dda498254890df748e4f401add..55bb5c9ecdc47dd70179488ccea6871a66c66382 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
@@ -48,6 +48,8 @@ namespace otb
  *  \sa SinclairToReciprocalCoherencyMatrixFunctor
  *  \sa SinclairToReciprocalCovarianceMatrixFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 
 
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToCircularCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToCircularCovarianceMatrixFunctor.h
index f2dadb8f30650e884654fc00a5b7bbdb5266bd8d..c3d4f81404863d17f6b9bcd8ae54354d2b35d4eb 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToCircularCovarianceMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToCircularCovarianceMatrixFunctor.h
@@ -63,6 +63,8 @@ namespace Functor
  *  \sa SinclairToReciprocalCoherencyMatrixFunctor
  *  \sa SinclairToReciprocalCovarianceMatrixFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInput1, class TInput2, class TInput3,
           class TInput4, class TOutput>
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToCoherencyMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToCoherencyMatrixFunctor.h
index f1a35884e7ad5e18f2acdf1e8f4afb4ea02d6f39..43b3320ce7a3bde391ae89d3b63fde566323588d 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToCoherencyMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToCoherencyMatrixFunctor.h
@@ -54,6 +54,8 @@ namespace Functor
  *  \sa SinclairToReciprocalCoherencyMatrixFunctor
  *  \sa SinclairToReciprocalCovarianceFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInput1, class TInput2, class TInput3,
           class TInput4, class TOutput>
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToCovarianceMatrixFunctor.h
index 4f4c16e1df4baf0b2e6f8ea199616fa83093c8b4..390487cf7c17393c35e22745380b114fad65be23 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToCovarianceMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToCovarianceMatrixFunctor.h
@@ -54,6 +54,8 @@ namespace Functor
  *  \sa SinclairToReciprocalCoherencyFunctor
  *  \sa SinclairToReciprocalCovarianceMatrixFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInput1, class TInput2, class TInput3,
           class TInput4, class TOutput>
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToMuellerMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToMuellerMatrixFunctor.h
index 91f25f239062fcef0a538dba8658ebaa5edb037d..5d31c330b76a66d0ddd7d8230cb00a06aae11bae 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToMuellerMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToMuellerMatrixFunctor.h
@@ -73,6 +73,8 @@ namespace Functor
  *  \sa SinclairToReciprocalCoherencyMatrixFunctor
  *  \sa SinclairToReciprocalCovarianceMatrixFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInput1, class TInput2, class TInput3,
           class TInput4, class TOutput>
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h
index 61a858b5faece22690a4dd5a316d4c67d86eb393..53c62b6339bd7760c3f6ec3cdedfc0ec28c548ec 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h
@@ -53,6 +53,8 @@ namespace Functor
  *  \sa SinclairToReciprocalCoherencyMatrixFunctor
  *  \sa SinclairToReciprocalCovarianceMatrixFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInput1, class TInput2, class TInput3, class TOutput>
 class SinclairToReciprocalCircularCovarianceMatrixFunctor
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h
index eb242de77d2f4c7a5b4f9dab4f3877c4cdd13908..e1d6743c6f9a4f5e960f1897c457f371f50a305e 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h
@@ -53,6 +53,8 @@ namespace Functor
  *  \sa SinclairToReciprocalCircularCovarianceMatrixFunctor
  *  \sa SinclairToReciprocalCovarianceMatrixFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInput1, class TInput2, class TInput3, class TOutput>
 class SinclairToReciprocalCoherencyMatrixFunctor
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h
index e65d3483aaf44b36876425cc15b407f2e9c5b07c..98c7bba8edc51233f4a44b05522198f19515ff10 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h
@@ -52,6 +52,8 @@ namespace Functor
  *  \sa SinclairToReciprocalCircularCovarianceMatrixFunctor
  *  \sa SinclairToReciprocalCoherencyeMatrixFunctor
  *
+ *
+ * \ingroup OTBPolarimetry
  */
 template <class TInput1, class TInput2, class TInput3, class TOutput>
 class SinclairToReciprocalCovarianceMatrixFunctor
diff --git a/Modules/Filtering/Projection/include/otbEckert4MapProjection.h b/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
index 90ae35058a834424f91da6536e708e3c3fd767c8..517200ccf9e67b733cfb7afe06a9933406ea38bb 100644
--- a/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
+++ b/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
@@ -26,6 +26,8 @@ namespace otb
  *  \brief This class implements the Eckert4 map projection.
  *
  * It converts coordinates in longitude, latitude (WGS84) to Eckert4 map coordinates.
+ *
+ * \ingroup OTBProjection
  */
 template <TransformDirection::TransformationDirection TTransform>
 class ITK_EXPORT Eckert4MapProjection : public GenericMapProjection<TTransform>
diff --git a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
index 9d3deb6532f827f1ccf9274559b42d9def51c94d..0cb9483181bd3ae400863dc570371addc8b89c52 100644
--- a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
@@ -68,6 +68,8 @@ namespace otb {
  *
  * The output image can be given to the OrthorectificationFilter.
  *
+ *
+ * \ingroup OTBProjection
  */
 template <class TImage>
 class ITK_EXPORT GCPsToRPCSensorModelImageFilter :
diff --git a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
index c0a44cf9e46b2dff1e33d2838816da59fefa7852..2b5c5a7f4d7c5c2af5f873172a490d6ca4c1db68 100644
--- a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
@@ -44,6 +44,8 @@ namespace otb
  *
  * \ingroup Projection
  *
+ *
+ * \ingroup OTBProjection
  **/
 
 template <class TInputImage, class TOutputImage>
diff --git a/Modules/Filtering/Projection/include/otbGeographicalDistance.h b/Modules/Filtering/Projection/include/otbGeographicalDistance.h
index fc9c68aff80562af3a7bff88356b1c52c1d05caa..22aa459ee81bed3e6dd95c5ea347e11fd53ab7ff 100644
--- a/Modules/Filtering/Projection/include/otbGeographicalDistance.h
+++ b/Modules/Filtering/Projection/include/otbGeographicalDistance.h
@@ -42,6 +42,8 @@ namespace otb
  * meters. Mean radius (6371 km) is used as a default value, but one
  * might use local values from spheroid or geoid for better precision.
  *
+ *
+ * \ingroup OTBProjection
  */
 template <class TVector>
 class ITK_EXPORT GeographicalDistance :
diff --git a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
index 60f65ea7b7a70bf80255c34177e6169ae1c83df0..b5da04780933378402761eee4010dce4a1ce18c5 100644
--- a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
@@ -148,6 +148,8 @@ private:
  *
  * \note This filter does not support \em in-place transformation as the spatial
  * references of the new layer are expected to change.
+ *
+ * \ingroup OTBProjection
  */
 class ITK_EXPORT GeometriesProjectionFilter : public GeometriesToGeometriesFilter
 {
diff --git a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
index dba86c80fee26b810534552815d09aa2467105a7..bc85e4bb917f1c5dd2d1c625dff11e3d0bfd2638 100644
--- a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
+++ b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
@@ -38,6 +38,8 @@ namespace otb
  * giving an 'as-the-crow-flies' distance between the points (ignoring any hills!).
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBProjection
  */
 template <class TInputImage, class TCoordRep = float>
 class ITK_EXPORT GroundSpacingImageFunction :
diff --git a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
index db8b5533537b2ece1d163630045d424babc85cc3..bc3e7649dbfb22a345a1a22733e8d39412f227f0 100644
--- a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
+++ b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
@@ -38,6 +38,8 @@ namespace otb
   * \ingroup VectorDataFilter
   * \ingroup Projection
   *
+ *
+ * \ingroup OTBProjection
   */
 template <class TInputImage, class TOutputVectorData>
 class ITK_EXPORT ImageToEnvelopeVectorDataFilter :
diff --git a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
index 3af4cde46ba4d683112fa7310432959442160dfc..85b27ade413aa2da6fee1e60ea8781e4e39170f7 100644
--- a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
@@ -35,6 +35,8 @@ namespace otb
  *
  * \sa InPlaceImageFilter
  * \sa ImageBase
+ *
+ * \ingroup OTBProjection
  */
 template <class TImage, class TSourceImage>
 class ITK_EXPORT ImportGeoInformationImageFilter
diff --git a/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h b/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h
index 9a1df1fb8c18a20585435b2672e3b7ec25e22ce4..27a1739567ab5feaa600af9380a25b9d997b3bd2 100644
--- a/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h
+++ b/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h
@@ -26,6 +26,8 @@ namespace otb
 * \brief This class implements the Lambert 2 Etendu map projection.
 * It converts coordinates in longitude, latitude (WGS84) to Lambert 2 Etendu map coordinates.
 *
+ *
+ * \ingroup OTBProjection
  */
 template <TransformDirection::TransformationDirection TTransform>
 class ITK_EXPORT Lambert2EtenduProjection : public LambertConformalConicMapProjection<TTransform>
diff --git a/Modules/Filtering/Projection/include/otbLambert3CartoSudProjection.h b/Modules/Filtering/Projection/include/otbLambert3CartoSudProjection.h
index ada8a8a52915b8521e3c4e48a0e1d5f80a338946..5fc17804dc20050c228b450558d2dcd9569095bb 100644
--- a/Modules/Filtering/Projection/include/otbLambert3CartoSudProjection.h
+++ b/Modules/Filtering/Projection/include/otbLambert3CartoSudProjection.h
@@ -26,6 +26,8 @@ namespace otb
 * \brief This class implements the Lambert3CartoSud map projection (RGF93 french geodesic system).
 * It converts coordinates in longitude, latitude (WGS84) to Lambert 3 map coordinates.
 *
+ *
+ * \ingroup OTBProjection
  */
 template <TransformDirection::TransformationDirection TTransform>
 class ITK_EXPORT Lambert3CartoSudProjection : public LambertConformalConicMapProjection<TTransform>
diff --git a/Modules/Filtering/Projection/include/otbLambert93Projection.h b/Modules/Filtering/Projection/include/otbLambert93Projection.h
index 258da098e86f385e649d6f599a475ce72c569ff9..ba70c784263f0d9daa031647eb918ecf235e01c2 100644
--- a/Modules/Filtering/Projection/include/otbLambert93Projection.h
+++ b/Modules/Filtering/Projection/include/otbLambert93Projection.h
@@ -26,6 +26,8 @@ namespace otb
 * \brief This class implements the Lambert93 map projection (RGF93 french geodesic system).
 * It converts coordinates in longitude, latitude (WGS84) to Lambert 93 map coordinates.
 *
+ *
+ * \ingroup OTBProjection
  */
 template <TransformDirection::TransformationDirection TTransform>
 class ITK_EXPORT Lambert93Projection : public LambertConformalConicMapProjection<TTransform>
diff --git a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
index b9f39eefd92d8bb89589407c0410132a554603a3..3c1883b96f00f5af43fbcc618380f0540054b096 100644
--- a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
@@ -26,6 +26,8 @@ namespace otb
  * \brief This class implements the Lambert Conformal Conic map projection.
  * It converts coordinates in longitude, latitude (WGS84) to Lambert Conformal Conic map coordinates.
  *
+ *
+ * \ingroup OTBProjection
  */
 template <TransformDirection::TransformationDirection TTransform>
 class ITK_EXPORT LambertConformalConicMapProjection : public GenericMapProjection<TTransform>
diff --git a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
index 25a1ad01e6d424be4b15622e90bbca7560e1b43e..d512a1ec016b31333cef1ebe45585c2264a9e882 100644
--- a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
+++ b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
@@ -58,6 +58,8 @@ namespace otb {
  * NOTE: All computation are performed in double. Results are casted
  * back to TPoint::CoordRepType.
  *
+ *
+ * \ingroup OTBProjection
  */
 template <class TPoint>
 class ITK_EXPORT LeastSquareAffineTransformEstimator :
diff --git a/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.h b/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.h
index 7dd1b0af1aa694186bc0410fd69b7ce29512703f..07a44f6b401bfbdebf868d3608008b44bd217ac2 100644
--- a/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.h
+++ b/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.h
@@ -60,6 +60,8 @@ enum MapProj
  *  GenericMapProjection should be used instead.
  *
  *
+ *
+ * \ingroup OTBProjection
  */
 template <MapProjectionType::MapProj TMapProj,
           TransformDirection::TransformationDirection TTransform>
diff --git a/Modules/Filtering/Projection/include/otbMollweidMapProjection.h b/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
index 5dde1e0a0b1c5f135d30163c1cb5b9311c6bccd7..4b2eef2a09ef57561a3c7a09d345268436e24c0c 100644
--- a/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
@@ -25,6 +25,8 @@ namespace otb
 /** \class MollweidMapProjection
  *  \brief This class implements the Mollweid map projection.
  *  It converts coordinates in longitude, latitude (WGS84) to Mollweid map coordinates.
+ *
+ * \ingroup OTBProjection
  */
 template <TransformDirection::TransformationDirection TTransform>
 class ITK_EXPORT MollweidMapProjection : public GenericMapProjection<TTransform>
diff --git a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
index 61adee35e4a1240844be26fafc40f98c1e1110cc..e64b0df1725b83b48d5d559aa3356d775a529ac6 100644
--- a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
+++ b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
@@ -42,6 +42,8 @@ namespace otb
  *
  * \example Projections/OrthoRectificationExample.cxx
  *
+ *
+ * \ingroup OTBProjection
  */
 
 template <class TInputImage, class TOutputImage, class TMapProjection, class TInterpolatorPrecision = double>
diff --git a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
index 2314dfc481e04efa4831856d6015d078e6ea7afb..8c3abe5afebf2b3c797bf3421bc0e23bb9dbfd7d 100644
--- a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
@@ -51,6 +51,8 @@ namespace otb {
  * behavior.
  *
  * \ingroup Projections
+ *
+ * \ingroup OTBProjection
  */
 template <class TImage>
 class ITK_EXPORT PhysicalToRPCSensorModelImageFilter :
diff --git a/Modules/Filtering/Projection/include/otbPleiadesPToXSAffineTransformCalculator.h b/Modules/Filtering/Projection/include/otbPleiadesPToXSAffineTransformCalculator.h
index 4affd6fe55d9a877c1bf635f16783e1879d934ca..4b9841f7ba36fa49a36a4b39ff721ec952798b9b 100644
--- a/Modules/Filtering/Projection/include/otbPleiadesPToXSAffineTransformCalculator.h
+++ b/Modules/Filtering/Projection/include/otbPleiadesPToXSAffineTransformCalculator.h
@@ -43,6 +43,8 @@ namespace otb {
  * the inverse transform is needed, one can call the GetInverse()
  * method of the transform to retrieve it.
  *
+ *
+ * \ingroup OTBProjection
  */
 class ITK_EXPORT PleiadesPToXSAffineTransformCalculator
   : public itk::LightObject
diff --git a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
index abb54f0959899ec6d9ceba0fa9e5ddd837c04412..d022c8adedeecfb93ffb9f28a3d94aa66b32d31d 100644
--- a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
@@ -30,6 +30,8 @@ namespace Functor {
  *
  * \brief TODO
  *
+ *
+ * \ingroup OTBProjection
  */
 template<class TInput, class TOutput, class TPrecision>
 class ProjectiveProjectionFunctor
@@ -97,6 +99,8 @@ private:
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBProjection
  */
 template <class TInputImage, class TOutputImage, class TPrecision>
 class ITK_EXPORT ProjectiveProjectionImageFilter :
diff --git a/Modules/Filtering/Projection/include/otbROIdataConversion.h b/Modules/Filtering/Projection/include/otbROIdataConversion.h
index 146743836550bbd2f9d623163d74fb1e0e924a06..247f61cad56187e7c870c1ec009ca19abc0bcae0 100644
--- a/Modules/Filtering/Projection/include/otbROIdataConversion.h
+++ b/Modules/Filtering/Projection/include/otbROIdataConversion.h
@@ -33,6 +33,8 @@ namespace otb
  *
  * A class that extract pixel value from an input image according to a ROI
  * image and outputs it on a vector of PixelType.
+ *
+ * \ingroup OTBProjection
  */
 template <class TInputImage, class TInputROIImage>
 class ROIdataConversion
diff --git a/Modules/Filtering/Projection/include/otbRationalTransform.h b/Modules/Filtering/Projection/include/otbRationalTransform.h
index f8097875d0a52d14cfabc2eaccc5d1c0e7da8393..5adfb206ab26e55218e9e1d1b7f22c87291d701f 100644
--- a/Modules/Filtering/Projection/include/otbRationalTransform.h
+++ b/Modules/Filtering/Projection/include/otbRationalTransform.h
@@ -40,6 +40,8 @@ namespace otb
  *  ... dim0denomM ... dim1num0 ... dimDdenomM.
  *
  * \ingroup Transform
+ *
+ * \ingroup OTBProjection
  **/
 
 template <class TScalarType = double,
diff --git a/Modules/Filtering/Projection/include/otbSVY21MapProjection.h b/Modules/Filtering/Projection/include/otbSVY21MapProjection.h
index f9f4082090a07f08694a76d04952e99915119a44..1d6ca66b0e46e987345fc2a1553319c39576afa6 100644
--- a/Modules/Filtering/Projection/include/otbSVY21MapProjection.h
+++ b/Modules/Filtering/Projection/include/otbSVY21MapProjection.h
@@ -26,6 +26,8 @@ namespace otb
 * \brief This class implements the SVY21 map projection (Singapore geodesic system).
 * It converts coordinates in longitude, latitude (WGS84) to SVY21 map coordinates.
 *
+ *
+ * \ingroup OTBProjection
  */
 template <TransformDirection::TransformationDirection TTransform>
 class ITK_EXPORT SVY21MapProjection : public TransMercatorMapProjection<TTransform>
diff --git a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
index ed5744ba7aa06f02ddb2a084ac069ed93f42a6af..f7a4e50b9899f6bcd56146f15ca0d673093d9786 100644
--- a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
@@ -26,6 +26,8 @@ namespace otb
 /** \class SinusoidalMapProjection
  *  \brief This class implements the Sinusoidal map projection.
  *  It converts coordinates in longitude, latitude (WGS84) to Sinusoidal map coordinates.
+ *
+ * \ingroup OTBProjection
  */
 template <TransformDirection::TransformationDirection TTransform>
 class ITK_EXPORT SinusoidalMapProjection : public GenericMapProjection<TTransform>
diff --git a/Modules/Filtering/Projection/include/otbTileMapTransform.h b/Modules/Filtering/Projection/include/otbTileMapTransform.h
index 027e9ed47e264b1bc15824367f49b34b87415757..0489909517676baf0f2ed358f1e67cc6f5c199a7 100644
--- a/Modules/Filtering/Projection/include/otbTileMapTransform.h
+++ b/Modules/Filtering/Projection/include/otbTileMapTransform.h
@@ -27,6 +27,8 @@ namespace otb
 
 /** \class TileMapTransform
  *  \brief to do
+ *
+ * \ingroup OTBProjection
  **/
 
 template <TransformDirection::TransformationDirection TTransformDirection,
diff --git a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
index 1b0bdd339f9366aec5afe3047850748263b89166..7da549cefc6bc50e28e96182c7a75493ca9863c4 100644
--- a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
@@ -26,6 +26,8 @@ namespace otb
  *  \brief This class implements the TransMercator map projection.
  * It converts coordinates in longitude, latitude (WGS84) to TransMercator map coordinates.
  *
+ *
+ * \ingroup OTBProjection
  */
 template <TransformDirection::TransformationDirection TTransform>
 class ITK_EXPORT TransMercatorMapProjection : public GenericMapProjection<TTransform>
diff --git a/Modules/Filtering/Projection/include/otbUtmMapProjection.h b/Modules/Filtering/Projection/include/otbUtmMapProjection.h
index 020f70c16043b2b58cd78dd3bd79b06e2ef0a496..471bee55671017498f16ba4a0cfeae5aa6f687b1 100644
--- a/Modules/Filtering/Projection/include/otbUtmMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbUtmMapProjection.h
@@ -27,6 +27,8 @@ namespace otb
  *
  * It converts coordinates in longitude, latitude (WGS84) to UTM map coordinates.
  *
+ *
+ * \ingroup OTBProjection
  */
 template <TransformDirection::TransformationDirection TTransform>
 class ITK_EXPORT UtmMapProjection : public GenericMapProjection<TTransform>
diff --git a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
index ab8cbe7c705666d31d08825bac0abb5103940187..a555e1a289a9bc3f0edd27c6adf7f6da3de55303 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
@@ -35,6 +35,8 @@ namespace otb
   * \ingroup Projection
   *
   *
+ *
+ * \ingroup OTBProjection
   */
 
 template <class TInputVectorData, class TInputImage>
diff --git a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
index 2af4096ded3c8122aea1a035c342e8547f223a8b..0fe63b0ef0599b166f34b5e7786e154830c70c6c 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
@@ -56,6 +56,8 @@ namespace otb
   *
   * \example Projections/VectorDataProjectionExample.cxx
   *
+ *
+ * \ingroup OTBProjection
   */
 
 template <class TInputVectorData, class TOutputVectorData>
diff --git a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
index 52322fe3a05b137119fca40680fd9193036d7124..2060c4d16beafbac55111212ac0258e737339f76 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
@@ -34,6 +34,8 @@ namespace otb
   *
   * \ingroup VectorDataFilter
   * \ingroup Projection
+ *
+ * \ingroup OTBProjection
   */
 
 template <class TInputVectorData, class TOutputVectorData>
diff --git a/Modules/Filtering/Smoothing/include/otbEnvelopeSavitzkyGolayInterpolationFunctor.h b/Modules/Filtering/Smoothing/include/otbEnvelopeSavitzkyGolayInterpolationFunctor.h
index 1150f37bd46b46598ccca9d5ad9f775b87ca00ac..50807c5e2002e14ddecfda4309e253005408e188 100644
--- a/Modules/Filtering/Smoothing/include/otbEnvelopeSavitzkyGolayInterpolationFunctor.h
+++ b/Modules/Filtering/Smoothing/include/otbEnvelopeSavitzkyGolayInterpolationFunctor.h
@@ -31,6 +31,8 @@ namespace Functor
  *  fitting the upper or lower envelope of the series being interpolated.
  *
  * \sa otbSavitzkyGolayInterpolationFunctor
+ *
+ * \ingroup OTBSmoothing
  */
 template <unsigned int Radius, class TSeries, class TDates, class TWeight = TSeries>
 class EnvelopeSavitzkyGolayInterpolationFunctor
diff --git a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
index 410ce9b659251e4f942d41ce817c06b0c792ff2e..763d261f979315b56e2a744988af695e8ef194c3 100644
--- a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
+++ b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
@@ -47,6 +47,8 @@ template<typename T> inline T simple_pow(T const& v, unsigned int p)
  * Functor returning the joint spatial-range representation of a pixel, i.e. the
  * concatenation of range components and coordinates as a vector. Components are
  * scaled by their respective spatial and range bandwidth.
+ *
+ * \ingroup OTBSmoothing
  */
 template<class TInputImage, class TOutputJointImage>
 class SpatialRangeJointDomainTransform
@@ -137,6 +139,8 @@ public:
  *
  * Iterator for reading pixels over an image region, specialized for faster
  * access to pixels in vector images through the method GetPixelPointer
+ *
+ * \ingroup OTBSmoothing
  */
 template<typename TImage>
 class FastImageRegionConstIterator: public itk::ImageRegionConstIterator<TImage>
@@ -184,6 +188,8 @@ private:
  *
  * The (spatially and spectrally) neighboring buckets of pixels can then be
  * obtained by using GetNeighborhoodBucketListIndices().
+ *
+ * \ingroup OTBSmoothing
  */
 template<class TImage>
 class BucketImage
@@ -442,6 +448,8 @@ private:
  *
  * \ingroup ImageSegmentation
  * \ingroup ImageEnhancement
+ *
+ * \ingroup OTBSmoothing
  */
 template<class TInputImage, class TOutputImage, class TKernel = Meanshift::KernelUniform,
     class TOutputIterationImage = otb::Image<unsigned int, TInputImage::ImageDimension> >
diff --git a/Modules/Filtering/Smoothing/include/otbSavitzkyGolayInterpolationFunctor.h b/Modules/Filtering/Smoothing/include/otbSavitzkyGolayInterpolationFunctor.h
index 6b3b86f3c7a8239b21c7282edce254b897dfd1c3..fe472ce73d36d6ea33b754fa77dbbf2529595072 100644
--- a/Modules/Filtering/Smoothing/include/otbSavitzkyGolayInterpolationFunctor.h
+++ b/Modules/Filtering/Smoothing/include/otbSavitzkyGolayInterpolationFunctor.h
@@ -47,6 +47,8 @@ namespace Functor
  *
  * \sa otbTimeSeriesLeastSquareFittingFunctor
  *
+ *
+ * \ingroup OTBSmoothing
  */
 template <unsigned int Radius, class TSeries, class TDates, class TWeight = TSeries, unsigned int Degree=2>
 class SavitzkyGolayInterpolationFunctor
diff --git a/Modules/Filtering/Smoothing/include/otbTimeSeriesLeastSquareFittingFunctor.h b/Modules/Filtering/Smoothing/include/otbTimeSeriesLeastSquareFittingFunctor.h
index b9f06de84033b79d40827a33699c45575a5a8912..85814359a4308bcdfc91979268b843cfaf3b543c 100644
--- a/Modules/Filtering/Smoothing/include/otbTimeSeriesLeastSquareFittingFunctor.h
+++ b/Modules/Filtering/Smoothing/include/otbTimeSeriesLeastSquareFittingFunctor.h
@@ -49,6 +49,8 @@ namespace Functor
   *  \f$ A_{ij} = \frac{\Phi_{ij}}{\sigma_i} \f$
   *
   *
+ *
+ * \ingroup OTBSmoothing
   */
 template <class TSeriesType, class TTimeFunction, class TDateType = TSeriesType, class TWeightType = TSeriesType>
 class TimeSeriesLeastSquareFittingFunctor
diff --git a/Modules/Filtering/Statistics/include/otbBandsStatisticsAttributesLabelMapFilter.h b/Modules/Filtering/Statistics/include/otbBandsStatisticsAttributesLabelMapFilter.h
index 19bd205a2146d3b94dafd15420f3b64e179acae4..5c404ab8641adbce68d814c8f426171fcfe3d2df 100644
--- a/Modules/Filtering/Statistics/include/otbBandsStatisticsAttributesLabelMapFilter.h
+++ b/Modules/Filtering/Statistics/include/otbBandsStatisticsAttributesLabelMapFilter.h
@@ -41,6 +41,8 @@ namespace Functor
 *
 *   \sa BandsStatisticsAttributesLabelMapFilter
 *   \sa StatisticsAttributesLabelObjectFunctor
+ *
+ * \ingroup OTBStatistics
 */
 template <class TLabelObject, class TFeatureImage>
 class BandStatsAttributesLabelObjectFunctor
@@ -127,6 +129,8 @@ private:
  * \sa MultiStatsAttributesLabelObjectFunctor AttributesMapLabelObject
  *
  * \ingroup ImageEnhancement MathematicalMorphologyImageFilters
+ *
+ * \ingroup OTBStatistics
  */
 template<class TImage, class TFeatureImage>
 class ITK_EXPORT BandsStatisticsAttributesLabelMapFilter
diff --git a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
index 01b1603336da16d41f2d8b6748c885546b6f1ce7..16185678308735b7619728a31a9c2b2801663a24 100644
--- a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
@@ -30,6 +30,8 @@ namespace Statistics {
  * this filter does not allow different input/output SampleList.
  *
  * \sa ListSampleToListSampleFilter
+ *
+ * \ingroup OTBStatistics
  */
 template < class TSampleList >
 class ITK_EXPORT ConcatenateSampleListFilter :
diff --git a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
index 3ddeab06590788707415df0fdbd8b47149522fe0..9286ff30d9a11c463f8997af94e3a0c100082326 100644
--- a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
+++ b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
@@ -54,6 +54,8 @@ namespace otb
    * Remark: image is assumed to be 2 dimensionnal
    *
    *
+ *
+ * \ingroup OTBStatistics
  */
 
 template <class TInputImage>
diff --git a/Modules/Filtering/Statistics/include/otbDEMCaracteristicsExtractor.h b/Modules/Filtering/Statistics/include/otbDEMCaracteristicsExtractor.h
index 6b3cf804abe7546511ce8431cf195e84af364b64..ada874f48577c445ec86193b6fda2ee90c68dcdb 100644
--- a/Modules/Filtering/Statistics/include/otbDEMCaracteristicsExtractor.h
+++ b/Modules/Filtering/Statistics/include/otbDEMCaracteristicsExtractor.h
@@ -48,6 +48,8 @@ namespace otb
    * \ingroup DEMHanler
    * \ingroup DEMToImageGenerator
    * \ingroup Radiometry
+ *
+ * \ingroup OTBStatistics
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT DEMCaracteristicsExtractor :
diff --git a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
index 86120553ff2f06d2e3d8bf030cc6e0f3d546683e..0d6eaf34274fab9de46392fb9d6ffaf07dd14379 100644
--- a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
@@ -36,6 +36,8 @@ namespace Statistics {
  * method SetNumberOfIteration()
  *
  * \sa ListSampleToListSampleFilter
+ *
+ * \ingroup OTBStatistics
  */
 template < class TInputSampleList, class TOutputSampleList = TInputSampleList >
 class ITK_EXPORT GaussianAdditiveNoiseSampleListFilter :
diff --git a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
index 825bbfdf19158f08b4d7673b7414ca97516a3f58..5ba1e63b74bfe22be7a4343b52f62bd7c6e12ab9 100644
--- a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
+++ b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
@@ -33,6 +33,8 @@ namespace otb
  * or the GenerateData method.
  *
  * \ingroup Function
+ *
+ * \ingroup OTBStatistics
  */
 
 template<class TInputHistogram, class TOutput>
diff --git a/Modules/Filtering/Statistics/include/otbListSampleGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
index a7295241d0998d8ba652bab9df4346cb8d977304..95906d2d569ecd845135d60ad12c377114cafcc8 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
@@ -43,6 +43,8 @@ namespace otb
  *
  *  The input VectorData is supposed to be fully contained within the image extent
  *
+ *
+ * \ingroup OTBStatistics
  */
 template <class TImage, class TVectorData>
 class ITK_EXPORT ListSampleGenerator :
diff --git a/Modules/Filtering/Statistics/include/otbListSampleSource.h b/Modules/Filtering/Statistics/include/otbListSampleSource.h
index 295d77b73b9e286a2b7b6937bbca72968685f991..bfde7573148ebf699fb32ef2badee0e822b00848 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleSource.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleSource.h
@@ -33,6 +33,8 @@ namespace Statistics {
  *  itk::Statistics::ListSample is a DataObject
  *  the output sample list.
  *
+ *
+ * \ingroup OTBStatistics
  */
 template < class TInputSampleList, class TOutputSampleList = TInputSampleList >
 class ITK_EXPORT ListSampleSource :
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
index 8359dea142648eeb00f3c6b4ef0a0b89fc6870c7..1454aa14850d7d56c6e2f4b1287ecad9b036e727 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
@@ -36,6 +36,8 @@ namespace Statistics {
  * Mean and Variance are set via the methods SetMean() and SetVariance().
  *
  * \sa ListSampleToListSampleFilter, GaussianAdditiveNoiseSampleListFilter
+ *
+ * \ingroup OTBStatistics
  */
 template < class TInputSampleList,
            class TLabelSampleList,
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
index e91d35d0c28af73c5e566c041e1236f80131672f..2dbf3588322dc4db13c08d4e4849278a6c317571 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
@@ -37,6 +37,8 @@ namespace otb {
  *  single joint-histogram. The output is a Histogram list (\sa
  *  ObjectList).
  * \sa ListSampleToVariableDimensionHistogram
+ *
+ * \ingroup OTBStatistics
  */
 template<class TListSample,
     class THistogramMeasurement,
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
index c22d8dc49237c59cf2218e00b27b0b737ec565d9..985be709d69a9533a9ae0f00e34d4cb296cd5c80 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
@@ -31,6 +31,8 @@ namespace Statistics {
  *  This filter provide pipeline support for itk::Statistics::ListSample via itk::DataObjectDecorator for
  *  both the input and the output sample list.
  *
+ *
+ * \ingroup OTBStatistics
  */
 template < class TInputSampleList, class TOutputSampleList = TInputSampleList >
 class ITK_EXPORT ListSampleToListSampleFilter :
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
index c2db6c0fb83df9fd80176a9096e8159fdc04e888..607c4b15a2a508afad7c1ce89ed88bf22b8e7021 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
@@ -41,6 +41,8 @@ namespace otb {
  * ListSampleToHistogramGenerator class documentation.
  *
  * \sa VariableDimensionHistogram, ListSample, ListSampleToHistogramGenerator
+ *
+ * \ingroup OTBStatistics
  */
 template<class TListSample,
     class THistogramMeasurement,
diff --git a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
index 27a3cfafcfee6e10cb4f82447b1ba3196e14ac18..b08f73682c06e004b331172d785627472952c19a 100644
--- a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
+++ b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
@@ -44,6 +44,8 @@ namespace otb
  * coordinate representation type (e.g. float or double).
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBStatistics
  */
 
 template <class TInputImage, class TCoordRep = double >
diff --git a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
index d847f7a73fde30628e5927589c54dd78713dbed5..9a2923f7e21575da3ef4483d0612ce53de768af1 100644
--- a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
@@ -123,6 +123,8 @@ protected:
  * the input and then applies the dedicated functor.
  *
  * \sa StreamingStatisticsVectorImageFilter
+ *
+ * \ingroup OTBStatistics
  */
 template < class TInputImage, class TOutputImage >
 class ITK_EXPORT NormalizeVectorImageFilter
diff --git a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
index 4f8c9291d7433cd3892347bf184ecb90daa9f61b..86449478a6012ee44ae83220e9e8c13fadd88b8e 100644
--- a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
@@ -36,6 +36,8 @@ namespace Statistics {
  * Shifts and scales can be set via the SetShift() and SetScales() methods.
  *
  * \sa ListSampleToListSampleFilter
+ *
+ * \ingroup OTBStatistics
  */
 template < class TInputSampleList, class TOutputSampleList = TInputSampleList >
 class ITK_EXPORT ShiftScaleSampleListFilter :
diff --git a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
index e1d1aedbf502e0c207b34a5e718d89c3332d43c5..fe92eb66f064ee49f66659475b67bca23726de81 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
@@ -43,6 +43,8 @@ namespace otb
  * \sa PersistentImageFilter
  * \ingroup Streamed
  * \ingroup Multithreaded
+ *
+ * \ingroup OTBStatistics
  */
 template<class TInputImage>
 class ITK_EXPORT PersistentCompareImageFilter :
@@ -190,6 +192,8 @@ private:
  * \sa StreamingImageVirtualWriter
  * \ingroup Streamed
  * \ingroup Multithreaded
+ *
+ * \ingroup OTBStatistics
  */
 
 template<class TInputImage>
diff --git a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
index b962a2f88a82457148d9fad880e0501f70aa25db..727d97e41ece4a6919a35e39817133781626b21b 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
@@ -47,6 +47,8 @@ namespace otb
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
  *
+ *
+ * \ingroup OTBStatistics
  */
 template<class TInputImage>
 class ITK_EXPORT PersistentHistogramVectorImageFilter :
@@ -216,6 +218,8 @@ private:
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBStatistics
  */
 
 template<class TInputImage>
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
index 46c2b7fc2414410412bdd46070985e5e7c9ae811..5c8826008e4548f756b7c7f0ca49fd50f01b6f4c 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
@@ -44,6 +44,8 @@ namespace otb
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBStatistics
  */
 template<class TInputImage>
 class ITK_EXPORT PersistentMinMaxImageFilter :
@@ -179,6 +181,8 @@ private:
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBStatistics
  */
 
 template<class TInputImage>
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
index 86ef331bca760c87ef33b158715e0c1351e3265e..37dab623aeb6f2b5b6c083b474aa037ed58a5a45 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
@@ -46,6 +46,8 @@ namespace otb
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
  *
+ *
+ * \ingroup OTBStatistics
  */
 template<class TInputImage>
 class ITK_EXPORT PersistentMinMaxVectorImageFilter :
@@ -186,6 +188,8 @@ private:
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBStatistics
  */
 
 template<class TInputImage>
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
index 7fbf91601daedb85b820e1a5a86805d928cb316c..d1540a62eff3e9ac38667b62ba688dcfa8cac959 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
@@ -44,6 +44,8 @@ namespace otb
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBStatistics
  */
 template<class TInputImage>
 class ITK_EXPORT PersistentStatisticsImageFilter :
@@ -217,6 +219,8 @@ private:
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBStatistics
  */
 
 template<class TInputImage>
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
index a5f4813484d42bf4ab1f7a91d0cff32cef939c8f..b29faf1f826e8231ba2f52bbdfe45c101d2c9c3d 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
@@ -47,6 +47,8 @@ namespace otb
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBStatistics
  */
 template<class TInputVectorImage, class TLabelImage>
 class ITK_EXPORT PersistentStreamingStatisticsMapFromLabelImageFilter :
@@ -182,6 +184,8 @@ private:
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBStatistics
  */
 
 template<class TInputVectorImage, class TLabelImage>
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
index de4082d2d190fabbd41915676808f9c21d31904f..739c19e553cfaa0bb680f9481c9bd646b7e56ec6 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
@@ -46,6 +46,8 @@ namespace otb
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
  *
+ *
+ * \ingroup OTBStatistics
  */
 template<class TInputImage, class TPrecision >
 class ITK_EXPORT PersistentStreamingStatisticsVectorImageFilter :
@@ -263,6 +265,8 @@ private:
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBStatistics
  */
 
 template<class TInputImage, class TPrecision = typename itk::NumericTraits<typename TInputImage::InternalPixelType>::RealType>
diff --git a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
index a4bb0280758e6b4cc695bc46a0e07dc8ddd9b6af..2aea72e42b9137ef9b9d846bb330982e36fdee4d 100644
--- a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
@@ -37,6 +37,8 @@ namespace otb
  * \sa NeighborhoodIterator
  *
  * \ingroup IntensityImageFilters
+ *
+ * \ingroup OTBStatistics
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT VarianceImageFilter :
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
index a2cf8101419d0e861e61261a9f44a0060e9bbd03..95f560aea3a3493c2e07fb14a1a1ea9bed445646 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
@@ -42,6 +42,8 @@ namespace otb
  * \ingroup IntensityImageFilters
  * \ingroup Threading
  * \ingroup Streamed
+ *
+ * \ingroup OTBStatistics
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT VectorImageToIntensityImageFilter
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
index ebfb30c2fd04131965a611d9c603bdf08310a3ee..07d90ba7008d4ca5517f5eb76db59c73054b6e9d 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
@@ -46,6 +46,8 @@ namespace otb
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
  *
+ *
+ * \ingroup OTBStatistics
  */
 template<class TInputImage>
 class ITK_EXPORT PersistentVectorImageToMatrixFilter :
@@ -136,6 +138,8 @@ private:
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup MathematicalStatisticsImageFilters
+ *
+ * \ingroup OTBStatistics
  */
 
 template<class TInputImage>
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
index fafb2f004c5a4a634e982bdc5dbe6133c7f3e1d6..4a900d93ca83a610fea688d523bb184ee00e6ee6 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
@@ -36,6 +36,8 @@ namespace otb
  * in a single vectordata.
  * Warning : this filter does not create a deep copy of each node.
  *
+ *
+ * \ingroup OTBVectorDataManipulation
  */
 template <class TVectorData>
 class ITK_EXPORT ConcatenateVectorDataFilter :
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbCorrectPolygonFunctor.h b/Modules/Filtering/VectorDataManipulation/include/otbCorrectPolygonFunctor.h
index b7f733987f2268d84ca4378b006af9dd8c9be192..027ef05668fc706896ca6b71ecd146d017fd5479 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbCorrectPolygonFunctor.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbCorrectPolygonFunctor.h
@@ -32,6 +32,8 @@ namespace otb
 * \sa UnaryFunctorObjectListFilter
 *
  *  \ingroup Functor
+ *
+ * \ingroup OTBVectorDataManipulation
  */
 template <class TPolygon>
 class CorrectPolygonFunctor
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
index 4025e842e5ccbab5e29d8b121cafe0e20021f7a4..f10cbb579ab543a2765a5bead613c36bbf3308bc 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
@@ -30,6 +30,8 @@ namespace otb
   *
   * \ingroup Functions
   * \sa DataNodeVectorDataFunction
+ *
+ * \ingroup OTBVectorDataManipulation
   */
 
 template <
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbGISTableToGISTableFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbGISTableToGISTableFilter.h
index 82bc07eecfa6306f3a1eacf6fe37e826124eab83..0c63765be760f8f14e28f64370d62cb368d65f3d 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbGISTableToGISTableFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbGISTableToGISTableFilter.h
@@ -33,6 +33,8 @@ namespace otb
    *
    *
    * \ingroup GISTableFilter
+ *
+ * \ingroup OTBVectorDataManipulation
  */
 template <class TInputGISTable, class TOutputGISTable>
 class ITK_EXPORT GISTableToGISTableFilter : public otb::GISTableSource<TOutputGISTable>
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbPolygonCompacityFunctor.h b/Modules/Filtering/VectorDataManipulation/include/otbPolygonCompacityFunctor.h
index ecf1f61b966c652fdda13d87cef9d8823ec4d0fb..e4d8c022c8308af5c180b9b6d15e123f0157d4ee 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbPolygonCompacityFunctor.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbPolygonCompacityFunctor.h
@@ -37,6 +37,8 @@ namespace otb
 * and \f$ L \f$ the perimeter (obtained by the method GetLength() ).
  *
  *  \ingroup Functor
+ *
+ * \ingroup OTBVectorDataManipulation
  */
 template <class TInput1>
 class PolygonCompacityFunctor
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
index b7bcfda232b0078a6e319bd900af2e0ca4874f7b..7e2939767e5c1be41adcf2dab02b898aa026ca66 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
@@ -49,6 +49,8 @@ namespace otb
   * \ingroup Functions
   * \sa DataNodeImageFunction
   * \sa NDVIDataNodeFeatureFunction
+ *
+ * \ingroup OTBVectorDataManipulation
   */
 
 template <
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbSimplifyPathFunctor.h b/Modules/Filtering/VectorDataManipulation/include/otbSimplifyPathFunctor.h
index 19afabecac09eaa79e77e54221811c23e27ea5b4..ad99254b884b03503dc162572594a8b38730906e 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbSimplifyPathFunctor.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbSimplifyPathFunctor.h
@@ -44,6 +44,8 @@ namespace otb
 * \sa UnaryFunctorObjectListFilter
 *
  *  \ingroup Functor
+ *
+ * \ingroup OTBVectorDataManipulation
  */
 template <class TInput, class TOutput>
 class SimplifyPathFunctor
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
index d6a35f9fc8268e6e8ff3708d241cc318bf8f6d58..e467edd33d1840fd8478029b63372b777084a779 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
@@ -43,6 +43,8 @@ namespace otb
   * \ingroup Functions
   * \sa DataNodeImageFunction
   * \sa NDVIDataNodeFeatureFunction
+ *
+ * \ingroup OTBVectorDataManipulation
   */
 
 template <
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
index 64135dd2a5e004dd383433790226285d6a74d94c..a9e508c914ffb82a44de8d33c6db9c5141d7cf35 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
@@ -26,6 +26,8 @@ namespace otb
 /** \class VectorDataAdapter
   * \brief Helper class to convert the vector data to generic type
   *
+ *
+ * \ingroup OTBVectorDataManipulation
   */
 
 template <class TInputVectorData, class TOutputVectorData>
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
index 862835581d2541cfb9cec4dcaf8b12ea47c7af2f..b24acd48ec8a645e04acced62d6f1ef4805f649d 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
@@ -45,6 +45,8 @@ namespace otb
  * \ingroup VectorDataFilter
  *
  * \example Projections/VectorDataExtractROIExample.cxx
+ *
+ * \ingroup OTBVectorDataManipulation
  */
 template <class TVectorData>
 class ITK_EXPORT VectorDataExtractROI :
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
index da06d2afe2272565b07ad95c649ad2cbbe5068c9..274e470780dbb1ee3a2a9055e9a0d0a8e3d22b31 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
@@ -38,6 +38,8 @@ namespace otb
  *  SetNumberOfOutputLine
  *
  *  \sa VectorDataSource
+ *
+ * \ingroup OTBVectorDataManipulation
  */
 template <class TVectorData>
 class ITK_EXPORT VectorDataToRandomLineGenerator :
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
index 8e333d8c0d73febe6bbe3e93dddc5e84178eeab2..cca26043958b34dfde3963a55c74e1bc3433e91d 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
@@ -35,6 +35,8 @@ namespace otb
   * \ingroup VectorDataFilter
   * \sa VectorDataToRoadDescriptionFilter
   * \sa VectorDataToBuildingDescriptionFilter
+ *
+ * \ingroup OTBVectorDataManipulation
  */
 
 template <class TVectorData>
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
index 55f8624235757faf8a7504cf7e9c2f6413704392..324ac52ee44346f47f403eaf709fdfd1e2458244 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
@@ -33,6 +33,8 @@ namespace otb
    *
    *
    * \ingroup VectorDataFilter
+ *
+ * \ingroup OTBVectorDataManipulation
  */
 template <class TInputVectorData, class TOutputVectorData>
 class ITK_EXPORT VectorDataToVectorDataFilter : public VectorDataSource<TOutputVectorData>
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h
index e06ab505a30cfa2adcbb68cb0f5f9e7214e186ea..c9bf64923d2be2c82dbe43ff0ecc4acd71d7bca2 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h
@@ -29,6 +29,8 @@ namespace otb
  *   \brief Load style into a mapnik::Map
  *
  * \sa VectorDataToMapFilter
+ *
+ * \ingroup OTBVectorDataRendering
  */
 
 class ITK_EXPORT VectorDataStyle : public itk::LightObject
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h
index 205572a833e2efafb2feb43dac40f830d712f8a3..bcd6549588b2eeca081a96238f9151ac5c2a58f2 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h
@@ -32,6 +32,8 @@ namespace otb
   * \brief <b>DEPRECATED</b>: See VectorDataToImageFilter
   * \deprecated use VectorDataToImageFilter instead
   * \sa VectorDataToImageFilter
+ *
+ * \ingroup OTBVectorDataRendering
   */
 
 template <class TVectorData, class TImage>
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
index a1ff2a4614b57a6813ec1f9aad24f0f19abc9933..4f505878d003194d5aef3461b5a4a705fadf7c7d 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
@@ -54,6 +54,8 @@ namespace otb
    * otb::Image< itk::RGBAPixel<InternalPixelType> >,
    * otb::Image< itk::RGBPixel<InternalPixelType> >.
    *
+ *
+ * \ingroup OTBVectorDataRendering
    */
 
 template <class TVectorData, class TImage>
diff --git a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
index 21fa7b11f0c61563fdbbea6225ff6a79d11abb46..0e900decd7f2a71623a1c0842ad4e34b8535c397 100644
--- a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
@@ -44,6 +44,8 @@ namespace otb {
  * \sa ResampleImageFilter
  * \sa SubsampleImageRegionConstIterator
  * \sa DecimateImageFilter
+ *
+ * \ingroup OTBWavelet
  */
 template <class TInputImage, class TOutputImage,
     Wavelet::WaveletDirection TDirectionOfTransformation>
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
index 02a1347971fcafb8bc2a1bbc788cebff21890a58..68b477bffde7552699753dba51bceb4bec214a4b 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
@@ -77,6 +77,8 @@ namespace otb {
  * \sa WaveletOperator
  *
  * \ingroup Streamed
+ *
+ * \ingroup OTBWavelet
  */
 template <class TInputImage, class TOutputImage,
     class TWaveletOperator,
@@ -146,6 +148,8 @@ private:
  * from the input(s) to the output(s)...
  *
  * \sa WaveletOperator
+ *
+ * \ingroup OTBWavelet
  */
 template <class TInputImage, class TOutputImage, class TWaveletOperator>
 class ITK_EXPORT WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::FORWARD>
@@ -329,6 +333,8 @@ private:
  * from the input(s) to the output(s)...
  *
  * \sa WaveletOperator
+ *
+ * \ingroup OTBWavelet
  */
 template <class TInputImage, class TOutputImage, class TWaveletOperator>
 class ITK_EXPORT WaveletFilterBank<TInputImage, TOutputImage, TWaveletOperator, Wavelet::INVERSE>
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h b/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h
index 100d46212868ad1da96f5e98525d642d868c2319..ae8a87bb2d336d4433c8b6241f4372390d7dddef 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h
@@ -55,6 +55,8 @@ enum Wavelet {
  * Wavelet::Wavelet type. The members throw an
  * exception if the template specialization is not defined
  * according to the wavelet ID.
+ *
+ * \ingroup OTBWavelet
  */
 template <Wavelet::Wavelet TMotherWaveletOperator>
 class ITK_EXPORT WaveletGenerator
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h b/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h
index b7b6c7ecc81e6595b49ac9857f1bda854dec326d..1f51a4d287c0f05f0d4f4685b4a08a05d3207a5b 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h
@@ -34,6 +34,8 @@ namespace otb {
  *
  * \sa WaveletOperator
  * \sa WaveletGenerator
+ *
+ * \ingroup OTBWavelet
  */
 template <Wavelet::Wavelet TMotherWaveletOperator,
     Wavelet::WaveletDirection TDirectionOfTransformation,
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h b/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h
index 34710f1391697bd3d5cddbefe544a66284804ffb..0742709e72d1b6d1dc942b7deb93bd8cc08533a5 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h
@@ -33,6 +33,8 @@ namespace otb {
  *
  * \sa WaveletOperatorBase
  * \sa WaveletGenerator
+ *
+ * \ingroup OTBWavelet
  */
 template <Wavelet::Wavelet TMotherWaveletOperator,
     Wavelet::WaveletDirection TDirectionOfTransformation,
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletOperator.h b/Modules/Filtering/Wavelet/include/otbWaveletOperator.h
index 6f5ed4b77e83fc2b7ae9cc3c33af2bbc2f1c67d8..c512f906827f3a6cd10d744d7e4019dea083b5a9 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletOperator.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletOperator.h
@@ -45,6 +45,8 @@ namespace otb {
  * \sa WaveletOperatorBase
  * \sa WaveletLowPassOperator
  * \sa WaveletHighPassOperator
+ *
+ * \ingroup OTBWavelet
  */
 template <Wavelet::Wavelet TMotherWaveletOperator,
     Wavelet::WaveletDirection TDirectionOfTransformation,
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
index e197a486a3bd1b7778c30527e0aee6a7b5041474..c3598d325966ab10cb6887c1075f4472f41c93c3 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
@@ -63,6 +63,8 @@ enum WaveletDirection {FORWARD = 0, INVERSE = 1};
  * \sa Neighborhood
  *
  * \ingroup Operators
+ *
+ * \ingroup OTBWavelet
  */
 template <Wavelet::Wavelet TMotherWaveletOperator,
     class TPixel, unsigned int VDimension,
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h b/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h
index 517f20f1f7acc30d59365c661ee906d8ab64b65e..c07570b9d45e5e3a3193b2d578aabae0e6ecd24e 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h
@@ -34,6 +34,8 @@ namespace otb {
  * It is based on the depth of the decomposition only...
  *
  * \sa WaveletPacketForwardTransform
+ *
+ * \ingroup OTBWavelet
  */
 template <class TImage>
 class ITK_EXPORT FullyDecomposedWaveletPacketCost
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
index ffb6c35276b35371829eb154f54def1b54c0f3de..76449b94c45ffa32173819f7611ad39e54b471e4 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
@@ -53,6 +53,8 @@ namespace otb {
  * \sa FullyDecomposedWaveletPacketCost
  * \sa WaveletFilterBank
  * \sa WaveletTransform
+ *
+ * \ingroup OTBWavelet
  */
 template <class TInputImage, class TOutputImage, class TFilter,
     Wavelet::WaveletDirection TDirectionOfTransformation,
@@ -107,6 +109,8 @@ private:
  * \sa FullyDecomposedWaveletPacketCost
  * \sa WaveletFilterBank
  * \sa WaveletTransform
+ *
+ * \ingroup OTBWavelet
  */
 template <class TInputImage, class TOutputImage, class TFilter, class TCost>
 class ITK_EXPORT WaveletPacketTransform<TInputImage, TOutputImage, TFilter, Wavelet::FORWARD, TCost>
@@ -236,6 +240,8 @@ private:
  * \sa FullyDecomposedWaveletPacketCost
  * \sa WaveletFilterBank
  * \sa WaveletTransform
+ *
+ * \ingroup OTBWavelet
  */
 template <class TInputImage, class TOutputImage, class TFilter>
 class ITK_EXPORT WaveletPacketTransform<TInputImage, TOutputImage, TFilter,
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletTransform.h b/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
index 6277bf7782b73396146ba061b70400014bcc66dc..1c16dffe0b8efea7dc1926b7c4c85265b3e59e4c 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
@@ -48,6 +48,8 @@ namespace otb {
  * \sa WaveletFilterBank
  * \sa WaveletPacketTransform
  *
+ *
+ * \ingroup OTBWavelet
  */
 template <class TInputImage, class TOutputImage, class TFilter,
     Wavelet::WaveletDirection TDirectionOfTransformation>
@@ -98,6 +100,8 @@ private:
  * \sa WaveletFilterBank
  * \sa WaveletPacketTransform
  *
+ *
+ * \ingroup OTBWavelet
  */
 template <class TInputImage, class TOutputImage, class TFilter>
 class ITK_EXPORT WaveletTransform<TInputImage, TOutputImage, TFilter, Wavelet::FORWARD>
@@ -222,6 +226,8 @@ private:
  * \sa WaveletFilterBank
  * \sa WaveletPacketTransform
  *
+ *
+ * \ingroup OTBWavelet
  */
 template <class TInputImage, class TOutputImage, class TFilter>
 class ITK_EXPORT WaveletTransform<TInputImage, TOutputImage, TFilter, Wavelet::INVERSE>
diff --git a/Modules/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h b/Modules/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h
index 33da504bba0603c7cb9f74f7fcce4b8c7d8ca5d5..987aaceb8bb2b333882bfa10d0b8bae73c9bcfe0 100644
--- a/Modules/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h
+++ b/Modules/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h
@@ -33,6 +33,8 @@ namespace otb {
  * Measurement vector for the statistic set as paramater.
  *
  *
+ *
+ * \ingroup OTBFuzzy
  */
   class  FuzzyDescriptorsModelManager
 {
diff --git a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
index 43b8d4a9a8ca89189235c6cf08db11f08b0b447a..a792e7d8898808ca5759e595f08498e03c60f1ff 100644
--- a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
+++ b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
@@ -37,6 +37,8 @@ namespace otb
  *  In addition, 2 more values can be provided to define the min and
  *  the max. By default, they are 0 and 1 respectively.
  *
+ *
+ * \ingroup OTBFuzzy
  */
 template <class TLabel = unsigned short, class TPrecision=double>
 class ITK_EXPORT FuzzyVariable : public itk::DataObject
diff --git a/Modules/Fusion/Fuzzy/src/otbFuzzyDescriptorsModelManager.cxx b/Modules/Fusion/Fuzzy/src/otbFuzzyDescriptorsModelManager.cxx
index c5de57ad928bd0505d0d02a8161446ad4e1f4f3f..fd28876504fb7a2a5e05c810067c09bebfbaa29e 100644
--- a/Modules/Fusion/Fuzzy/src/otbFuzzyDescriptorsModelManager.cxx
+++ b/Modules/Fusion/Fuzzy/src/otbFuzzyDescriptorsModelManager.cxx
@@ -19,7 +19,7 @@
 #include "otbFuzzyDescriptorsModelManager.h"
 #include "itkMacro.h"
 #include "itksys/SystemTools.hxx"
-#include "otbTinyXML.h"
+#include "otb_tinyxml.h"
 
 namespace otb {
 
diff --git a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
index be97e6630a89196bbc11f6dacb6503390ea9a850..5084c6cce4e5f1e1ff14c5647cce1b0655738cca 100644
--- a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
+++ b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
@@ -56,6 +56,8 @@ namespace otb
  *
  * \sa MorphologyImageFilter, GrayscaleFunctionDilateImageFilter, BinaryDilateImageFilter
  * \ingroup ImageEnhancement  MathematicalMorphologyImageFilters
+ *
+ * \ingroup OTBMajorityVoting
  */
 template<
          class TInputImage,
diff --git a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
index cca29e95b4ec43d4f8afee15f0e4a1176d923203..30622c494badd5bcff107059cef6d6675d6810e4 100644
--- a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
@@ -38,6 +38,8 @@ namespace Functor
 /** \class BayesianFunctor
  * \brief Functor for the bayesian fusion filter. Please refer to BayesianFusionFilter.
  *
+ *
+ * \ingroup OTBPanSharpening
  */
 template <class TInputMultiSpectral,
     class TInputMultiSpectralInterp,
@@ -184,6 +186,8 @@ private:
  * \example Fusion/BayesianFusionImageFilter.cxx
  *
  *
+ *
+ * \ingroup OTBPanSharpening
  */
 
 template <class TInputMultiSpectralImage,
diff --git a/Modules/Fusion/PanSharpening/include/otbFusionImageBase.h b/Modules/Fusion/PanSharpening/include/otbFusionImageBase.h
index 5c63808a276bdb9ea1292554c7e80c95595728d5..b983ba896b4354400302a0979d3e88a5edfb88a1 100644
--- a/Modules/Fusion/PanSharpening/include/otbFusionImageBase.h
+++ b/Modules/Fusion/PanSharpening/include/otbFusionImageBase.h
@@ -26,6 +26,8 @@ namespace otb
 /** \class FusionImageBase
  * Basic class for every Fusion classes.
  * \sa TernaryFunctorImageFilter
+ *
+ * \ingroup OTBPanSharpening
  */
 template <class TInputMultiSpectralImage, class TInputMultiSpectralInterpImage, class TInputPanchroImage,
     class TOutputImage, class TFunctor>
diff --git a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
index ea1962ca39935bd6290e12887b5110f70ba98afb..78483662148e73666b6cc56f7a42b4f6c91fbbd9 100644
--- a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
@@ -48,6 +48,8 @@ namespace otb
  * \ingroup Fusion
  *
  *
+ *
+ * \ingroup OTBPanSharpening
  **/
 
 template <class TPanImageType, class TXsImageType, class TOutputImageType, class TInternalPrecision = float>
@@ -121,6 +123,8 @@ private:
   /** \class FusionFunctor
    * This functor applies the LMVM
    * operation. It is intended for internal use only.
+ *
+ * \ingroup OTBPanSharpening
    */
   class FusionFunctor1
   {
diff --git a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
index 3a2cff76b83caf86a6d54f651024b726af02e939..7afad9841e95a2e626e6ad52b145b96c2dff7713 100644
--- a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
@@ -46,6 +46,8 @@ namespace otb
  *
  * \example Fusion/PanSharpeningExample.cxx
  *
+ *
+ * \ingroup OTBPanSharpening
  **/
 
 template <class TPanImageType, class TXsImageType, class TOutputImageType, class TInternalPrecision = float>
@@ -111,6 +113,8 @@ private:
    * This functor applies the
    *  \f[ \frac{XS}{\mathrm{Filtered}(PAN)}PAN  \f]
    * operation. It is intended for internal use only.
+ *
+ * \ingroup OTBPanSharpening
    */
   class FusionFunctor
   {
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
index 4bb4b68014b58ecbe218dcff8a9c1885bdb4c5b1..c8542ca44ae238fae92bd52c9a5d478bdf846f3f 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
@@ -35,6 +35,8 @@ namespace otb
  *
  *
  * \ingroup ImageFilters
+ *
+ * \ingroup OTBAnomalyDetection
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT LocalRxDetectorFilter:
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
index d955990054f79b6e1dc303bf872ca75c3c71e2cc..117eefef8a583453eddef5394c9f08c02181eea7 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
@@ -34,6 +34,8 @@ namespace otb
  *
  *
  * \ingroup ImageFilters
+ *
+ * \ingroup OTBAnomalyDetection
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT LocalRxDetectorNonThreadFilter:
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
index 58a1fd99bc83ab492bb68f0f20ab5b311c3c9634..86f59e68c5bb4735000f4edd678cefbaffb261bc 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
@@ -49,6 +49,8 @@ namespace otb
  * IEEE Int. Conf. On Image Processing(ICIP) 2009, Cairo, Egypte, 2009
  *
  * \ingroup Hyperspectral
+ *
+ * \ingroup OTBEndmembersExtraction
  */
 template<class TPrecision>
 class ITK_EXPORT EigenvalueLikelihoodMaximisation :
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
index 6e2fd7c83c54c1397b5f42d0a18ed13c8de5ba81..1577ce8e1ae4c303cd0941fadb808e13c7b26801 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
@@ -58,6 +58,8 @@ namespace otb {
  * \ingroup Hyperspectral
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBEndmembersExtraction
  */
 template <class TVectorImage>
 class ITK_EXPORT VCAImageFilter : public itk::ImageToImageFilter<TVectorImage, TVectorImage>
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
index 4645da85e1a6a325b0553be309bfd4dc00d213df..8c931bb2f83d9b4cf7b34885877035f381632f9f 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
@@ -51,6 +51,8 @@ namespace otb
  * Sensing, vol. 44, no. 9, pp. 2601-1616, sep 2006.
  *
  * \ingroup Hyperspectral
+ *
+ * \ingroup OTBEndmembersExtraction
  */
 template<class TPrecision>
 class ITK_EXPORT VirtualDimensionality :
diff --git a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
index 11645da0ff96a94f9d896dfe2d98584b49a56110..1bb707cc4189dadb48ee53f5c8112add9d84037b 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
@@ -32,6 +32,8 @@ namespace Functor {
  *
  * \brief TODO
  *
+ *
+ * \ingroup OTBUnmixing
  */
 template<class TInput, class TOutput, class TPrecision>
 class ISRAUnmixingFunctor
@@ -110,6 +112,8 @@ private:
  * \ingroup Hyperspectral
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBUnmixing
  */
 template <class TInputImage, class TOutputImage, class TPrecision>
 class ITK_EXPORT ISRAUnmixingImageFilter :
diff --git a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
index 39081934a654e7b34ddac81bdea45655d4ac2d9a..07248e693f9782e032bb3aafa33a7d3911a184cd 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
@@ -118,6 +118,8 @@ namespace otb
  *  \delta\cdot\1_{1J}\end{array}\right]\enspace \f$.
  *
  * \ingroup ImageFilters
+ *
+ * \ingroup OTBUnmixing
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT MDMDNMFImageFilter:
diff --git a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
index d6ff1a0c096e51c6c3f16b9caedeb4be4a650e68..a9d30c807dbb12ce314eed78c31ef0d568153fae 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
@@ -33,6 +33,8 @@ namespace Functor {
  *
  * \brief TODO
  *
+ *
+ * \ingroup OTBUnmixing
  */
 template<class TInput, class TOutput, class TPrecision>
 class NCLSUnmixingFunctor
@@ -113,6 +115,8 @@ private:
  * \ingroup Hyperspectral
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBUnmixing
  */
 template <class TInputImage, class TOutputImage, class TPrecision>
 class ITK_EXPORT NCLSUnmixingImageFilter :
diff --git a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
index 80fef64d54aca4914d6567e6b3082a6a6ae39b2f..c214d733c4b0ecbf7ef808897888fa914ace9d22 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
@@ -44,6 +44,8 @@ namespace otb {
  *
  * N is given in template value
  *
+ *
+ * \ingroup OTBUnmixing
  */
 template < class TInputImage, class TOutputImage,
             unsigned int VNbInputImage,
diff --git a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
index fe54656918c28f23784ca4a51e5f795a14257e08..74c678e4b109c8931078f61690714c38df1f0a66 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
@@ -32,6 +32,8 @@ namespace Functor {
  *
  * \brief TODO
  *
+ *
+ * \ingroup OTBUnmixing
  */
 template<class TInput, class TOutput, class TPrecision>
 class UnConstrainedLeastSquareFunctor
@@ -119,6 +121,8 @@ private:
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBUnmixing
  */
 template <class TInputImage, class TOutputImage, class TPrecision>
 class ITK_EXPORT UnConstrainedLeastSquareImageFilter :
diff --git a/Modules/IO/Carto/include/otbCoordinateToName.h b/Modules/IO/Carto/include/otbCoordinateToName.h
index ffbd07877c22dced04f0161bacf87a63544405b2..7c259a63d6fe2e3125dc165ed637bde6ce0e0339 100644
--- a/Modules/IO/Carto/include/otbCoordinateToName.h
+++ b/Modules/IO/Carto/include/otbCoordinateToName.h
@@ -32,6 +32,8 @@ namespace otb
  * This class can work in asynchronous mode using \code  MultithreadOn() \endcode. In this
  * case, the web request does not block the rest of the program.
  *
+ *
+ * \ingroup OTBCarto
  */
 
 class ITK_EXPORT CoordinateToName : public itk::Object
diff --git a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
index bfa1cd6af34672f57840986a969ab7f6b3ff88f5..c3fecc7a6698d5826671b49b7ec1ca9fe41d8246 100644
--- a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
+++ b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
@@ -33,6 +33,8 @@ namespace otb {
  *  the OSM XML file storing the datas within this input image bbox.
  *
  * \sa otb::OSMDataToVectorDataGenerator
+ *
+ * \ingroup OTBCarto
  */
 template < class TImage>
 class  ITK_EXPORT ImageToOSMVectorDataGenerator :
diff --git a/Modules/IO/Carto/include/otbMapFileProductWriter.h b/Modules/IO/Carto/include/otbMapFileProductWriter.h
index ece0a06d9c62677a1a4dfd74de2f1604d030684c..bd979a2e80531ec40e7c4a94359a0803d22d466d 100644
--- a/Modules/IO/Carto/include/otbMapFileProductWriter.h
+++ b/Modules/IO/Carto/include/otbMapFileProductWriter.h
@@ -59,6 +59,8 @@ namespace otb
  *
  * \ingroup IO
  *
+ *
+ * \ingroup OTBCarto
  */
 template <class TInputImage>
 class ITK_EXPORT MapFileProductWriter : public itk::ProcessObject
diff --git a/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h b/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
index 9b52627cde2918e71528de7e46f193ae2ba74310..4c55fb87565e1c7aff553894f43c4bea12e51787 100644
--- a/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
+++ b/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
@@ -68,6 +68,8 @@ namespace otb {
  *  Note that if one of the server limits are crossed
  *  node/way/relation or area requested, an exception is raised.
  *
+ *
+ * \ingroup OTBCarto
  */
 class  ITK_EXPORT OSMDataToVectorDataGenerator :
     public VectorDataSource< otb::VectorData<> >
diff --git a/Modules/IO/Carto/include/otbPlaceNameToLonLat.h b/Modules/IO/Carto/include/otbPlaceNameToLonLat.h
index 6debb114649f4e59e66aacb095a6616cf838d340..920bd2f0d1e6d5c651a415f59c75280ea08ff101 100644
--- a/Modules/IO/Carto/include/otbPlaceNameToLonLat.h
+++ b/Modules/IO/Carto/include/otbPlaceNameToLonLat.h
@@ -27,6 +27,8 @@ namespace otb
  * \class PlaceNameToLonLat
  * \brief Retrieve Longitude and Latitude coordinates from a place name
  *
+ *
+ * \ingroup OTBCarto
  */
 
 class ITK_EXPORT PlaceNameToLonLat : public itk::Object
diff --git a/Modules/IO/Carto/include/otbWorldFile.h b/Modules/IO/Carto/include/otbWorldFile.h
index c6eb3f6ee28a33f334399ef4bd7f980da6e0913a..18e72127aecc15e2033dc2caad9d128a7ed20472 100644
--- a/Modules/IO/Carto/include/otbWorldFile.h
+++ b/Modules/IO/Carto/include/otbWorldFile.h
@@ -33,6 +33,8 @@ namespace otb {
  *  The world file format is detailed at
  *  http://en.wikipedia.org/wiki/World_file
  *
+ *
+ * \ingroup OTBCarto
  */
 
 class ITK_EXPORT WorldFile : public itk::Object
diff --git a/Modules/IO/Carto/src/otbCoordinateToName.cxx b/Modules/IO/Carto/src/otbCoordinateToName.cxx
index d5f98583337ca088e1d32fefcdbb1d3c5ef7c448..356c71c21b7d9e1078c508c4a1f178e44705e5ce 100644
--- a/Modules/IO/Carto/src/otbCoordinateToName.cxx
+++ b/Modules/IO/Carto/src/otbCoordinateToName.cxx
@@ -23,7 +23,7 @@
 #include "otbMacro.h"
 #include "otbUtils.h"
 
-#include "otbTinyXML.h"
+#include "otb_tinyxml.h"
 #include "otbCurlHelper.h"
 
 #include "itkMersenneTwisterRandomVariateGenerator.h"
diff --git a/Modules/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx b/Modules/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx
index 702144f5061074ecd2e3ac13077fcc26a502d147..1bceb81d1d56f47cdb6e7163474a6d9965f1e5a8 100644
--- a/Modules/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx
+++ b/Modules/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx
@@ -22,7 +22,7 @@
 #include "itkDataObject.h"
 #include "itkMacro.h"
 
-#include "otbTinyXML.h"
+#include "otb_tinyxml.h"
 
 namespace otb
 {
diff --git a/Modules/IO/Carto/src/otbPlaceNameToLonLat.cxx b/Modules/IO/Carto/src/otbPlaceNameToLonLat.cxx
index 688d61904fb1fb802ee950881fb1463b1dc7f478..ffe5ca9a1fd3873e29b4a1beace973caf91fa563 100644
--- a/Modules/IO/Carto/src/otbPlaceNameToLonLat.cxx
+++ b/Modules/IO/Carto/src/otbPlaceNameToLonLat.cxx
@@ -17,7 +17,7 @@
 =========================================================================*/
 
 #include "otbPlaceNameToLonLat.h"
-#include "otbTinyXML.h"
+#include "otb_tinyxml.h"
 #include "otbCurlHelper.h"
 
 namespace otb
diff --git a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h
index 09445e4ec7ab69e8f7bd751227c66db5303a922d..96e72fe51f617f41f61b89b1534ec9e9b13ccbd5 100644
--- a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h
+++ b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h
@@ -28,6 +28,8 @@ namespace otb
  *  \brief Helper to handle extended filenames.
  *
  *  \sa ImageFileReader
+ *
+ * \ingroup OTBExtendedFilename
  */
 
 class ITK_EXPORT ExtendedFilenameHelper : public itk::Object
diff --git a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
index 80bf5d790ddc426d15efb03e2d79fa2cf4bf913a..131506a949e5d0831f5d7bd2ab32a5e2113b2b17 100644
--- a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
+++ b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
@@ -34,6 +34,8 @@ namespace otb
  * - &skipgeom  : switch to skip the geometric informations
  *
  *  \sa ImageFileReader
+ *
+ * \ingroup OTBExtendedFilename
  */
 
 class ITK_EXPORT ExtendedFilenameToReaderOptions : public itk::Object
diff --git a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
index e884fc3bfe4a6ecb2092c2a51502737a955ec265..94dbc212d4a0ca936837155f878f7df4baac65d1 100644
--- a/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
+++ b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
@@ -35,6 +35,8 @@ namespace otb
  * See http://wiki.orfeo-toolbox.org/index.php/ExtendedFileName
  *
  *  \sa ImageFileWriter
+ *
+ * \ingroup OTBExtendedFilename
  */
 
 class ITK_EXPORT ExtendedFilenameToWriterOptions : public itk::Object
diff --git a/Modules/IO/IOBSQ/include/otbBSQImageIO.h b/Modules/IO/IOBSQ/include/otbBSQImageIO.h
index fbb07c7250806b5e3b35482efedf44a572be9986..da45096f174e42b13341ef4550570327b555fae4 100644
--- a/Modules/IO/IOBSQ/include/otbBSQImageIO.h
+++ b/Modules/IO/IOBSQ/include/otbBSQImageIO.h
@@ -35,6 +35,8 @@ namespace otb
  *
  * \ingroup IOFilters
  *
+ *
+ * \ingroup OTBIOBSQ
  */
 class ITK_EXPORT BSQImageIO : public otb::ImageIOBase
 {
diff --git a/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h b/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h
index 9cc88ca9720d538694863a067874191a6734be76..a259920125384748227d6cd901c8d2773b6156d5 100644
--- a/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h
+++ b/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h
@@ -24,6 +24,8 @@ namespace otb
 {
 /** \class BSQImageIOFactory
  * \brief Creation d'un instance d'un objet BSQImageIO utilisant les object factory.
+ *
+ * \ingroup OTBIOBSQ
  */
 class ITK_EXPORT BSQImageIOFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/IO/IOGDAL/include/otbGDALDriverManagerWrapper.h b/Modules/IO/IOGDAL/include/otbGDALDriverManagerWrapper.h
index fa3133d1f34947e459492495e8e0e12e81d33ac6..d7cdaff63358d1c2cf84686212545ee0074797a8 100644
--- a/Modules/IO/IOGDAL/include/otbGDALDriverManagerWrapper.h
+++ b/Modules/IO/IOGDAL/include/otbGDALDriverManagerWrapper.h
@@ -77,6 +77,8 @@ private:
  *
  * \ingroup IOFilters
  *
+ *
+ * \ingroup OTBIOGDAL
  */
 // Wraps the GdalDriverManager so that GDALAllRegister is called automatically
 class GDALDriverManagerWrapper
diff --git a/Modules/IO/IOGDAL/include/otbGDALImageIO.h b/Modules/IO/IOGDAL/include/otbGDALImageIO.h
index f52dce303055fc460a528c2ff16a1e44123ae378..c0bef437582efc5859f340354a030daab68232fb 100644
--- a/Modules/IO/IOGDAL/include/otbGDALImageIO.h
+++ b/Modules/IO/IOGDAL/include/otbGDALImageIO.h
@@ -60,6 +60,8 @@ class GDALDataTypeWrapper;
  *
  * \ingroup IOFilters
  *
+ *
+ * \ingroup OTBIOGDAL
  */
 class ITK_EXPORT GDALImageIO : public otb::ImageIOBase
 {
diff --git a/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h b/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h
index 03fbfa8cbbd93a53577a48721dbb84e2d8101b87..7e0c8b61da980198c9a80560cad2744f4555a155 100644
--- a/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h
+++ b/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class GDALImageIOFactory
  * \brief Creation d'un instance d'un objet GDALImageIO utilisant les object factory.
+ *
+ * \ingroup OTBIOGDAL
  */
 class ITK_EXPORT GDALImageIOFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/IO/IOGDAL/include/otbOGRIOHelper.h b/Modules/IO/IOGDAL/include/otbOGRIOHelper.h
index 8a3d38074caf7085c0d3c1fca519001ac8b08633..baf02bd4ee213ec10f1c7d4c3591afd8d767effe 100644
--- a/Modules/IO/IOGDAL/include/otbOGRIOHelper.h
+++ b/Modules/IO/IOGDAL/include/otbOGRIOHelper.h
@@ -34,6 +34,8 @@ namespace otb
 /** \class OGRIOHelper
  *  \brief This class IO OGR
  *
+ *
+ * \ingroup OTBIOGDAL
  */
 class OGRIOHelper: public itk::Object
 {
diff --git a/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h b/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h
index bf94aa56015a83c8f64c9b469f4218839ea711cd..f7ae24d3dac2171d7a1ecabc928546a98fa6538a 100644
--- a/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h
+++ b/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h
@@ -36,6 +36,8 @@ namespace otb
  * handle Esri Shapefile (shp), MapInfo (map) and Geography Markup Language (GML)
  * and possibly other OGR formats.
  *
+ *
+ * \ingroup OTBIOGDAL
  */
 class ITK_EXPORT OGRVectorDataIO
   : public VectorDataIOBase
diff --git a/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h b/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h
index 8792db3680c853906bceeb3175e370dc95a5b347..3571167e5971c035e00534e24375096a46f2b18b 100644
--- a/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h
+++ b/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h
@@ -24,6 +24,8 @@ namespace otb
 {
 /** \class OGRVectorDataIOFactory
  * \brief Create an instance of an OGRVectorDataIOFactory.
+ *
+ * \ingroup OTBIOGDAL
  */
 class ITK_EXPORT OGRVectorDataIOFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/IO/IOGDAL/src/otbGDALImageIO.cxx b/Modules/IO/IOGDAL/src/otbGDALImageIO.cxx
index 5e223d90f126ecf1439a1f78a29f567945eab076..9855c4fedfc4ff41c823bb6baf23f5731a3b6cb3 100644
--- a/Modules/IO/IOGDAL/src/otbGDALImageIO.cxx
+++ b/Modules/IO/IOGDAL/src/otbGDALImageIO.cxx
@@ -24,7 +24,7 @@
 #include "otbSystem.h"
 #include "itksys/SystemTools.hxx"
 #include "otbImage.h"
-#include "otbTinyXML.h"
+#include "otb_tinyxml.h"
 #include "otbImageKeywordlist.h"
 
 #include "itkMetaDataObject.h"
diff --git a/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIO.h b/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIO.h
index c8c82268fae180336b8165ef81bf60c3249aea4f..3b4f1c7b5b7c79fee378fbde78f0b10ceac125e3 100644
--- a/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIO.h
+++ b/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIO.h
@@ -37,6 +37,8 @@ class JPEG2000TileCache;
  *
  * \ingroup IOFilters
  *
+ *
+ * \ingroup OTBIOJPEG2000
  */
 class ITK_EXPORT JPEG2000ImageIO : public otb::ImageIOBase
 {
diff --git a/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIOFactory.h b/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIOFactory.h
index 759cb9f8a7208576dd7201387a374756f09fbd88..018c7b0f0db404162f6aa26e2288106b4222d2a7 100644
--- a/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIOFactory.h
+++ b/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIOFactory.h
@@ -24,6 +24,8 @@ namespace otb
 {
 /** \class JPEG2000ImageIOFactory
  * \brief Create instances of JPEG2000ImageIO objects using an object factory.
+ *
+ * \ingroup OTBIOJPEG2000
  */
 class ITK_EXPORT JPEG2000ImageIOFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/IO/IOJPEG2000/src/otbJPEG2000ImageIO.cxx b/Modules/IO/IOJPEG2000/src/otbJPEG2000ImageIO.cxx
index d62860dcda2c804bfd563c602043423c5a27740c..13765469c7947ad822a922426e99836fd96eb7bc 100644
--- a/Modules/IO/IOJPEG2000/src/otbJPEG2000ImageIO.cxx
+++ b/Modules/IO/IOJPEG2000/src/otbJPEG2000ImageIO.cxx
@@ -31,7 +31,7 @@
 
 extern "C"
 {
-#include "openjpeg.h"
+#include "otb_openjpeg.h"
 }
 
 #include "gdal.h"
@@ -42,7 +42,7 @@ extern "C"
 
 #include "itksys/SystemTools.hxx"
 
-#include "otbTinyXML.h"
+#include "otb_tinyxml.h"
 
 #include "itkMutexLock.h"
 #include "itkMutexLockHolder.h"
diff --git a/Modules/IO/IOKML/include/otbKMLVectorDataIO.h b/Modules/IO/IOKML/include/otbKMLVectorDataIO.h
index bc5a4de724b1729f042d5bb53a0dbddb8c4316f1..4bd9e0a53eaf2507a6c555e8aa46fc02242bbd3f 100644
--- a/Modules/IO/IOKML/include/otbKMLVectorDataIO.h
+++ b/Modules/IO/IOKML/include/otbKMLVectorDataIO.h
@@ -38,6 +38,8 @@ namespace otb
  *
  * \brief ImageIO object for reading/writing KML format vector data
  *
+ *
+ * \ingroup OTBIOKML
  */
 class ITK_EXPORT KMLVectorDataIO
   : public VectorDataIOBase
diff --git a/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h b/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h
index a660b7ce6687e94556306483c29b0eaeb6b020c9..bbed681ee1d22b05c28ff000ce6fe5226f41f094 100644
--- a/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h
+++ b/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h
@@ -24,6 +24,8 @@ namespace otb
 {
 /** \class KMLVectorDataIOFactory
  * \brief Creating an instance of a VectorDataImageIO object using object factory.
+ *
+ * \ingroup OTBIOKML
  */
 class ITK_EXPORT KMLVectorDataIOFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/IO/IOLUM/include/otbLUMImageIO.h b/Modules/IO/IOLUM/include/otbLUMImageIO.h
index 6488931648b08f06e84f64af5592e60be1dd4e05..5996544103cd000f05b2020e8fe622f939480c75 100644
--- a/Modules/IO/IOLUM/include/otbLUMImageIO.h
+++ b/Modules/IO/IOLUM/include/otbLUMImageIO.h
@@ -34,6 +34,8 @@ namespace otb
  *
  * \ingroup IOFilters
  *
+ *
+ * \ingroup OTBIOLUM
  */
 class ITK_EXPORT LUMImageIO : public otb::ImageIOBase
 {
diff --git a/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h b/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h
index b1081cfee3579a4c3c21011e39ddec00f5cb3d2a..4383998365bccbb20e90a4f501ebf3f04dfd6c7c 100644
--- a/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h
+++ b/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h
@@ -24,6 +24,8 @@ namespace otb
 {
 /** \class LUMImageIOFactory
  * \brief Creation d'un instance d'un objet LUMImageIO utilisant les object factory.
+ *
+ * \ingroup OTBIOLUM
  */
 class ITK_EXPORT LUMImageIOFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h b/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h
index 1716fc1e81862c1b011ab244f452bc7095b936fa..6f2ee0479794d779695e401d7c41fbd398ca48a3 100644
--- a/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h
+++ b/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h
@@ -31,6 +31,8 @@ namespace otb
  *
  * \ingroup IOFilters
  *
+ *
+ * \ingroup OTBIOMSTAR
  */
 class ITK_EXPORT MSTARImageIO : public otb::ImageIOBase
 {
diff --git a/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h b/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h
index 27f8e18c62c3d13bf9231f558b19082fb5f65cda..62f509c6176c902290d2a72e9306ee22200d5990 100644
--- a/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h
+++ b/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h
@@ -24,6 +24,8 @@ namespace otb
 {
 /** \class MSTARImageIOFactory
  * \brief Creation d'un instance d'un objet MSTARImageIO utilisant les object factory.
+ *
+ * \ingroup OTBIOMSTAR
  */
 class ITK_EXPORT MSTARImageIOFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/IO/IOMW/include/otbMWImageIO.h b/Modules/IO/IOMW/include/otbMWImageIO.h
index 11c9dbc1d69c3c3c7d27ffcd98fbe4c17af9772b..8ad46f235b6bb4f5fa3626705058d6ddf581f26a 100644
--- a/Modules/IO/IOMW/include/otbMWImageIO.h
+++ b/Modules/IO/IOMW/include/otbMWImageIO.h
@@ -34,6 +34,8 @@ namespace otb
  *
  * \ingroup IOFilters
  *
+ *
+ * \ingroup OTBIOMW
  */
 class ITK_EXPORT MWImageIO : public otb::ImageIOBase
 {
diff --git a/Modules/IO/IOMW/include/otbMWImageIOFactory.h b/Modules/IO/IOMW/include/otbMWImageIOFactory.h
index f98b8344c42dbfbedd49886777d2a9ba5cfdffce..8b9c2548f81c750eab7c369b5384017d6c043f6f 100644
--- a/Modules/IO/IOMW/include/otbMWImageIOFactory.h
+++ b/Modules/IO/IOMW/include/otbMWImageIOFactory.h
@@ -24,6 +24,8 @@ namespace otb
 {
 /** \class MWImageIOFactory
  * \brief Creation d'un instance d'un objet LUMImageIO utilisant les object factory.
+ *
+ * \ingroup OTBIOMW
  */
 class ITK_EXPORT MWImageIOFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/IO/IOONERA/include/otbONERAImageIO.h b/Modules/IO/IOONERA/include/otbONERAImageIO.h
index 31e3400459f25fcaa3528c30d551fb223cde3546..7363877c0d52eb4c7a2da55b67dd82286c64c513 100644
--- a/Modules/IO/IOONERA/include/otbONERAImageIO.h
+++ b/Modules/IO/IOONERA/include/otbONERAImageIO.h
@@ -33,6 +33,8 @@ namespace otb
  *
  * \ingroup IOFilters
  *
+ *
+ * \ingroup OTBIOONERA
  */
 class ITK_EXPORT ONERAImageIO : public otb::ImageIOBase
 {
diff --git a/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h b/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h
index 522ecff29e09cea1e1cb5ea6bcdf7e54f0c5c16c..8d712a606fd97963c45995a9a8b4583ce5c6e55c 100644
--- a/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h
+++ b/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h
@@ -24,6 +24,8 @@ namespace otb
 {
 /** \class ONERAImageIOFactory
  * \brief Creation d'un instance d'un objet ONERAImageIO utilisant les object factory.
+ *
+ * \ingroup OTBIOONERA
  */
 class ITK_EXPORT ONERAImageIOFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/IO/IORAD/include/otbRADImageIO.h b/Modules/IO/IORAD/include/otbRADImageIO.h
index 0ee8c38b6ac2aa130858a016342d4943b16cf76b..59d6a4133df0a8899261dc4588720abb22af3cd1 100644
--- a/Modules/IO/IORAD/include/otbRADImageIO.h
+++ b/Modules/IO/IORAD/include/otbRADImageIO.h
@@ -34,6 +34,8 @@ namespace otb
  *
  * \ingroup IOFilters
  *
+ *
+ * \ingroup OTBIORAD
  */
 class ITK_EXPORT RADImageIO : public otb::ImageIOBase
 {
diff --git a/Modules/IO/IORAD/include/otbRADImageIOFactory.h b/Modules/IO/IORAD/include/otbRADImageIOFactory.h
index 5b174e4f13a88a5132da4143a555dc726a7124bd..4078c40954d4ab53db38f64928c898c561270648 100644
--- a/Modules/IO/IORAD/include/otbRADImageIOFactory.h
+++ b/Modules/IO/IORAD/include/otbRADImageIOFactory.h
@@ -24,6 +24,8 @@ namespace otb
 {
 /** \class RADImageIOFactory
  * \brief Creation d'un instance d'un objet RADImageIO utilisant les object factory.
+ *
+ * \ingroup OTBIORAD
  */
 class ITK_EXPORT RADImageIOFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/IO/IOTileMap/include/otbTileMapImageIO.h b/Modules/IO/IOTileMap/include/otbTileMapImageIO.h
index 8c2cc72d4a14061231645c66e60c3a66fd0b2eae..ced63061d331c0558a5b3b4aefbe668b844bac60 100644
--- a/Modules/IO/IOTileMap/include/otbTileMapImageIO.h
+++ b/Modules/IO/IOTileMap/include/otbTileMapImageIO.h
@@ -43,6 +43,8 @@ enum TileMapAdressingStyle {GM = 0, OSM = 1, NEARMAP = 2, LOCAL = 3};
    * \brief ImageIO object for reading and writing TileMap images
    *
    *
+ *
+ * \ingroup OTBIOTileMap
  */
 class ITK_EXPORT TileMapImageIO : public otb::ImageIOBase
 {
diff --git a/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h b/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h
index 27aa33e9ea46ef8afa6d775a7c2b285534eed505..15125c3be1310ea6d6fcd141f7a0a33960c6d65b 100644
--- a/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h
+++ b/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class TileMapImageIOFactory
  * \brief Creation of a TileMapImageIO object using object factory.
+ *
+ * \ingroup OTBIOTileMap
  */
 class ITK_EXPORT TileMapImageIOFactory : public itk::ObjectFactoryBase
 {
diff --git a/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h b/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h
index 90751fc3919ac9accee6e34641df002636ac5b02..92b68ddbd451134e10c4a2aae26a50546bc4a6c3 100644
--- a/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h
+++ b/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h
@@ -32,6 +32,8 @@ namespace otb
 /** \class TileMapImageIOHelper
  *  \brief This class IO TileMapImage
  *
+ *
+ * \ingroup OTBIOTileMap
  */
 
 class TileMapImageIOHelper: public itk::Object
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
index b68efc7e2bf6ac46b7127b0fa81e283e4363e7a8..c838058bf64d5de6c6415ed6395af88503fce8ec 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
@@ -30,6 +30,8 @@ namespace otb {
  * Measurement vector for the statistic set as paramater.
  *
  *
+ *
+ * \ingroup OTBIOXML
  */
 template < class TMeasurementVector>
 class  StatisticsXMLFileReader :
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.txx b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.txx
index 5068aba305dfe33711dab7ef08be470892142c14..cf74161fb485379dfd9ecbf432fce237933e6f6d 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.txx
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.txx
@@ -21,7 +21,7 @@
 #include "otbStatisticsXMLFileReader.h"
 #include "itkMacro.h"
 #include "itksys/SystemTools.hxx"
-#include "otbTinyXML.h"
+#include "otb_tinyxml.h"
 
 namespace otb {
 
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
index 211134e43066fe3d971cc8a037ee9e0d72b6c22a..ebf001b70f81c58e207966b1eea399e137cf98a0 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
@@ -33,6 +33,8 @@ namespace otb {
  * Supported vector types are those implementing the method GetElement(idx)
  * and defining the type ValueType.
  *
+ *
+ * \ingroup OTBIOXML
  */
 template < class TMeasurementVector>
 class  StatisticsXMLFileWriter :
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.txx b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.txx
index a13ef4897b642e278bbb54ad246aff53b74a8ed7..c53659ccb835272999b02baa1cfdc0612943fbd5 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.txx
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.txx
@@ -21,7 +21,7 @@
 #include "otbStatisticsXMLFileWriter.h"
 #include "itkMacro.h"
 #include "itksys/SystemTools.hxx"
-#include "otbTinyXML.h"
+#include "otb_tinyxml.h"
 
 namespace otb {
 
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.h b/Modules/IO/ImageIO/include/otbImageFileReader.h
index d2d00fb6b8ac54a56931ee208c046157ef44c852..73187fe122d2c2c502d93cfe77c1b8f46665fc61 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.h
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.h
@@ -33,6 +33,8 @@ namespace otb
 /** \class ImageFileReaderException
  *
  * \brief Base exception class for IO conflicts.
+ *
+ * \ingroup OTBImageIO
  */
 class ImageFileReaderException : public itk::ExceptionObject
 {
@@ -75,6 +77,8 @@ public:
  *
  * \ingroup IOFilters
  *
+ *
+ * \ingroup OTBImageIO
  */
 template <class TOutputImage,
           class ConvertPixelTraits=DefaultConvertPixelTraits<
diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.h b/Modules/IO/ImageIO/include/otbImageFileWriter.h
index 7e5e369d69fcb89fd92c0d80739b8541709063c8..b4bb28fb5aad31769a9bece3186a1ef358cc151d 100644
--- a/Modules/IO/ImageIO/include/otbImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbImageFileWriter.h
@@ -52,6 +52,8 @@ namespace otb
  * \sa ImageSeriesReader
  * \sa ImageIOBase
  * \sa ExtendedFilenameToReaderOptions
+ *
+ * \ingroup OTBImageIO
  */
 template <class TInputImage>
 class ITK_EXPORT ImageFileWriter : public itk::ProcessObject
diff --git a/Modules/IO/ImageIO/include/otbImageIOFactory.h b/Modules/IO/ImageIO/include/otbImageIOFactory.h
index 7d30cc8816e591ffe20a59e0b06a2f32798a27cb..c9cdbf3e4256b7b1bc65e62b171b0a358814c5cf 100644
--- a/Modules/IO/ImageIO/include/otbImageIOFactory.h
+++ b/Modules/IO/ImageIO/include/otbImageIOFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class ImageIOFactory
  * \brief Creation of object instance using object factory.
+ *
+ * \ingroup OTBImageIO
  */
 class ITK_EXPORT ImageIOFactory : public itk::Object
 {
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
index 7e809d5baec1319047f656a57cbab7f081d66197..7ef8d623812d3a888291153fb24e989547da524d 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
@@ -41,6 +41,8 @@ namespace otb {
   *
   *
   * \see ImageFileReader
+ *
+ * \ingroup OTBImageIO
  */
 template <class TImage, class TInternalImage = TImage>
 class ITK_EXPORT ImageSeriesFileReader
@@ -149,6 +151,8 @@ private:
  * GenerateData and TestBandSelection methods are specialised.
  *
  * \see ImageSeriesFileReader
+ *
+ * \ingroup OTBImageIO
  */
 template <class TPixel, class TInternalPixel>
 class ITK_EXPORT ImageSeriesFileReader<Image<TPixel, 2>, Image<TInternalPixel, 2> >
@@ -250,6 +254,8 @@ private:
  * GenerateData and TestBandSelection methods are specialised.
  *
  * \see ImageSeriesFileReader
+ *
+ * \ingroup OTBImageIO
  */
 template <class TPixel, class TInternalPixel>
 class ITK_EXPORT ImageSeriesFileReader<Image<TPixel, 2>, VectorImage<TInternalPixel, 2> >
@@ -352,6 +358,8 @@ private:
  * GenerateData method is specialised.
  *
  * \see ImageSeriesFileReader
+ *
+ * \ingroup OTBImageIO
  */
 template <class TPixel, class TInternalPixel>
 class ITK_EXPORT ImageSeriesFileReader<VectorImage<TPixel, 2>, VectorImage<TInternalPixel, 2> >
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
index 69b1006bdf44e656a2c9e4ebde5c5b5517ec9d3f..dc9271f2600e626453191f0f4ac05ad556ec78d2 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
@@ -54,6 +54,8 @@ public:
 /** \class ImageSeriesFileReaderBase
  * \brief
  * \sa ImageSeriesFileReader
+ *
+ * \ingroup OTBImageIO
  */
 
 template <class TImage, class TInternalImage = TImage>
diff --git a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
index 0c7a5f82348eabde1d9e28d4170c3d0f677c8aac..d3836bc39305c2521ec2431257c6a62072d28711 100644
--- a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
@@ -31,6 +31,8 @@ namespace otb
  * TBufferType is the scalar buffer type, TOutputPixelType is the type in which the image will be recorded.
  * User have to precise the image size, the number of channel will be computed automatically.
  * The SetFilename method precises the image name.
+ *
+ * \ingroup OTBImageIO
  */
 
 template <class TBufferType, class TOutputPixelType=TBufferType>
diff --git a/Modules/IO/ImageIO/include/otbStreamingImageFileWriter.h b/Modules/IO/ImageIO/include/otbStreamingImageFileWriter.h
index 47ad561fded7f88a848c7241f21e6c143bd9513d..b4845fbcc8312a62e082776927f4f018fb041877 100644
--- a/Modules/IO/ImageIO/include/otbStreamingImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbStreamingImageFileWriter.h
@@ -33,6 +33,8 @@ namespace otb
  *  alias of this class.
  *
  *  \sa ImageFileWriter
+ *
+ * \ingroup OTBImageIO
  */
 template <class TInputImage> class ITK_EXPORT StreamingImageFileWriter : public ImageFileWriter<TInputImage>
 {
diff --git a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
index 387b40f1fba047be0cadfcf0c67904bb3397f397..7f7c6ed32d7534a985153171e9d574ee8080dacc 100644
--- a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
+++ b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
@@ -55,6 +55,8 @@ namespace otb
  *
  * \ingroup IO
  *
+ *
+ * \ingroup OTBKMZWriter
  */
 template <class TInputImage>
 class ITK_EXPORT KmzProductWriter : public itk::ProcessObject
diff --git a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
index 819ad04161655aaa3e33b67d2b7831a0b570cd08..aa56e892a9520559f1a64cda77fcba42f394516f 100644
--- a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
+++ b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
@@ -18,6 +18,8 @@ namespace otb
  * pixel in the other image.
  *
  * \ingroup IntensityImageFilters   Multithreaded
+ *
+ * \ingroup OTBTestKernel
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT DifferenceImageFilter :
diff --git a/Modules/IO/TestKernel/include/otbTestHelper.h b/Modules/IO/TestKernel/include/otbTestHelper.h
index e3ea9284f1e6b547c2b9b64ea57ee62d8b2502f9..203c31b36f340812b9794f1e7cb78a7d41b6db2c 100644
--- a/Modules/IO/TestKernel/include/otbTestHelper.h
+++ b/Modules/IO/TestKernel/include/otbTestHelper.h
@@ -38,6 +38,8 @@ namespace otb
 /**
  * \class TestHelper
  * \brief Helper class to perform the baseline comparisons during the tests
+ *
+ * \ingroup OTBTestKernel
  */
 class ITK_ABI_EXPORT TestHelper : public itk::Object
 {
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
index 3e6554644a98990b27872847f94f291ea624ab28..84457d064bcff185ae64edcb6989aa14ce6e4dc0 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
@@ -26,6 +26,8 @@ namespace otb
 /** \class VectorDataFileReaderException
  *
  * \brief Base exception class for IO conflicts.
+ *
+ * \ingroup OTBVectorDataIO
  */
 class VectorDataFileReaderException : public itk::ExceptionObject
 {
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
index 143823e87e4decf47f2a25d8464163cfad5d7cac..598fcc3f8be59beab05650b0c8af4307933f3b18 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
@@ -27,6 +27,8 @@ namespace otb
 /** \brief Base exception class for IO problems during writing.
  *
  * \class ImageFileWriterException
+ *
+ * \ingroup OTBVectorDataIO
  */
 class VectorDataFileWriterException : public itk::ExceptionObject
 {
@@ -55,6 +57,8 @@ public:
  *  \brief This class writes vector data file format (shapefile and KML)
  *
  *  \ingroup IO
+ *
+ * \ingroup OTBVectorDataIO
  */
 
 template <class TInputVectorData>
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h b/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h
index 46132d242179d2d4a60fb883f3d64525f0490328..ed84fedfd32e8d64910f7a0e684153bf463e9048 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class VectorDataIOFactory
  * \brief Create instances of VectorDataIO objects using an object factory.
+ *
+ * \ingroup OTBVectorDataIO
  */
 class ITK_EXPORT VectorDataIOFactory : public itk::Object
 {
diff --git a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
index 12410b4197d2aed13c2ce3f5ce74402ca3f30dfb..427303d96f93c41c612feeb4ac44f50b37866285 100644
--- a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
+++ b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
@@ -44,6 +44,8 @@ namespace otb
  *  The MassOfBeliefDefinitionMethod indicates which parameter of the confusion matrix will
  *  stand for the mass of belief of each label (PRECISION, RECALL, ACCURACY, KAPPA).
  *
+ *
+ * \ingroup OTBDempsterShafer
  */
 
 template <class TConfusionMatrix = itk::VariableSizeMatrix<double>, class TLabel = int >
diff --git a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
index bf92111582c1fa609fc345fb8e26da9e106418ee..2c3810858082feca40b6b6296f7df821aa1fa964 100644
--- a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
@@ -59,6 +59,8 @@ namespace otb
  *  \sa MassOfBelief
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBDempsterShafer
  */
 template <class TInputImage, class TOutputImage, class TMaskImage = TOutputImage>
 class ITK_EXPORT DSFusionOfClassifiersImageFilter :
diff --git a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
index d6b4b9b36a6e4e09f2458ba3cbcfaa98071b6df7..de710025600e1ed117feed42bd24da595f488090 100644
--- a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
@@ -31,6 +31,8 @@ namespace otb
  *  Input masses can be added by using the PushBackInput() method.
  *
  *  \sa MassOfBelief
+ *
+ * \ingroup OTBDempsterShafer
  */
 template <class TMassFunction>
 class ITK_EXPORT JointMassOfBeliefFilter : public itk::ProcessObject
diff --git a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
index 38aa9dba6c003ac5ed821fbe4915f234a7803414..1c68d7bf171e1e441402273c7122b40a48b37450 100644
--- a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
+++ b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
@@ -80,6 +80,8 @@ namespace otb
  *  element of the power-set, or directly for a set of elements of the
  *  power-set intersecting (resp. contained in) a given hypothesis.
  *
+ *
+ * \ingroup OTBDempsterShafer
  */
 template <class TLabel = unsigned short, class TMass = double>
 class ITK_EXPORT MassOfBelief : public itk::DataObject
diff --git a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
index 8403a731198112db27cac465659274e1baeb79e3..7c3c11c362d22799f92c32639eec19777dda4283 100644
--- a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
+++ b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
@@ -47,6 +47,8 @@ namespace otb
   * \ingroup CostFunction
   * \sa VectorDataToDSValidatedVectorDataFilter
   * \sa AmoebaOptimizer
+ *
+ * \ingroup OTBDempsterShafer
  */
 
 template <class TDSValidationFilter>
diff --git a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
index ed1f0b38d5f10e2c3a9b23e423ec11bee5337dda..2fdec1e6698ad43b42dbdcb5ffed558dafb6ba15 100644
--- a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
@@ -66,6 +66,8 @@ namespace otb
   * \ingroup VectorDataFilter
   * \sa VectorDataToRoadDescriptionFilter
   * \sa VectorDataToBuildingDescriptionFilter
+ *
+ * \ingroup OTBDempsterShafer
  */
 
 template <class TVectorData, class TPrecision=float>
diff --git a/Modules/Learning/LearningBase/include/otbConfusionMatrixCalculator.h b/Modules/Learning/LearningBase/include/otbConfusionMatrixCalculator.h
index 178a1609fdf4277172c139e13095757b020051c3..5146fa01edaa0e24135c7f45946f9b98b8da4ad5 100644
--- a/Modules/Learning/LearningBase/include/otbConfusionMatrixCalculator.h
+++ b/Modules/Learning/LearningBase/include/otbConfusionMatrixCalculator.h
@@ -48,6 +48,8 @@ namespace otb
  *  In case of multiclasses problem, these measurements are extended by considering one class versus others.
  *
  *  Moreover overall accuracy and \f[ \kappa \f] index are computed.
+ *
+ * \ingroup OTBLearningBase
  */
 template <class TRefListLabel, class TProdListLabel>
 class ITK_EXPORT ConfusionMatrixCalculator :
diff --git a/Modules/Learning/LearningBase/include/otbConfusionMatrixMeasurements.h b/Modules/Learning/LearningBase/include/otbConfusionMatrixMeasurements.h
index 0ccfac6d659d702235e0fdd27c9ef82744c38042..206f04b84ad129cc20a932613a05b70a7f1948cf 100644
--- a/Modules/Learning/LearningBase/include/otbConfusionMatrixMeasurements.h
+++ b/Modules/Learning/LearningBase/include/otbConfusionMatrixMeasurements.h
@@ -43,6 +43,8 @@ namespace otb
  *
  *  Moreover overall accuracy and \f[ \kappa \f] index are computed.
  *
+ *
+ * \ingroup OTBLearningBase
  */
 template <class TConfusionMatrix = itk::VariableSizeMatrix<unsigned long>, class TLabel = int >
 class ITK_EXPORT ConfusionMatrixMeasurements :
diff --git a/Modules/Learning/LearningBase/include/otbDecisionTree.h b/Modules/Learning/LearningBase/include/otbDecisionTree.h
index ade43f63ac437b35592ae5ca2ee1d62c7dd61127..fc166c1006bb3dba5e11f4fccd3ef46e22f9bd03 100644
--- a/Modules/Learning/LearningBase/include/otbDecisionTree.h
+++ b/Modules/Learning/LearningBase/include/otbDecisionTree.h
@@ -50,6 +50,8 @@ namespace otb
  *
  * \sa DecisionTreeClassifier
  * \sa DecisionTreeEstimator
+ *
+ * \ingroup OTBLearningBase
  */
 
 template <class AttributeValueType, class LabelType>
diff --git a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
index 3c468d77fb85092975734a9d6c758fe55202f5f2..6937b06d517f6d1e3642c6d6512ba33207442b85 100644
--- a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
+++ b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
@@ -38,6 +38,8 @@ namespace Statistics
  * N/A
  *
  * \sa ModelComponentBase, SEMClassifier
+ *
+ * \ingroup OTBLearningBase
  */
 
 template<class TSample>
diff --git a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
index 62ef674433706dde4afd71af4f3465cbeb81734a..3471edfebd9768b498c8aba0dd908679901433e8 100644
--- a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
+++ b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * \sa Classifier
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBLearningBase
  */
 template <class TInputImage, class TOutputImage, class TMaskImage = TOutputImage>
 class ITK_EXPORT ImageClassificationFilter
diff --git a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
index 8e2f00bb84b5a4d3f83867bd7b60f91b3af1acdc..b8b95d5c28316c1e0fee8a7f70c126d8039c8b1b 100644
--- a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
+++ b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
@@ -35,6 +35,8 @@ namespace otb
  * \sa SVMClassifier
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBLearningBase
  */
 template <class TInputImage, class TOutputImage, unsigned int VMaxSampleDimension = 10, class TMaskImage = TOutputImage>
 class ITK_EXPORT KMeansImageClassificationFilter
diff --git a/Modules/Learning/LearningBase/include/otbMachineLearningModelFactory.h b/Modules/Learning/LearningBase/include/otbMachineLearningModelFactory.h
index 4c4a239354cb80a98f515a2e87af4d1a051de4b9..bec0f914d74963dbba5fcf05b3748609fd481ae4 100644
--- a/Modules/Learning/LearningBase/include/otbMachineLearningModelFactory.h
+++ b/Modules/Learning/LearningBase/include/otbMachineLearningModelFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class MachineLearningModelFactory
  * \brief Creation of object instance using object factory.
+ *
+ * \ingroup OTBLearningBase
  */
 template <class TInputValue, class TOutputValue>
 class ITK_EXPORT MachineLearningModelFactory : public MachineLearningModelFactoryBase
diff --git a/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h b/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h
index 7dd030c2f6d2e3693a7ffcb7e1eb9cb8d06560b9..cbf767e79102e731f48896992d2f6895e6449a66 100644
--- a/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h
+++ b/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h
@@ -28,6 +28,8 @@ namespace otb
  * This class intends to hold the static attributes that can not be
  * part of a template class (ld error).
  *
+ *
+ * \ingroup OTBLearningBase
  */
 class ITK_EXPORT MachineLearningModelFactoryBase : public itk::Object
 {
diff --git a/Modules/Learning/LearningBase/include/otbSEMClassifier.h b/Modules/Learning/LearningBase/include/otbSEMClassifier.h
index a186a364f1704b129c9946868a5676cad48b8491..604335743b719564fb1a6b683ade8c3955a73e89 100644
--- a/Modules/Learning/LearningBase/include/otbSEMClassifier.h
+++ b/Modules/Learning/LearningBase/include/otbSEMClassifier.h
@@ -36,6 +36,8 @@ namespace otb
    * N/A
    *
    * \sa ModelComponentBase, GaussianModelComponent
+ *
+ * \ingroup OTBLearningBase
  */
 template<class TInputImage, class TOutputImage>
 class ITK_EXPORT SEMClassifier
diff --git a/Modules/Learning/Markov/include/otbMRFEnergy.h b/Modules/Learning/Markov/include/otbMRFEnergy.h
index 8ad4fef5b39fc864306f2119eb6ceef43bcac5e9..a1830d5cbcfea7f004ce20dbd52e62baa8e6d5b9 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergy.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergy.h
@@ -33,6 +33,8 @@ namespace otb
  * This class is meant to be used in the MRF framework with the otb::MarkovRandomFieldFilter
  *
  * \ingroup Markov
+ *
+ * \ingroup OTBMarkov
  */
 template<class TInput1, class TInput2>
 class ITK_EXPORT MRFEnergy : public itk::Object
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h b/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
index 63fb2c94d14d927ebd2807719170c23f947f17e3..8fca36556d398d7a2135a578aba240ccd6836849 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
@@ -39,6 +39,8 @@ namespace otb
    * This class is meant to be used in the MRF framework with the otb::MarkovRandomFieldFilter
  *
  * \ingroup Markov
+ *
+ * \ingroup OTBMarkov
 */
 
 template<class TInput1, class TInput2>
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h b/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h
index dd4536b9314763f47bf2a3f8fa1da71805abacd3..ec8f2326257c2e400d9325727a74c64791e0f6fb 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h
@@ -37,6 +37,8 @@ namespace otb
  * This class is meant to be used in the MRF framework with the
  * otb::MarkovRandomFieldFilter
  *
+ *
+ * \ingroup OTBMarkov
  */
 template< class TInput1, class TInput2>
 class ITK_EXPORT MRFEnergyFisherClassification: public MRFEnergy< TInput1, TInput2>
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h b/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
index edf854a12e53551fd45a489aa7a61aca4f919da5..64a8b3be4690ea46b0815a558f290cfdf533132b 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
@@ -41,6 +41,8 @@ namespace otb
    * This class is meant to be used in the MRF framework with the otb::MarkovRandomFieldFilter
    *
  * \ingroup Markov
+ *
+ * \ingroup OTBMarkov
  */
 
 template<class TInput1, class TInput2>
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h b/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
index 27407fc2ea99549f4598084bc76dd4f264abd37a..f576df6b739f58dcbd521b2915f2a00436daa57c 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
@@ -38,6 +38,8 @@ namespace otb
    * This class is meant to be used in the MRF framework with the otb::MarkovRandomFieldFilter
    *
  * \ingroup Markov
+ *
+ * \ingroup OTBMarkov
  */
 
 template<class TInput1, class TInput2>
diff --git a/Modules/Learning/Markov/include/otbMRFEnergyPotts.h b/Modules/Learning/Markov/include/otbMRFEnergyPotts.h
index c6fdc3a847a9293b9440f1730a354a49da0a103a..108da52247b25c88b03a565cef63715e0ab301f3 100644
--- a/Modules/Learning/Markov/include/otbMRFEnergyPotts.h
+++ b/Modules/Learning/Markov/include/otbMRFEnergyPotts.h
@@ -39,6 +39,8 @@ namespace otb
    * This class is meant to be used in the MRF framework with the otb::MarkovRandomFieldFilter
    *
  * \ingroup Markov
+ *
+ * \ingroup OTBMarkov
  */
 
 template<class TInput1, class TInput2>
diff --git a/Modules/Learning/Markov/include/otbMRFOptimizer.h b/Modules/Learning/Markov/include/otbMRFOptimizer.h
index a7d082f7377310c12cf5535950b2f8053d8aeb2f..10878ea50fd56f92fc047154975c5fa8cb83d372 100644
--- a/Modules/Learning/Markov/include/otbMRFOptimizer.h
+++ b/Modules/Learning/Markov/include/otbMRFOptimizer.h
@@ -33,6 +33,8 @@ namespace otb
  * This class is meant to be used in the MRF framework with the otb::MarkovRandomFieldFilter
  *
  * \ingroup Markov
+ *
+ * \ingroup OTBMarkov
  */
 
 class ITK_EXPORT MRFOptimizer : public itk::Object
diff --git a/Modules/Learning/Markov/include/otbMRFOptimizerICM.h b/Modules/Learning/Markov/include/otbMRFOptimizerICM.h
index 2f10ff4e2949b44797000a880e3033dd85483375..c14e9d8ddcdfd6a6f6f62c63c70cf60a49535607 100644
--- a/Modules/Learning/Markov/include/otbMRFOptimizerICM.h
+++ b/Modules/Learning/Markov/include/otbMRFOptimizerICM.h
@@ -33,6 +33,8 @@ namespace otb
    * This class is meant to be used in the MRF framework with the otb::MarkovRandomFieldFilter
    *
  * \ingroup Markov
+ *
+ * \ingroup OTBMarkov
  */
 class ITK_EXPORT MRFOptimizerICM : public MRFOptimizer
 {
diff --git a/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h b/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h
index 3432846888c2e35167ee8523100b66c6e84ad605..8723fca4f22c7e2b48e7247b6f1bcc4181e2e93d 100644
--- a/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h
+++ b/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h
@@ -41,6 +41,8 @@ namespace otb
  * This class is meant to be used in the MRF framework with the otb::MarkovRandomFieldFilter
  *
  * \ingroup Markov
+ *
+ * \ingroup OTBMarkov
  */
 
 class ITK_EXPORT MRFOptimizerMetropolis : public MRFOptimizer
diff --git a/Modules/Learning/Markov/include/otbMRFSampler.h b/Modules/Learning/Markov/include/otbMRFSampler.h
index c3695ec1b5ea3ca681515d42ed40bdfca4e4073a..d07a9d7ddc1f3335de84bb13de20ef003d27cf09 100644
--- a/Modules/Learning/Markov/include/otbMRFSampler.h
+++ b/Modules/Learning/Markov/include/otbMRFSampler.h
@@ -33,6 +33,8 @@ namespace otb
    * This class is meant to be used in the MRF framework with the otb::MarkovRandomFieldFilter
    *
    * \ingroup Markov
+ *
+ * \ingroup OTBMarkov
  */
 
 template<class TInput1, class TInput2>
diff --git a/Modules/Learning/Markov/include/otbMRFSamplerMAP.h b/Modules/Learning/Markov/include/otbMRFSamplerMAP.h
index 4a0f95f831006ddf74a7f11e8cc0c136db48d581..e24ca281d3fca843f546f134b071660d817af890 100644
--- a/Modules/Learning/Markov/include/otbMRFSamplerMAP.h
+++ b/Modules/Learning/Markov/include/otbMRFSamplerMAP.h
@@ -34,6 +34,8 @@ namespace otb
    * This class is meant to be used in the MRF framework with the otb::MarkovRandomFieldFilter
    *
    * \ingroup Markov
+ *
+ * \ingroup OTBMarkov
  */
 
 template<class TInput1, class TInput2>
diff --git a/Modules/Learning/Markov/include/otbMRFSamplerRandom.h b/Modules/Learning/Markov/include/otbMRFSamplerRandom.h
index f359d605076fea1c23739bd677b706da8a832f95..fbd9f3a95bcf7750a5ee64db5ff0b07e8a30ed9b 100644
--- a/Modules/Learning/Markov/include/otbMRFSamplerRandom.h
+++ b/Modules/Learning/Markov/include/otbMRFSamplerRandom.h
@@ -35,6 +35,8 @@ namespace otb
    * This class is meant to be used in the MRF framework with the otb::MarkovRandomFieldFilter
    *
    * \ingroup Markov
+ *
+ * \ingroup OTBMarkov
  */
 
 template<class TInput1, class TInput2>
diff --git a/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h b/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h
index a94684f1c05ca26e6ff5310f22f8bfb180ec4f9d..284b6203386e25cdabc0bff947f95fb691aaf869 100644
--- a/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h
+++ b/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h
@@ -41,6 +41,8 @@ namespace otb
    * This class is meant to be used in the MRF framework with the otb::MarkovRandomFieldFilter
    *
    * \ingroup Markov
+ *
+ * \ingroup OTBMarkov
  */
 
 template<class TInput1, class TInput2>
diff --git a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
index e1be74de96fd3804231bd21542acc2668144953b..78e06ce7d26bfaa3da877b7e8be3e56d641979fa 100644
--- a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
+++ b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
@@ -74,6 +74,8 @@ namespace otb
  * \example  Markov/MarkovRegularizationExample.cxx
  * \example  Markov/MarkovRestaurationExample.cxx
  *
+ *
+ * \ingroup OTBMarkov
  */
 
 template <class TInputImage, class TClassifiedImage>
diff --git a/Modules/Learning/SOM/include/otbCzihoSOMLearningBehaviorFunctor.h b/Modules/Learning/SOM/include/otbCzihoSOMLearningBehaviorFunctor.h
index 9a8db5c856bca1390e88d5162f6d10884a23b04b..7a68fa6476b91bcec72b558fbacd5ce993e590ea 100644
--- a/Modules/Learning/SOM/include/otbCzihoSOMLearningBehaviorFunctor.h
+++ b/Modules/Learning/SOM/include/otbCzihoSOMLearningBehaviorFunctor.h
@@ -56,6 +56,8 @@ namespace Functor
 *  why it is necessary to call a specific method for \code IterationThreshold \endcode intialization.
 *
 *  \sa SOM
+ *
+ * \ingroup OTBSOM
 */
 
 class CzihoSOMLearningBehaviorFunctor
diff --git a/Modules/Learning/SOM/include/otbCzihoSOMNeighborhoodBehaviorFunctor.h b/Modules/Learning/SOM/include/otbCzihoSOMNeighborhoodBehaviorFunctor.h
index 58bebabd4cd8d743172c0ed0d01079826076d117..a81df3e33962587b325e28fcc1ae3b5b0de7b3e4 100644
--- a/Modules/Learning/SOM/include/otbCzihoSOMNeighborhoodBehaviorFunctor.h
+++ b/Modules/Learning/SOM/include/otbCzihoSOMNeighborhoodBehaviorFunctor.h
@@ -48,6 +48,8 @@ namespace Functor
 *  \code operator() \endcode is templated with the dimension of the neighborhoodSize.
 *
 *  \sa SOM
+ *
+ * \ingroup OTBSOM
 */
 class CzihoSOMNeighborhoodBehaviorFunctor
 {
diff --git a/Modules/Learning/SOM/include/otbPeriodicSOM.h b/Modules/Learning/SOM/include/otbPeriodicSOM.h
index d149b69e318f640553a93a71bfba111568c9a1cc..7bc01e4abba9524fabbddc3b6ab46993a3e004d2 100644
--- a/Modules/Learning/SOM/include/otbPeriodicSOM.h
+++ b/Modules/Learning/SOM/include/otbPeriodicSOM.h
@@ -51,6 +51,8 @@ namespace otb
  * \sa SOMActivationBuilder
  * \sa CzihoSOMLearningBehaviorFunctor
  * \sa CzihoSOMNeighborhoodBehaviorFunctor
+ *
+ * \ingroup OTBSOM
  */
 template <class TListSample, class TMap,
     class TSOMLearningBehaviorFunctor = Functor::CzihoSOMLearningBehaviorFunctor,
diff --git a/Modules/Learning/SOM/include/otbSOM.h b/Modules/Learning/SOM/include/otbSOM.h
index e9bab0d5064423bd3c99b1948fd5232d8295e1e9..7205dc75b77a478467cdb83f378fb9a986c10a2d 100644
--- a/Modules/Learning/SOM/include/otbSOM.h
+++ b/Modules/Learning/SOM/include/otbSOM.h
@@ -50,6 +50,8 @@ namespace otb
  * \sa SOMActivationBuilder
  * \sa CzihoSOMLearningBehaviorFunctor
  * \sa CzihoSOMNeighborhoodBehaviorFunctor
+ *
+ * \ingroup OTBSOM
  */
 template <class TListSample, class TMap,
     class TSOMLearningBehaviorFunctor = Functor::CzihoSOMLearningBehaviorFunctor,
diff --git a/Modules/Learning/SOM/include/otbSOMActivationBuilder.h b/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
index aea26802cc90f73f4edb93820a2d4d11ba5473e1..3232e4d9c57d7cf4a5ee2cee632b9b5f40c8c027 100644
--- a/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
+++ b/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
@@ -31,6 +31,8 @@ namespace otb
  *
  * \sa SOMMap
  * \sa SOM
+ *
+ * \ingroup OTBSOM
  */
 template <class TListSample, class TInputMap, class TOutputImage>
 class ITK_EXPORT SOMActivationBuilder
diff --git a/Modules/Learning/SOM/include/otbSOMClassifier.h b/Modules/Learning/SOM/include/otbSOMClassifier.h
index 06c0b9b870dc67a0996edee39cd1ce004f8c1035..d2f3b1f450fe5cd8a680eda720ab805128aca7e7 100644
--- a/Modules/Learning/SOM/include/otbSOMClassifier.h
+++ b/Modules/Learning/SOM/include/otbSOMClassifier.h
@@ -36,6 +36,8 @@ namespace otb
  * instead of itk::SampleClassifierBase.
  *
  * \sa SOM, SOMMap, SOMActivationBuilder.
+ *
+ * \ingroup OTBSOM
  */
 
 template<class TSample, class TSOMMap, class TLabel>
diff --git a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
index 008ba063b36ab45b073e15c033ae99252346dc4f..111d470af625c2940263389763026f4179654b5b 100644
--- a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
+++ b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
@@ -35,6 +35,8 @@ namespace otb
  * \sa SVMClassifier
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBSOM
  */
 template <class TInputImage, class TOutputImage, class TSOMMap, class TMaskImage = TOutputImage>
 class ITK_EXPORT SOMImageClassificationFilter
diff --git a/Modules/Learning/SOM/include/otbSOMLearningBehaviorFunctor.h b/Modules/Learning/SOM/include/otbSOMLearningBehaviorFunctor.h
index e80988bd1689ee5caf374bb20ce3b93f3e6e3108..3db9aec74fbd8b55739c9a0f0af6891cf602bef6 100644
--- a/Modules/Learning/SOM/include/otbSOMLearningBehaviorFunctor.h
+++ b/Modules/Learning/SOM/include/otbSOMLearningBehaviorFunctor.h
@@ -39,6 +39,8 @@ namespace Functor
   \f]
 *
 *  \sa SOM
+ *
+ * \ingroup OTBSOM
 */
 class SOMLearningBehaviorFunctor
 {
diff --git a/Modules/Learning/SOM/include/otbSOMMap.h b/Modules/Learning/SOM/include/otbSOMMap.h
index 8f8ff2c4eb3bae0986c6d29331712f1cb4288074..00276472de2b5328775d3f2f410ce88560a09572 100644
--- a/Modules/Learning/SOM/include/otbSOMMap.h
+++ b/Modules/Learning/SOM/include/otbSOMMap.h
@@ -44,6 +44,8 @@ namespace otb
  *
  * \sa SOM
  * \sa SOMActivationBuilder
+ *
+ * \ingroup OTBSOM
  */
 template <class TNeuron = itk::VariableLengthVector<double>,
           class TDistance = itk::Statistics::EuclideanDistanceMetric<TNeuron>,
diff --git a/Modules/Learning/SOM/include/otbSOMWithMissingValue.h b/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
index 47870321ab7b7c9ee96ba084e1ebda73cf82afde..94219310f6d267a00b238c2f9a5774ca9adf7fa7 100644
--- a/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
+++ b/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
@@ -39,6 +39,8 @@ namespace otb
  *  \sa SOMMap
  *  \sa PeriodicSOM
  *  \sa EuclideanDistanceMetricWithMissingValue
+ *
+ * \ingroup OTBSOM
  */
 template <class TListSample, class TMap,
     class TSOMLearningBehaviorFunctor = Functor::CzihoSOMLearningBehaviorFunctor,
diff --git a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
index 77d61dbe6cdf473eca839e6bb9b7519252262e51..0c9dba7c8ee8bd6d6ea3f2386857786c8f2bc5ea 100644
--- a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
+++ b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
@@ -34,6 +34,8 @@ namespace Functor {
  *
  *  On the contrary to SOMClassifier, it does not yield labels but the
  *  value of the winning neurons. Also, it is threaded...
+ *
+ * \ingroup OTBSOM
  */
 template <class TInput, class TOutput, class TDistanceMetric, class TMap>
 class ITK_EXPORT SOMbasedImageFilterFunctor
@@ -93,6 +95,8 @@ private:
  *
  * \ingroup Streamed
  * \sa EuclideanDistanceMetricWithMissingValue
+ *
+ * \ingroup OTBSOM
  */
 template <class TInputImage, class TOutputImage,
     class TDistanceMetric, class TMap>
diff --git a/Modules/Learning/SVMLearning/include/otbChangeProfileKernelFunctor.h b/Modules/Learning/SVMLearning/include/otbChangeProfileKernelFunctor.h
index 013ebc8c84420714d5da1a69a1007b02187ca736..3a9d13b2ddaa107f89e73d5553ecd5b89d21c415 100644
--- a/Modules/Learning/SVMLearning/include/otbChangeProfileKernelFunctor.h
+++ b/Modules/Learning/SVMLearning/include/otbChangeProfileKernelFunctor.h
@@ -20,7 +20,7 @@
 #ifndef __otbChangeProfileKernelFunctor_h
 #define __otbChangeProfileKernelFunctor_h
 
-#include "svm.h"
+#include "otb_libsvm.h"
 
 namespace otb
 {
@@ -38,6 +38,8 @@ namespace otb
  * The parameters \f$ \gamma \f$, \f$ \textrm{coef} \f$ and \f$ \textrm{degree} \f$ are
  * to be fixed through \code SetValue \endcode with keywords: Gamma (def 1.0),
  * Coef (def 1.0) and Degree (def 1.0).
+ *
+ * \ingroup OTBSVMLearning
  */
 
 class ChangeProfileKernelFunctor
diff --git a/Modules/Learning/SVMLearning/include/otbExhaustiveExponentialOptimizer.h b/Modules/Learning/SVMLearning/include/otbExhaustiveExponentialOptimizer.h
index 36783c6ac5442c8c2cd3ab4e438c865b9d2f0e62..ed26781f16a8696c3228f73f1a8e53d05f90eabd 100644
--- a/Modules/Learning/SVMLearning/include/otbExhaustiveExponentialOptimizer.h
+++ b/Modules/Learning/SVMLearning/include/otbExhaustiveExponentialOptimizer.h
@@ -38,6 +38,8 @@ namespace otb
  * the search space.
  *
  * \ingroup Numerics Optimizers
+ *
+ * \ingroup OTBSVMLearning
  */
 class ITK_EXPORT ExhaustiveExponentialOptimizer :
   public itk::SingleValuedNonLinearOptimizer
diff --git a/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.h b/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.h
index cb516724994531729d6bcf408d3d8e4d0dd1ffc9..b289706f3d4f4072bdf638f29117c04af7ced39e 100644
--- a/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.h
+++ b/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.h
@@ -31,6 +31,8 @@ namespace otb {
  * \sa otb::AttributesMapLabelObject
  * \sa otb::SVMModel
  * \sa itk::InPlaceLabelMapFilter
+ *
+ * \ingroup OTBSVMLearning
  */
 template<class TInputLabelMap>
 class ITK_EXPORT LabelMapSVMClassifier :
diff --git a/Modules/Learning/SVMLearning/include/otbLibSVMMachineLearningModelFactory.h b/Modules/Learning/SVMLearning/include/otbLibSVMMachineLearningModelFactory.h
index 69fae9daa999f32e0ef5ad1d809f8df06fa17663..dd58492d46a8dc228f73e024742ae2a188a1bc9d 100644
--- a/Modules/Learning/SVMLearning/include/otbLibSVMMachineLearningModelFactory.h
+++ b/Modules/Learning/SVMLearning/include/otbLibSVMMachineLearningModelFactory.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class LibSVMMachineLearningModelFactory
  * \brief Creation d'un instance d'un objet SVMMachineLearningModel utilisant les object factory.
+ *
+ * \ingroup OTBSVMLearning
  */
 template <class TInputValue, class TTargetValue>
 class ITK_EXPORT LibSVMMachineLearningModelFactory : public itk::ObjectFactoryBase
diff --git a/Modules/Learning/SVMLearning/include/otbMixturePolyRBFKernelFunctor.h b/Modules/Learning/SVMLearning/include/otbMixturePolyRBFKernelFunctor.h
index c72ca73491e12bf61100be4cc07a81c219f5c081..9af23edab84647f999ca13fd1ca1ebfb8933d19f 100644
--- a/Modules/Learning/SVMLearning/include/otbMixturePolyRBFKernelFunctor.h
+++ b/Modules/Learning/SVMLearning/include/otbMixturePolyRBFKernelFunctor.h
@@ -20,7 +20,7 @@
 #ifndef __otbMixturePolyRBFKernelFunctor_h
 #define __otbMixturePolyRBFKernelFunctor_h
 
-#include "svm.h"
+#include "otb_libsvm.h"
 
 namespace otb
 {
@@ -36,6 +36,8 @@ namespace otb
  * Variable to be instanciated (through \code SetValue \endcode) are:
  * Mixture (def=0.5), GammaPoly (def=1.0), CoefPoly (def=1.0),
  * DegreePoly (def=2), GammaRBF (def=1.0)
+ *
+ * \ingroup OTBSVMLearning
  */
 
 class MixturePolyRBFKernelFunctor
diff --git a/Modules/Learning/SVMLearning/include/otbNonGaussianRBFKernelFunctor.h b/Modules/Learning/SVMLearning/include/otbNonGaussianRBFKernelFunctor.h
index 6504e29c23e8d3ac22a74e6c2a91dacd25fc4e2b..c7f6bb6db09e48a7c24a2cdd27b2e6f98aa3f759 100644
--- a/Modules/Learning/SVMLearning/include/otbNonGaussianRBFKernelFunctor.h
+++ b/Modules/Learning/SVMLearning/include/otbNonGaussianRBFKernelFunctor.h
@@ -20,7 +20,7 @@
 #ifndef __otbNonGaussianRBFKernelFunctor_h
 #define __otbNonGaussianRBFKernelFunctor_h
 
-#include "svm.h"
+#include "otb_libsvm.h"
 
 //FIXME: shouldn't it be in the Functor namespace?
 namespace otb
@@ -36,6 +36,8 @@ namespace otb
  * Variables to be instanciated (through \code SetValue \endcode) are:
  * Alpha (def=1), Beta (def=2) and Gamma (def 1.0).
  *
+ *
+ * \ingroup OTBSVMLearning
  */
 class NonGaussianRBFKernelFunctor
   : public GenericKernelFunctorBase
diff --git a/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.h b/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.h
index 8412da536037de8be1ff64db7a432a38dee5f574..0e68eb52acb02cd16f0fd87480f20f648033b3d3 100644
--- a/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.h
+++ b/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.h
@@ -50,6 +50,8 @@ public:
  *  This class inherits PersistentImageFilter and provides the Reset/Synthesize functions,
  *  plus the ThreadedGenerateData function implementing the image function evaluation
  *
+ *
+ * \ingroup OTBSVMLearning
  */
 template <class TInputImage, class TOutputVectorData, class TLabel, class TFunctionType>
 class ITK_EXPORT PersistentObjectDetectionClassifier :
@@ -241,6 +243,8 @@ private:
  *  the negative class label being given by SetNoClassLabel()
  *
  *  This class is streaming capable and multithreaded
+ *
+ * \ingroup OTBSVMLearning
  */
 template <class TInputImage, class TOutputVectorData, class TLabel, class TFunctionPrecision = double, class TCoordRep = double>
 class ITK_EXPORT ObjectDetectionClassifier :
diff --git a/Modules/Learning/SVMLearning/include/otbSVMClassifier.h b/Modules/Learning/SVMLearning/include/otbSVMClassifier.h
index 6fde8f66c713c4f9d910719527e7b3697e8b6cf9..6fa702f200f00b61fe25f8a48d34d9a7317d6334 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMClassifier.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMClassifier.h
@@ -52,6 +52,8 @@ namespace otb
  * \sa LibSVMMachineLearningModel
  * \sa ImageClassificationFilter
  *
+ *
+ * \ingroup OTBSVMLearning
  */
 
 template<class TSample, class TLabel>
diff --git a/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h b/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h
index 341b9443444919582057d79a34e758c6b3b3c259..f679cf212a2e30ffe71efa492ec11b219eb944fc 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h
@@ -44,6 +44,8 @@ namespace otb
  * compute the partial derivatives. as such, it can be quite intensive.
  *
  * \ingroup ClassificationFilters
+ *
+ * \ingroup OTBSVMLearning
  */
 template <class TModel>
 class ITK_EXPORT SVMCrossValidationCostFunction
diff --git a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.h b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.h
index c60087e7c4014c00f698480081994d4d99b84824..197f7b536e2c856ae63dcccc797e76a40773e0fc 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.h
@@ -39,6 +39,8 @@ namespace otb
  *
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBSVMLearning
  */
 template <class TInputImage, class TOutputImage, class TMaskImage = TOutputImage>
 class ITK_EXPORT SVMImageClassificationFilter
diff --git a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
index 080d95236b1442b5993b37ecff118402771d21b0..55c06dba46c3fee96df10cb48f18247017981abe 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
@@ -37,6 +37,8 @@ namespace otb {
  * \sa SVMImageClassificationFilter
  * \ingroup Streamed
  * \ingroup Threaded
+ *
+ * \ingroup OTBSVMLearning
  */
 template <class TInputImage, class TOutputImage, class TMaskImage = TOutputImage>
 class ITK_EXPORT SVMImageClassificationWithRuleFilter
diff --git a/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.h b/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.h
index b9b93dc5ddaf487ad51298be748a0f8618204e5e..86232de21a17149507a6a06655f910ed136350df 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.h
@@ -49,6 +49,8 @@ namespace otb
  * \sa ImageClassificationFilter
  *
  * \ingroup ClassificationFilters
+ *
+ * \ingroup OTBSVMLearning
  */
 template <class TInputImage, class TTrainingImage>
 class ITK_EXPORT SVMImageModelEstimator :
diff --git a/Modules/Learning/SVMLearning/include/otbSVMKernels.h b/Modules/Learning/SVMLearning/include/otbSVMKernels.h
index e8c2fa777e1465e9809a2fb10f96b70dcde8fe7e..21b88af5473dd6e3df5e4c39210e8f0bc6c1cf63 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMKernels.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMKernels.h
@@ -31,12 +31,14 @@
 #include "otbNonGaussianRBFKernelFunctor.h"
 #include "otbMixturePolyRBFKernelFunctor.h"
 
-#include "svm.h"
+#include "otb_libsvm.h"
 
 namespace otb
 {
 /** \class CustomKernelFunctor
  * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class CustomKernelFunctor : public GenericKernelFunctorBase
 {
@@ -77,6 +79,8 @@ protected:
 
 /** \class InvMultiQuadricKernelFunctor
  * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class InvMultiQuadricKernelFunctor : public GenericKernelFunctorBase
 {
@@ -126,6 +130,8 @@ private:
 
 /** \class KModKernelFunctor
  * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class KModKernelFunctor : public GenericKernelFunctorBase
 {
@@ -176,6 +182,8 @@ private:
 
 /** \class SAMKernelFunctor
  * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class SAMKernelFunctor : public GenericKernelFunctorBase
 {
@@ -222,6 +230,8 @@ protected:
 
 /** \class RadialSAMKernelFunctor
   * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class RadialSAMKernelFunctor : public GenericKernelFunctorBase
 {
@@ -265,6 +275,8 @@ private:
 
 /** \class InverseCosSAMKernelFunctor
   * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class InverseCosSAMKernelFunctor : public GenericKernelFunctorBase
 {
@@ -308,6 +320,8 @@ private:
 
 /** \class InvMultiQuadraticSAMKernelFunctor
   * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class InvMultiQuadraticSAMKernelFunctor : public GenericKernelFunctorBase
 {
@@ -358,6 +372,8 @@ private:
 
 /** \class KModSAMKernelFunctor
   * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class KModSAMKernelFunctor : public GenericKernelFunctorBase
 {
@@ -408,6 +424,8 @@ private:
 
 /** \class RBFKernelFunctor
   * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class RBFKernelFunctor : public GenericKernelFunctorBase
 {
@@ -526,6 +544,8 @@ private:
 
 /** \class RBFRBFSAMKernelFunctor
 * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class RBFRBFSAMKernelFunctor : public GenericKernelFunctorBase
 {
@@ -572,6 +592,8 @@ private:
 
 /** \class PolyRBFSAMKernelFunctor
 * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class PolyRBFSAMKernelFunctor : public GenericKernelFunctorBase
 {
@@ -619,6 +641,8 @@ private:
 
 /** \class RBFDiffKernelFunctor
 * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class RBFDiffKernelFunctor : public GenericKernelFunctorBase
 {
@@ -677,6 +701,8 @@ protected:
 
 /** \class CustomLinearKernelFunctor
 * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class CustomLinearKernelFunctor : public GenericKernelFunctorBase
 {
@@ -726,6 +752,8 @@ private:
 
 /** \class GroupedRBFKernelFunctor
 * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class GroupedRBFKernelFunctor : public GenericKernelFunctorBase
 {
@@ -905,6 +933,8 @@ private:
 
 /** \class GroupingAdaptiveKernelFunctor
  * \brief Undocumented
+ *
+ * \ingroup OTBSVMLearning
  */
 class GroupingAdaptiveKernelFunctor : public GenericKernelFunctorBase
 {
diff --git a/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.h b/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.h
index 307f562755abbad81b8570966ed068c9b69c5425..4c41bcd68a93fae161b8436cda7ce7e7b51f4a14 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.h
@@ -27,6 +27,8 @@ namespace otb
 /** \class SVMMarginSampler
  *  \brief Implement one iteration of active learning by margin
  *  \ingroup ActiveLearningFilters
+ *
+ * \ingroup OTBSVMLearning
  */
 
 template< class TSample, class TModel >
diff --git a/Modules/Learning/SVMLearning/include/otbSVMModel.h b/Modules/Learning/SVMLearning/include/otbSVMModel.h
index 3eda6adff65d63867529d4c51db40b5906d4c221..a175bbd488686d760c3ab156423abf58779b9ebb 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMModel.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMModel.h
@@ -21,8 +21,8 @@
 #include "itkObjectFactory.h"
 #include "itkDataObject.h"
 #include "itkVariableLengthVector.h"
-#include "svm.h"
 #include "itkTimeProbe.h"
+#include "otb_libsvm.h"
 
 namespace otb
 {
@@ -54,6 +54,8 @@ namespace otb
 
  *
  * \ingroup ClassificationFilters
+ *
+ * \ingroup OTBSVMLearning
  */
 template <class TValue, class TLabel>
 class ITK_EXPORT SVMModel : public itk::DataObject
diff --git a/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.h b/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.h
index e97adb9943a21d96c9be2897a87dd9fc359193db..0c738baffa0d94e0e793e20a2ae7b47f9dde1f45 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.h
@@ -52,6 +52,8 @@ namespace otb
  *
  *
  * \ingroup ClassificationFilters
+ *
+ * \ingroup OTBSVMLearning
  */
 template <class InputPixelType, class LabelPixelType>
 class ITK_EXPORT SVMModelEstimator : public itk::ProcessObject
diff --git a/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.h b/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.h
index 3194172d945b1879a22bb95c6ee38a0fbb7a5d2e..8f7799c71de17211ac7d72b7a826146c3d629eff 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.h
@@ -49,6 +49,8 @@ namespace otb
  * \sa ImageClassificationFilter
  *
  * \ingroup ClassificationFilters
+ *
+ * \ingroup OTBSVMLearning
  */
 template <class TInputPointSet, class TTrainingPointSet>
 class ITK_EXPORT SVMPointSetModelEstimator :
diff --git a/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.h b/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.h
index 911963f8064f6c8c959cba161b6029e9982e69b9..6b86a2ada6e034c84040bd59f1ae07adf9de851b 100644
--- a/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.h
+++ b/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.h
@@ -34,6 +34,8 @@ namespace Functor
 *
 *   \sa Vector
 *   \sa FixedArray
+ *
+ * \ingroup OTBSVMLearning
 */
 template <class TVector>
 class VectorToMeasurementVectorFunctor
@@ -58,6 +60,8 @@ public:
 *   \brief Helper class to convert itk::VariableLengthVector samples to internal
 *   training vector type.
 *   \sa VariableLengthVector
+ *
+ * \ingroup OTBSVMLearning
 */
 template <class TVector>
 class VariableLengthVectorToMeasurementVectorFunctor
@@ -104,6 +108,8 @@ public:
  * \sa ImageClassificationFilter
  *
  * \ingroup ClassificationFilters
+ *
+ * \ingroup OTBSVMLearning
  */
 template <class TInputSampleList,
     class TTrainingSampleList, class TMeasurementFunctor =
diff --git a/Modules/Learning/SVMLearning/include/otbSpectralAngleKernelFunctor.h b/Modules/Learning/SVMLearning/include/otbSpectralAngleKernelFunctor.h
index c4ffafcecd6b0b536e3e8e2f940082f2d8c6e605..e1578db9ca45731def1bea13bcd9144d6f0937f2 100644
--- a/Modules/Learning/SVMLearning/include/otbSpectralAngleKernelFunctor.h
+++ b/Modules/Learning/SVMLearning/include/otbSpectralAngleKernelFunctor.h
@@ -20,7 +20,7 @@
 #ifndef __otbSpectralAngleKernelFunctor_h
 #define __otbSpectralAngleKernelFunctor_h
 
-#include "svm.h"
+#include "otb_libsvm.h"
 
 namespace otb
 {
@@ -40,6 +40,8 @@ namespace otb
  * The only parameter \f$ c_0 \f$ is to be fixed by the \code SetValue \endcode
  * interface with keyword Coef (def 2.0).
  *
+ *
+ * \ingroup OTBSVMLearning
  */
 
 class SpectralAngleKernelFunctor
diff --git a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
index d35fbb05d7cea5e693b34ebacd73da96107fd047..b5d7690740717ee781b14ed523b974ba22533568 100644
--- a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
@@ -26,6 +26,8 @@ namespace otb
 /** \class ImageListToRCC8GraphFilter
  * \brief Base class for filters taking an images list as input to
  * produce a RCC8 graph.
+ *
+ * \ingroup OTBRCC8
  */
 template <class TInputImage, class TOutputGraph>
 class ITK_EXPORT ImageListToRCC8GraphFilter
diff --git a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
index a5e75f811f957fe97ca45a112d4f9690778cb1c6..7b91712135f66f52e34ad400bbb1463d7a6c5a4f 100644
--- a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
@@ -26,6 +26,8 @@ namespace otb
  * \class ImageMultiSegmentationToRCC8GraphFilter
  * \brief This class takes a list of labelled segmentation images
  * and build the RCC8 graph of the set of regions it represents.
+ *
+ * \ingroup OTBRCC8
  */
 template <class TInputImage, class TOutputGraph>
 class ITK_EXPORT ImageMultiSegmentationToRCC8GraphFilter
diff --git a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
index 2ef6a649eb476c25a34a0bbcc4b43cca5d1a2fe9..38ef31760ebbc92dabe78edf18f0d0ef5c67bad7 100644
--- a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
+++ b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
@@ -45,6 +45,8 @@ namespace otb
  * by the segmentation images. Since this class will further be used iteratively on a possibly large set
  * of region, it is optimised : the decision is managed by a decision tree, and the input data size is reduced
  * to the smallest set needed to determine the relation.
+ *
+ * \ingroup OTBRCC8
  */
 template <class TInputImage>
 class ITK_EXPORT ImageToImageRCC8Calculator : public itk::ImageToImageFilter<TInputImage, TInputImage>
diff --git a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
index 7bb7493b081e963639c2539546f48417f070b3e3..e176bd0a34884ccd46dff9cc9759f7386b10cd25 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
@@ -30,6 +30,8 @@ namespace otb
  * \class PolygonListToRCC8GraphFilter
  * \brief This class computes an RCC8 graph from a set of polygons.
  * \sa ImageMultiSegmentationToRCC8GraphFilter
+ *
+ * \ingroup OTBRCC8
  */
 template <class TPolygonList, class TOutputGraph>
 class ITK_EXPORT PolygonListToRCC8GraphFilter
diff --git a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
index 39404ec25167f7ca6a583036486ef9c086a0955b..eb3fb5625c444e814c4d03c28bd35d65e4919149 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
+++ b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
@@ -43,6 +43,8 @@ namespace otb
  * The goal of this class is to determine which of these 8 relations link the two inputs regions represented
  * by the closed input path. Since this class will further be used iteratively on a possibly large set
  * of regiosn, it is optimised : the decision is managed by a decision tree.
+ *
+ * \ingroup OTBRCC8
  */
 template <class TInputPolygon>
 class ITK_EXPORT PolygonToPolygonRCC8Calculator : public itk::Object
diff --git a/Modules/OBIA/RCC8/include/otbRCC8Edge.h b/Modules/OBIA/RCC8/include/otbRCC8Edge.h
index fe22bea2605ab73776bb81af702f3a07eb0afe02..ade79be2262bea92f9e3058c89794a325d9c193c 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8Edge.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8Edge.h
@@ -28,6 +28,8 @@ namespace otb
  *  \brief Base class to represent an edge in a RCC8 Graph.
  *
  * \sa RCC8Graph, RCC8VertexBase
+ *
+ * \ingroup OTBRCC8
  */
 class ITK_EXPORT RCC8Edge : public itk::DataObject
 {
diff --git a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
index c4bfd5b9aa6e096d5a7b211db4ebbfb795af7950..b7d99e51d956135a628f9b33cdc13b732461c8f4 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
@@ -25,6 +25,8 @@ namespace otb
 /**
  * \class RCC8EdgeIterator
  * \brief Iterates on the graph edges.
+ *
+ * \ingroup OTBRCC8
  */
 template <class TGraph>
 class ITK_EXPORT RCC8EdgeIterator
diff --git a/Modules/OBIA/RCC8/include/otbRCC8Graph.h b/Modules/OBIA/RCC8/include/otbRCC8Graph.h
index b5c84311ddb6cad14d4596b471a44a7f62426d70..5ba16f14cab9343bd39a7e53cbff87663194287b 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8Graph.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8Graph.h
@@ -46,6 +46,8 @@ namespace otb
  * should remember that if a peculiar operation is needed for some
  * applications, one should provide a patch for this class including
  * the new functionnalities, for consistency reason.
+ *
+ * \ingroup OTBRCC8
  */
 template <class TVertex>
 class ITK_EXPORT RCC8Graph  :
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
index 9e1ff305451f768cea66e5ab6c0babf751aecad9..0ebecc6f7ff2d839828e1a2bc70355403c0a6981 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
@@ -25,6 +25,8 @@ namespace otb
 {
 /** \class RCC8GraphFileReaderException
  * \brief Base exception class for IO problems during reading.
+ *
+ * \ingroup OTBRCC8
  */
 class ITK_EXPORT RCC8GraphFileReaderException
   : public itk::ExceptionObject
@@ -55,6 +57,8 @@ public:
  *
  * \sa RCC8GraphFileWriter
  * \sa RCC8Graph
+ *
+ * \ingroup OTBRCC8
  */
 template <class TOutputGraph>
 class ITK_EXPORT RCC8GraphFileReader : public RCC8GraphSource<TOutputGraph>
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
index 7b6b8db94ba76d24e92f6bc8145e4430173f5dbb..cecf668da27ff86a7dd09493f85939578f2cfe19 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
@@ -26,6 +26,8 @@ namespace otb
 {
 /** \class RCC8GraphFileWriterException
  * \brief Base exception class for IO problems during writing.
+ *
+ * \ingroup OTBRCC8
  */
 class ITK_EXPORT RCC8GraphFileWriterException
   : public itk::ExceptionObject
@@ -57,6 +59,8 @@ public:
  *
  * \sa RCC8GraphFileReader
  * \sa RCC8Graph
+ *
+ * \ingroup OTBRCC8
  */
 template <class TInputGraph>
 class ITK_EXPORT RCC8GraphFileWriter
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
index 3c233a6a3ecf8030e8b0ec1ac9152f21ee47c08e..0006fc7d7b2a182565982feabeea7d234dd858fd 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
@@ -25,6 +25,8 @@ namespace otb
 /** \class RCC8GraphSource
  *  \brief Base class for all the filters producing an otbRCC8Graph
  * \ingroup DataSources
+ *
+ * \ingroup OTBRCC8
  */
 template <class TOutputGraph>
 class ITK_EXPORT RCC8GraphSource
diff --git a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
index 5ff5da669fb1e8a0d8368b88461fef2c319ae8a0..0cda308201ac08af59fbd1be2494b02ae0953c1f 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
@@ -25,6 +25,8 @@ namespace otb
 /**
  * \class RCC8InEdgeIterator
  * \brief Iterates on the graph in edges from a vertex.
+ *
+ * \ingroup OTBRCC8
  */
 template <class TGraph>
 class ITK_EXPORT RCC8InEdgeIterator
diff --git a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
index ca3be17cbda4703d495bca0c870843e62872b9ef..5d2bebd0fd57b3de9dd43bddc6105735d7b7d728 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
@@ -25,6 +25,8 @@ namespace otb
 /**
  * \class RCC8OutEdgeIterator
  * \brief Iterates on the graph out edges from a vertex.
+ *
+ * \ingroup OTBRCC8
  */
 template <class TGraph>
 class ITK_EXPORT RCC8OutEdgeIterator
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
index 4e5f2925ce268aebdb3878bc0a5df7c9f3c92bef..e5d390f332604f74f71ba97e2c1e8e9dbaa3b2de 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
@@ -31,6 +31,8 @@ namespace otb
  *  RCC8 graph.
  *
  * \sa RCC8Graph, RCC8Edge
+ *
+ * \ingroup OTBRCC8
  */
 template <class TPath>
 class ITK_EXPORT RCC8VertexBase
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
index ecddb2758e65309083366eb72d7cfd1ad3a6177b..dbf99dd2ab1625fedc1fbd3e62678df24db05b2c 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
@@ -25,6 +25,8 @@ namespace otb
 /**
  * \class RCC8VertexIterator
  * \brief Iterates on the graph vertices
+ *
+ * \ingroup OTBRCC8
  */
 template <class TGraph>
 class ITK_EXPORT RCC8VertexIterator
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
index 80dc830cd36afba59017c63edb4723fc91de12fa..7be265274e2f4888b677e8066d79525ba6dbd1f2 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
@@ -27,6 +27,8 @@ namespace otb
  *  the represented region.
  *
  * \sa RCC8Graph, RCC8Edge, RCC8VertexBase
+ *
+ * \ingroup OTBRCC8
  */
 template <class TPath, class TPrecision = float>
 class ITK_EXPORT RCC8VertexWithCompacity
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
index c43894de36333d40e617e042693297c04d6ec7bf..4235a1b490d8d1f5abcdc3cf87efec9cffc95220 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
@@ -27,6 +27,8 @@ namespace otb
  *  the represented region.
  *
  * \sa RCC8Graph, RCC8Edge, RCC8VertexBase
+ *
+ * \ingroup OTBRCC8
  */
 template <class TLabel, class TPrecision = float>
 class ITK_EXPORT RCC8VertexWithRegionCenter
diff --git a/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h
index c2446cded80251edea4d98eb83ddc3afc6eab549..7cd094b8645a3ba6abceca1abd2b25e94c631dba 100644
--- a/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h
+++ b/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h
@@ -36,6 +36,8 @@ namespace Functor
    *  the Evaluate() method.
    *
    * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template<class TInput1, class TInput2, class TOutput>
 class TM4AndTM5IndexBase
@@ -138,6 +140,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class NDBI : public TM4AndTM5IndexBase<TInput1, TInput2, TOutput>
@@ -175,6 +179,8 @@ protected:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class ISU : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
diff --git a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
index 8e0006fda22c4c8601c22c91b15bd98c1c6ce48f..f109b672aa801625899fadb75f927ca0dda3c9be 100644
--- a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
@@ -29,6 +29,8 @@ namespace otb
    *
    * \ingroup Radiometry
    *
+ *
+ * \ingroup OTBIndices
  */
 
 template <class TInputImageG, class TInputImageR, class TOutputImage,
diff --git a/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h b/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h
index a3555bee571fe04b350455d5d8c568954a03de96..f111d9d7c0a154282367cc170990cdb37300c528 100644
--- a/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h
+++ b/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h
@@ -56,6 +56,8 @@ enum ReflectanceType {Thousands, Normalized};
    *  are available for setting these units.
    *
    * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template<class TInput, class TOutput>
 class LandsatTMIndexBase
@@ -323,6 +325,8 @@ protected:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class LandsatTMIndex : public LandsatTMIndexBase<TInput, TOutput>
@@ -355,6 +359,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class Bright : public LandsatTMIndex<TInput, TOutput>
@@ -394,6 +400,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class Vis : public LandsatTMIndex<TInput, TOutput>
@@ -425,6 +433,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class NIR : public LandsatTMIndex<TInput, TOutput>
@@ -455,6 +465,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class MIR1 : public LandsatTMIndex<TInput, TOutput>
@@ -485,6 +497,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class MIR2 : public LandsatTMIndex<TInput, TOutput>
@@ -515,6 +529,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class TIR : public LandsatTMIndex<TInput, TOutput>
@@ -559,6 +575,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class MIRTIR : public LandsatTMIndex<TInput, TOutput>
@@ -597,6 +615,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class NDVI : public LandsatTMIndex<TInput, TOutput>
@@ -642,6 +662,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class NDBSI : public LandsatTMIndex<TInput, TOutput>
@@ -683,6 +705,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class BIO : public LandsatTMIndex<TInput, TOutput>
@@ -727,6 +751,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class NDSI : public LandsatTMIndex<TInput, TOutput>
@@ -782,6 +808,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class NDSIVis : public LandsatTMIndex<TInput, TOutput>
@@ -825,6 +853,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class NDBBBI : public LandsatTMIndex<TInput, TOutput>
@@ -868,6 +898,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput>
 class LinguisticVariables : public LandsatTMIndexBase<TInput, itk::FixedArray<unsigned int, 11> >
@@ -1015,6 +1047,8 @@ protected:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class KernelSpectralRule : public LandsatTMIndexBase<TInput, TOutput >
@@ -1114,6 +1148,8 @@ protected:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class ThickCloudsSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1170,6 +1206,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class ThinCloudsSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1229,6 +1267,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class SnowOrIceSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1286,6 +1326,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class WaterOrShadowSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1331,6 +1373,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class PitbogOrGreenhouseSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1387,6 +1431,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class DominantBlueSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1433,6 +1479,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class VegetationSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1491,6 +1539,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class RangelandSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1550,6 +1600,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class BarrenLandOrBuiltUpOrCloudsSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1606,6 +1658,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class FlatResponseBarrenLandOrBuiltUpSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1658,6 +1712,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class ShadowWithBarrenLandSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1703,6 +1759,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class ShadowWithVegetationSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1749,6 +1807,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class ShadowCloudOrSnowSpectralRule : public KernelSpectralRule<TInput, TOutput>
@@ -1802,6 +1862,8 @@ public:
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput, class TOutput>
 class WetlandSpectralRule : public KernelSpectralRule<TInput, TOutput>
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h
index 3ecfb4fd84af36d94382e4543984827e831163c4..8f0d916b610312c4e682dcb96c21fea2bbfbdef7 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h
@@ -33,6 +33,8 @@ namespace otb
    *
    * \sa UnaryFunctorImageFilter
    * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInputImage, class TOutputImage,
     class TFunction = Functor::IR<typename TInputImage::InternalPixelType,
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h
index bd9039bb05ce62dd2e2daf0175db8a0187b9bf9c..bb1340e33f28a937dd2933a831a50424ba960067 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h
@@ -33,6 +33,8 @@ namespace otb
    *
    * \sa UnaryFunctorImageFilter
    * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInputImage, class TOutputImage,
     class TFunction = Functor::ARVI<typename TInputImage::InternalPixelType,
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h
index 028c6e5979817ead9e36dba2e34e5b50f6188523..10c57e1efbd40b668c7a21d678458a8f50b46864 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h
@@ -33,6 +33,8 @@ namespace otb
    *
    * \sa UnaryFunctorImageFilter
    * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInputImage, class TOutputImage,
     class TFunction = Functor::AVI<typename TInputImage::InternalPixelType,
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h
index e82d2c067ed5c2e3e4341a6a10f2d6cac1599a40..3b3cc61f46c1fa8ba2632ff005dab5fa615a20f4 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h
@@ -33,6 +33,8 @@ namespace otb
    *
    * \sa UnaryFunctorImageFilter
    * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInputImage, class TOutputImage,
     class TFunction = Functor::NDVI<typename TInputImage::InternalPixelType,
diff --git a/Modules/Radiometry/Indices/include/otbMultiChannelRadiometricImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRadiometricImageFilter.h
index d676d412c50f4c69d8a587c72ceb4b6bd24d72cc..e92eecb1115c6731a06c8b4215197d167b87b98f 100644
--- a/Modules/Radiometry/Indices/include/otbMultiChannelRadiometricImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbMultiChannelRadiometricImageFilter.h
@@ -35,6 +35,8 @@ namespace otb
    *
    * \sa UnaryFunctorImageFilter
    * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInputImage, class TOutputImage, class TFunction>
 class ITK_EXPORT MultiChannelRadiometricImageFilter
diff --git a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
index 39ed8a99909d7fa7c887adb18378b4f177515e62..9f7994cb4da0cc615c674d120a681eb4f37132aa 100644
--- a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
+++ b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
@@ -36,6 +36,8 @@ namespace otb
   * \ingroup Functions
   * \sa DataNodeImageFunction
   * \sa SpectralAngleDataNodeFeatureFunction
+ *
+ * \ingroup OTBIndices
   */
 
 template <
diff --git a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
index 4797aa4086432becc8f096d9a88611ff9b162110..2a42a0815c9abe37f469f7022f5ed93afe6cdd88 100644
--- a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
@@ -29,6 +29,8 @@ namespace otb
    *
    * \ingroup Radiometry
    *
+ *
+ * \ingroup OTBIndices
  */
 
 template <class TInputImageR, class TInputImageB, class TInputImageNIR, class TOutputImage,
diff --git a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
index d20c37df047646e9ca22539ecb46c4101a546dc9..65b44f5dfacfcb3c076b14f0c564406a7365e9a8 100644
--- a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
@@ -29,6 +29,8 @@ namespace otb
    *
    * \ingroup Radiometry
    *
+ *
+ * \ingroup OTBIndices
  */
 
 template <class TInputImageR, class TInputImageG, class TInputImageNIR, class TOutputImage,
diff --git a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
index e2dd5ed6e6c1c3724d6abaad61aec856554f5210..0a61f9e95a1cf5676a86d10d942b863d16a4f103 100644
--- a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
@@ -28,6 +28,8 @@ namespace otb
  * \brief TODO
  *
    * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 
 template <class TInputImageR, class TInputImageNIR, class TOutputImage,
diff --git a/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h
index 36d40e0ddb779f190629351b30bae2237fe3dd29..68e2d53cbc02a1f176022ce6604cddc5baf283dc 100644
--- a/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h
+++ b/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h
@@ -41,6 +41,8 @@ namespace Functor
  *  the Evaluate() method.
  *
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
 */
 template<class TInput1, class TInput2, class TOutput>
 class GAndRIndexBase
@@ -143,6 +145,8 @@ private:
  *
  *
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template<class TInput1, class TInput2, class TInput3, class TOutput>
 class GAndRAndNirIndexBase
@@ -272,6 +276,8 @@ private:
  *
  *  \ingroup Functor
  *  \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class IR : public GAndRIndexBase<TInput1, TInput2, TOutput>
@@ -313,6 +319,8 @@ protected:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class IC : public GAndRIndexBase<TInput1, TInput2, TOutput>
@@ -350,6 +358,8 @@ protected:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class IB : public GAndRIndexBase<TInput1, TInput2, TOutput>
@@ -383,6 +393,8 @@ protected:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TInput3, class TOutput>
 class IB2 : public GAndRAndNirIndexBase<TInput1, TInput2, TInput3, TOutput>
diff --git a/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h
index 9d039d6f1ef3cecaa3ab0ccfc5a58d9267fcfa48..dbf7660fae7baf2f4023684f80ec3ae4d9b3896b 100644
--- a/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h
+++ b/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h
@@ -39,6 +39,8 @@ namespace Functor
    *  the Evaluate() method.
    *
    * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template<class TInput1, class TInput2, class TOutput>
 class RAndNIRIndexBase
@@ -144,6 +146,8 @@ private:
  *  Subclasses should NOT overload operators, they must  re-implement
  *  the Evaluate() method.
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template<class TInput1, class TInput2, class TInput3, class TOutput>
 class RAndBAndNIRIndexBase
@@ -271,6 +275,8 @@ private:
  *  Subclasses should NOT overload operators, they must  re-implement
  *  the Evaluate() method.
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template<class TInput1, class TInput2, class TInput3, class TOutput>
 class RAndGAndNIRIndexBase
@@ -396,6 +402,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class NDVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
@@ -434,6 +442,8 @@ protected:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class RVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
@@ -472,6 +482,8 @@ protected:
  *
  *  \ingroup Functor2
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class PVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
@@ -528,6 +540,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class SAVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
@@ -580,6 +594,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class TSAVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
@@ -652,6 +668,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class WDVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
@@ -697,6 +715,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 
 template <class TInput1, class TInput2, class TOutput>
@@ -771,6 +791,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class MSAVI2 : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
@@ -807,6 +829,8 @@ protected:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class GEMI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
@@ -859,6 +883,8 @@ protected:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TInput3, class TOutput>
 class AVI : public RAndGAndNIRIndexBase<TInput1, TInput2, TInput3, TOutput>
@@ -952,6 +978,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TInput3, class TOutput>
 class ARVI : public RAndBAndNIRIndexBase<TInput1, TInput2, TInput3, TOutput>
@@ -1004,6 +1032,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TInput3, class TOutput>
 class TSARVI : public RAndBAndNIRIndexBase<TInput1, TInput2, TInput3, TOutput>
@@ -1090,6 +1120,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TInput3, class TOutput>
 class EVI : public RAndBAndNIRIndexBase<TInput1, TInput2, TInput3, TOutput>
@@ -1175,6 +1207,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class IPVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
@@ -1212,6 +1246,8 @@ protected:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class TNDVI : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
@@ -1262,6 +1298,8 @@ private:
  *  \ingroup Functor
  * \ingroup Radiometry
  * \ingroup VegetationIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class LAIFromNDVILogarithmic : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
@@ -1346,6 +1384,8 @@ private:
  *  \ingroup Functor
  * \ingroup Radiometry
  * \ingroup VegetationIndices
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class LAIFromReflectancesLinear : public RAndNIRIndexBase<TInput1, TInput2, TOutput>
@@ -1410,6 +1450,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
   */
 
 
diff --git a/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h
index fbc94f095f203b6a8e0f46e2619be5b4c8b38771..9ace91314671534cc1d5f6fa8bdaf99c6bc2dd50 100644
--- a/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h
+++ b/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h
@@ -38,6 +38,8 @@ namespace Functor
    *  the Evaluate() method.
    *
    * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template<class TInput1, class TInput2, class TOutput>
 class WaterIndexBase
@@ -113,6 +115,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class WaterIndexFunctor : public WaterIndexBase<TInput1, TInput2, TOutput>
@@ -148,6 +152,8 @@ protected:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class SRWI : public WaterIndexBase<TInput1, TInput2, TOutput>
@@ -185,6 +191,8 @@ protected:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class NDWI : public WaterIndexBase<TInput1, TInput2, TOutput>
@@ -268,6 +276,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class NDWI2 : public WaterIndexBase<TInput1, TInput2, TOutput>
@@ -351,6 +361,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class MNDWI : public WaterIndexBase<TInput1, TInput2, TOutput>
@@ -434,6 +446,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class NDPI : public WaterIndexBase<TInput1, TInput2, TOutput>
@@ -517,6 +531,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInput1, class TInput2, class TOutput>
 class NDTI : public WaterIndexBase<TInput1, TInput2, TOutput>
@@ -601,6 +617,8 @@ private:
  *
  *  \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBIndices
  */
 template <class TInputVectorPixel, class TOutputPixel>
 class WaterSqrtSpectralAngleFunctor : public SqrtSpectralAngleFunctor<TInputVectorPixel, TOutputPixel>
diff --git a/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h b/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h
index adcfae8bdb2c5bfafefed40fa7ccf81a8e21ff6a..f0d7ad4a7270d8e00e6c623af19ff596b0727d8a 100644
--- a/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h
@@ -40,6 +40,8 @@ namespace otb
  *  probability of water.
  *
  *  \sa SpectralAngleDistanceImageFilter
+ *
+ * \ingroup OTBIndices
  */
 
 template <class TInputVectorImage, class TOutputImage,
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h b/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h
index 1a02e28a3882076841993e190ae9f7d7f7631cc9..06e454d9ad84cc891c998704e7b0eec9e47fe4a1 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h
@@ -30,6 +30,8 @@ namespace otb
  * extracted from a aeronet file.
  *
  * \sa AeronetFileReader
+ *
+ * \ingroup OTBOpticalCalibration
  */
 class ITK_EXPORT AeronetData :  public itk::DataObject
 {
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h b/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
index 4cd89ccb57fa6fe4d9badc8489b4b4cd3b328252..7957930122a90bf4ebf0994a06652c105cff36bb 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
@@ -30,6 +30,8 @@ class AeronetData;
 
 /** \class AeronetFileReaderException
  * \brief Base exception class for Aeronet problems during reading.
+ *
+ * \ingroup OTBOpticalCalibration
  */
 class ITK_EXPORT AeronetFileReaderException
   : public itk::ExceptionObject
@@ -67,6 +69,8 @@ public:
  *  The datas start in the line number 6.
  *
  * \sa AeronetData
+ *
+ * \ingroup OTBOpticalCalibration
  */
 class ITK_EXPORT AeronetFileReader : public itk::ProcessObject
 {
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
index 810ccd5aebd271e861d9bc59652cb98c6276d41a..8b62d643bee707c3629f50904bc91b7e5999a7d7 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
@@ -35,6 +35,8 @@ namespace otb
  *
  * \ingroup Radiometry
  *
+ *
+ * \ingroup OTBOpticalCalibration
  */
 
 class ITK_EXPORT AtmosphericCorrectionParameters : public itk::DataObject
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h
index 69b59615171144ea59da6326c79aef3b7d8c728d..8ca617bdb56a20f4270dd6533d9c68f83e7701c5 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h
@@ -33,6 +33,8 @@ namespace otb
  * or directly set by the user.
  *
  * \ingroup Radiometry
+ *
+ * \ingroup OTBOpticalCalibration
  */
 
 class ITK_EXPORT AtmosphericRadiativeTermsSingleChannel : public itk::DataObject
@@ -158,6 +160,8 @@ private:
  *
  * \ingroup AtmosphericRadiativeTermSingleChannel
  * \ingroup Radiometry
+ *
+ * \ingroup OTBOpticalCalibration
  */
 
 class ITK_EXPORT AtmosphericRadiativeTerms : public itk::DataObject
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h b/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h
index 10292571cb05e49b47cfafac44a8923464fb81d4..5870366819f5c30749ad07081be5792cff7117b1 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h
@@ -35,6 +35,8 @@ namespace otb
  *
  * \ingroup Radiometry
  *
+ *
+ * \ingroup OTBOpticalCalibration
  */
 
 class ITK_EXPORT ImageMetadataCorrectionParameters : public itk::DataObject
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h
index f6b1764bb820171c94d0d4ce9e86bbf6919c72fc..1bb82df74119b372c0f953e06536d786156db81e 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h
@@ -41,6 +41,8 @@ namespace Functor
    * \sa ImageToLuminanceImageFilter
    * \ingroup Functor
    * \ingroup Radiometry
+ *
+ * \ingroup OTBOpticalCalibration
  */
 
 template <class TInput, class TOutput>
@@ -100,6 +102,8 @@ private:
  * \ingroup Radiometry
  *
  * \example Radiometry/AtmosphericCorrectionSequencement.cxx
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ImageToLuminanceImageFilter :
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
index aa6dcfe2a594c3f95c5e5cc921657fbd602be40f..28997f1ab1c2dd631ce183d83a31be6553c9c818 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
@@ -39,6 +39,8 @@ namespace Functor
    * \ingroup ImageToLuminanceFunctor
    * \ingroup LuminanceToReflectanceFunctor
    * \ingroup Radiometry
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInput, class TOutput>
 class ImageToReflectanceImageFunctor
@@ -125,6 +127,8 @@ private:
  * \ingroup ImageToLuminanceImageFilter
  * \ingroup ReflectanceToLuminanceImageFilter
  * \ingroup Radiometry
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ImageToReflectanceImageFilter :
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbLandsatTMSpectralRuleBasedClassifier.h b/Modules/Radiometry/OpticalCalibration/include/otbLandsatTMSpectralRuleBasedClassifier.h
index c7bca94785503404f78ea9ebf97a8d44a7108538..a288520e3014dd76b03a801983b17bea9eabb25e 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbLandsatTMSpectralRuleBasedClassifier.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbLandsatTMSpectralRuleBasedClassifier.h
@@ -52,6 +52,8 @@ namespace LandsatTM
  * \ingroup Functor
  * \ingroup Radiometry
  * \ingroup LandsatTMIndices
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInput, class TOutput>
 class SpectralRuleBasedClassifier : public KernelSpectralRule<TInput, TOutput>
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h
index 116f2e38516d4bea0b6f91d3ae538c36d10b3c8d..26121b7d89319c58fc77b2f71a549ff3930a1eb1 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h
@@ -41,6 +41,8 @@ namespace Functor
    * \sa LuminanceToImageImageFilter
    * \ingroup Functor
    * \ingroup Radiometry
+ *
+ * \ingroup OTBOpticalCalibration
  */
 
 template <class TInput, class TOutput>
@@ -100,6 +102,8 @@ private:
  * \ingroup Radiometry
  *
  * \example Radiometry/AtmosphericCorrectionSequencement.cxx
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT LuminanceToImageImageFilter :
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h
index 51a6852d60ade06f8a87007653d663818352508f..5f7a597463dea613d7fbccee62f4d46dfc41b63b 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h
@@ -45,6 +45,8 @@ namespace Functor
    * \ingroup Functor
    * \ingroup Radiometry
    *
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInput, class TOutput>
 class LuminanceToReflectanceImageFunctor
@@ -124,6 +126,8 @@ private:
  * \ingroup Radiometry
  *
  * \example Radiometry/AtmosphericCorrectionSequencement.cxx
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT LuminanceToReflectanceImageFilter :
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h b/Modules/Radiometry/OpticalCalibration/include/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h
index 7cbfe51a125b6aed5d1697ede2a63dca437bc7f1..7c47357ee1f70729d85db43a7874f5551ff4b5f9 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h
@@ -32,6 +32,8 @@ namespace otb
    * TODO
    * \ingroup Radiometry
    *
+ *
+ * \ingroup OTBOpticalCalibration
  */
   class ITK_EXPORT RadiometryCorrectionParametersToAtmosphericRadiativeTerms
   {
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
index 2697442be7655248f6a938da88b679d640ccdb7b..af68323c92696276dd73a705542efb88f0da3bf0 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
@@ -39,6 +39,8 @@ namespace Functor
    * \ingroup LuminanceToImageFunctor
    * \ingroup ReflectanceToLuminanceFunctor
    * \ingroup Radiometry
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInput, class TOutput>
 class ReflectanceToImageImageFunctor
@@ -117,6 +119,8 @@ private:
  * \ingroup LuminanceToImageImageFilter
  * \ingroup ReflectanceToLuminanceImageFilter
  * \ingroup Radiometry
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ReflectanceToImageImageFilter :
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h
index a872a11bb4d31dd4d39fc3b0b45b7b48b3107934..99409bb1f7b7f07c22aa50aac03bf87181deee16 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h
@@ -46,6 +46,8 @@ namespace Functor
    * \ingroup Functor
    * \ingroup Radiometry
    *
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInput, class TOutput>
 class ReflectanceToLuminanceImageFunctor
@@ -109,6 +111,8 @@ private:
  * \ingroup Radiometry
  *
  * \example Radiometry/AtmosphericCorrectionSequencement.cxx
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ReflectanceToLuminanceImageFilter :
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
index e859ef26ea07ca186433f961e46ee9f4fe017a2c..a519b288a2e0d3373c13d2ef05fdfb4de7951c03 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
@@ -43,6 +43,8 @@ namespace Functor
    * \ingroup Functor
    * \ingroup Radiometry
    *
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInput, class TOutput>
 class ReflectanceToSurfaceReflectanceImageFunctor
@@ -124,6 +126,8 @@ private:
  * \ingroup Radiometry
  *
  * \example Radiometry/AtmosphericCorrectionSequencement.cxx
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ReflectanceToSurfaceReflectanceImageFilter :
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSIXSTraits.h b/Modules/Radiometry/OpticalCalibration/include/otbSIXSTraits.h
index 79a67d2c72335634f658c7dee7d271d1d4c01f34..feb0c1b8e8d50cda5ba5d5e63de6a7eba081f8f0 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSIXSTraits.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSIXSTraits.h
@@ -31,6 +31,8 @@ namespace otb
    *
    * \ingroup Radiometry
    *
+ *
+ * \ingroup OTBOpticalCalibration
  */
 class ITK_EXPORT SIXSTraits
 {
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h b/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h
index 4be6bf96830cc2d5de10a95c301753c80aae84d7..2f5fe34b8a3feddb5b7d6ba3d22adf96a41ce272 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h
@@ -32,6 +32,8 @@ namespace otb
  *  This class read a file that contains spectral sensitivity values and fill
  *  a structure that contains man and max wavelengths, the coefficients list and the step.
  *
+ *
+ * \ingroup OTBOpticalCalibration
  */
 
 class ITK_EXPORT SpectralSensitivityReader : public itk::ProcessObject
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
index 840d6aada39e1fd0985fb09edcfaf2e5930740b4..11c789136c4990bcac7a5204e893077f90088eab 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
@@ -39,6 +39,8 @@ namespace Functor
 *
 *  \ingroup Functor
 * \ingroup Radiometry
+ *
+ * \ingroup OTBOpticalCalibration
 */
 template <class TNeighIter, class TOutput>
 class ComputeNeighborhoodContributionFunctor
@@ -132,6 +134,8 @@ private:
  *
  * \ingroup Radiometry
  *
+ *
+ * \ingroup OTBOpticalCalibration
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT SurfaceAdjacencyEffectCorrectionSchemeFilter :
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbVarSol.h b/Modules/Radiometry/OpticalCalibration/include/otbVarSol.h
index ee93c1542132c87602c148b43bed39f86235028e..9d615c8d94b664804e220b6b7a7f87bb4fecf822 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbVarSol.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbVarSol.h
@@ -34,6 +34,8 @@ namespace otb
    * IEEE Transactions on Geoscience and Remote Sensing 35
    * \ingroup Radiometry
    *
+ *
+ * \ingroup OTBOpticalCalibration
  */
   class ITK_EXPORT VarSol
   {
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h b/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h
index 8937ec7218028304b42d1817e648043251422a93..67a642e0ed32eca98daf8a3141aea0b79c73c7e3 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h
@@ -27,6 +27,8 @@ namespace otb
  *  \brief This class contains the values of the filter functions
  *
  * \ingroup IO
+ *
+ * \ingroup OTBOpticalCalibration
  */
 class ITK_EXPORT WavelengthSpectralBands : public itk::DataObject
 {
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
index c175890a586b67dd23906730cef360533555fd3f..10e1410f23df3883a243c624d1f3ea5ba3436646 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
@@ -38,6 +38,8 @@ namespace otb
  * coordinate representation type (e.g. float or double ).
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBSARCalibration
  */
 
 template <class TInputImage, class TCoordRep = float>
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunctor.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunctor.h
index a4dd999ab08352f6f3456c806aff0ab0fa34be60..22aecbbad5c1975ebf93825e8d252856cd03f625 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunctor.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunctor.h
@@ -32,6 +32,8 @@ namespace Functor
  * \brief Compute the brightness value.
  *  \f$ \beta^{0} = (scale * DN^{2} + offset) * OldGain / NewGain * RangeSpreadLoss \f$
  *
+ *
+ * \ingroup OTBSARCalibration
  */
 template<class TInput, class TOutput>
 class ITK_EXPORT SarBrightnessFunctor
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
index 38882427c91769cb7f5af47043fb71199fdf54a1..8250dd52994993f2ef21310a714e1efb17ce7405 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
@@ -33,6 +33,8 @@ namespace otb
  * The function has to inherit from itkImageFunction
  *
  * \ingroup ImageFilters
+ *
+ * \ingroup OTBSARCalibration
  */
 
 template <class TInputImage, class TOutputImage>
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
index 79821ca7b9efce0a0978ab93776f07e49e44776c..47be340fc5f526c6881774ac603a43dd56d1204e 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
@@ -32,6 +32,8 @@ namespace otb
  *  \note This is an internal class used by the Sar calibration framework.
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBSARCalibration
  */
 
 template <class TInputImage, class TCoordRep = float>
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
index abf06c92974ea92a67dd6ff85af2fc1c9262881a..541afff72d4dc35ffc3ae3055abda78f4ef74846 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
@@ -38,6 +38,8 @@ namespace otb
  * coordinate representation type (e.g. float or double ).
  *
  * \ingroup ImageFunctions
+ *
+ * \ingroup OTBSARCalibration
  */
 
 template <class TInputImage, class TCoordRep = float>
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunctor.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunctor.h
index d06b31a0658d844abe3ac7c3ba9aa577c3e072cd..db02de332b500272b71d92b3844816cf81d6f628 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunctor.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunctor.h
@@ -32,6 +32,8 @@ namespace Functor
  * \brief Compute the backscatter value.
  *  \f$ \sigma^{0} = (scale * DN^{2} + offset) * sin( \theta_{inc}) * OldGain / NewGain * RangeSpreadLoss \f$
  *
+ *
+ * \ingroup OTBSARCalibration
  */
 template<class TInput, class TOutput>
 class ITK_EXPORT SarRadiometricCalibrationFunctor
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
index 7b3cd411ca64ffa015e1030fb53e6abed2415167..1212e9ae682de9b3f46e885d24efee34ebef12ba 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
@@ -33,6 +33,8 @@ namespace otb
  * The function has to inherit from itkImageFunction
  *
  * \ingroup ImageFilters
+ *
+ * \ingroup OTBSARCalibration
  */
 
 template <class TInputImage, class TOutputImage>
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
index c412061a3b1bffdf03294b980c28afecc88faf40..9ff7c1a6087afd9b41faf29c4c38af5de68b7631 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
@@ -44,6 +44,8 @@ namespace Functor
  * \sa TerraSarBrightnessImageFilter
  * \ingroup Functor
  * \ingroup Radiometry
+ *
+ * \ingroup OTBSARCalibration
  */
 
 template <class TInput, class TOutput>
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
index df2423fe331a564821a79c4c64909da2085ca799..05984c7e7e8ea7c2efb8f575e1528ca01c08bce6 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
@@ -60,6 +60,8 @@ namespace otb
  * \ingroup Streamed
  * \ingroup Multithreaded
  * \ingroup Radiometry
+ *
+ * \ingroup OTBSARCalibration
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT TerraSarBrightnessImageFilter :
diff --git a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
index 877fcfd6a21b7912d0b6a34ef3addb9ce96a3617..1116fc7f88982b33200cbc3de4feb116be7b1aaf 100644
--- a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
+++ b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
@@ -30,6 +30,8 @@ namespace otb
    * - the SatelliteRSR relatives spectral response of a sensor (RSR).
    *
    * \sa itk::DataObject
+ *
+ * \ingroup OTBSimulation
  */
 template <class TSpectralResponse , class TRSR>
 class AtmosphericEffects
diff --git a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
index e99df350e9036654bfe72c6201c2449cf9851158..5fe703e2c2a611d3c4300905215cd6291c7c33b3 100644
--- a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
+++ b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
@@ -50,6 +50,8 @@ namespace otb
  *In order to avoid homogenous regions of a material, for each pixel in the region a noise is added to the reference sprectrum obtained from the spectrum simulator (see LabelMapToSimulatedImageFilter).
  *
  * \sa ImageSource
+ *
+ * \ingroup OTBSimulation
  */
 
 template <class TInputVectorData, class TSpatialisation, class TSimulationStep1, class TSimulationStep2, class TFTM, class TOutputImage>
diff --git a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
index c8534f14fcb3d4656f2495336d390b2b82dced66..91801a97be931924af28e1bd52acb8a01d06e82a 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
@@ -41,6 +41,8 @@ namespace otb
  * is not thread safe, and then (even if all the remaining is multithread) the number of thread must be set to 1.
  *
  * \sa LabelMapFilter
+ *
+ * \ingroup OTBSimulation
  */
 
 template <class TInputLabelMap, class TSimuStep1, class TSimuStep2, class TOutputImage>
diff --git a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
index 2533653b169c1d244d23e6205c2cffdaca5b3ed8..7c1ad1ac392e34500cb3e576d49afa2ce6e2c0a2 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
@@ -57,6 +57,8 @@ namespace otb
  * TODO : define different vegetation types and ProSail parameters associated.
  *
  * \sa LabelToSimulationParametersBase
+ *
+ * \ingroup OTBSimulation
  */
 
 template <class TLabel>
diff --git a/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h b/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h
index 306f0ae2dba589a23ea3adda9d831fd84636ac85..1bc5444ab1b22c20e2f76a72c92fa30573ff2c8f 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h
@@ -52,6 +52,8 @@ namespace otb
  * psi   = 0;    % azimuth (deg)
  *
  * \sa ProcessObject
+ *
+ * \ingroup OTBSimulation
  */
 
 template <class TLabel>
diff --git a/Modules/Radiometry/Simulation/include/otbLeafParameters.h b/Modules/Radiometry/Simulation/include/otbLeafParameters.h
index 1c7ba1cab48fb74a91c96569a5b50b672c7fc966..0e6eb212e11bb8e37b0b8a1718af5cd7e41c25e7 100644
--- a/Modules/Radiometry/Simulation/include/otbLeafParameters.h
+++ b/Modules/Radiometry/Simulation/include/otbLeafParameters.h
@@ -30,6 +30,8 @@ namespace otb
    * \brief Data class containing Leaf Parameters.
    *
    * \sa itk::DataObject
+ *
+ * \ingroup OTBSimulation
  */
 
 class ITK_EXPORT LeafParameters : public itk::DataObject
diff --git a/Modules/Radiometry/Simulation/include/otbProSailParameters.h b/Modules/Radiometry/Simulation/include/otbProSailParameters.h
index 5c0ffa8555f564d1ead972fb665bd37660ef2619..52d1475b06c483c2c0895fac3ff2cfb9784b93ea 100644
--- a/Modules/Radiometry/Simulation/include/otbProSailParameters.h
+++ b/Modules/Radiometry/Simulation/include/otbProSailParameters.h
@@ -31,6 +31,8 @@ namespace otb
    *
    * see http://teledetection.ipgp.jussieu.fr/prosail/
    * \sa itk::DataObject
+ *
+ * \ingroup OTBSimulation
  */
 
 class ITK_EXPORT ProSailParameters : public itk::DataObject
diff --git a/Modules/Radiometry/Simulation/include/otbProspectModel.h b/Modules/Radiometry/Simulation/include/otbProspectModel.h
index 3a6693fbf6e723cdecd25a859a7957d34b32b8b3..6364f5d2cdffdecebac16a97e82a731d2f375230 100644
--- a/Modules/Radiometry/Simulation/include/otbProspectModel.h
+++ b/Modules/Radiometry/Simulation/include/otbProspectModel.h
@@ -33,6 +33,8 @@ namespace otb
    *
    * \sa itk::DataObject
    * \sa SimulationStep1Base
+ *
+ * \ingroup OTBSimulation
  */
 
 class ITK_EXPORT ProspectModel : public SimulationStep1Base
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
index ba74d3ad3de2e830d5c025e359096943c60ad894..aad26a9cc1ca572a198c68218f3396b9f61411bb 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
@@ -55,6 +55,8 @@ namespace otb
    * \sa SpectralResponse
    * \sa SatelliteRSR
    *
+ *
+ * \ingroup OTBSimulation
  */
 template <class TSpectralResponse , class TRSR>
 class ReduceSpectralResponse : public itk::DataObject
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
index 57c29595a6d3ca10743ee357d879ce0f16c18b8b..ce663bdbd2f461c956d358b2fe00b5ca22de62dd 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
@@ -46,6 +46,8 @@ namespace otb
    * \sa SpectralResponse
    * \sa SatelliteRSR
    *
+ *
+ * \ingroup OTBSimulation
  */
   template <class TReduceSpectralResponse , class TFunction = Functor::NDVI< typename TReduceSpectralResponse::ValuePrecisionType, typename TReduceSpectralResponse::ValuePrecisionType,
   typename TReduceSpectralResponse::ValuePrecisionType > >
diff --git a/Modules/Radiometry/Simulation/include/otbSailModel.h b/Modules/Radiometry/Simulation/include/otbSailModel.h
index 28ed8d982be6af8a16332ca10ef0eb119669ff4d..20b390b499165ab3624efa62a9ca899507f1d5a6 100644
--- a/Modules/Radiometry/Simulation/include/otbSailModel.h
+++ b/Modules/Radiometry/Simulation/include/otbSailModel.h
@@ -32,6 +32,8 @@ namespace otb
    * Input Reflectance and transmittance must be spectrum (otbSpectralResponse) from 400 nm to 2500 nm with step 1nm.
    * \sa itk::ProcessObject
    * \sa SimulationStep2Base
+ *
+ * \ingroup OTBSimulation
  */
 
 
diff --git a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
index 11be17e33435e2fcd940cc3e2007f02a67fef5e4..27166a40f9d52c420b015a92f597690df4bd032d 100644
--- a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
+++ b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
@@ -39,6 +39,8 @@ namespace otb
 
  * \sa SpectralResponse
  * \sa itk::DataObject
+ *
+ * \ingroup OTBSimulation
  */
 template<class TPrecision = double, class TValuePrecision = double>
 class SatelliteRSR: public itk::DataObject
diff --git a/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h b/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h
index 177d9bfa3336eacd2697b50f36b2443088d68821..bfaaff863bcaf4e267a2f07d75db2921b8e67602 100644
--- a/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h
+++ b/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h
@@ -32,6 +32,8 @@ namespace otb
  * \brief Base class for all method that simulate the Reflectance and Transmittance of an object. (ex: Prospect)
  *
  * \sa ProcessObject
+ *
+ * \ingroup OTBSimulation
  */
 
 
diff --git a/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h b/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h
index 8133c01134e20bf7d7d8b8227d37eda4c75570a4..0758ae05b8966432ce06e7f2e652d55d45058ea4 100644
--- a/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h
+++ b/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h
@@ -31,6 +31,8 @@ namespace otb
  * \brief  (ex: Sail http://teledetection.ipgp.jussieu.fr/prosail/).
  *
  * \sa ProcessObject
+ *
+ * \ingroup OTBSimulation
  */
 
 
diff --git a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
index ea9092fd00433676ec8360dabbc33365f8f9ffd6..3cf1ae115287bf6029cd39e086764acbd4fc2bf2 100644
--- a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
@@ -42,6 +42,8 @@ namespace otb
  * The Label of each object is set using SetLabels.
  *
  * \sa LabelMapSource
+ *
+ * \ingroup OTBSimulation
  */
 
 template <class TLabelMap>
diff --git a/Modules/Radiometry/Simulation/include/otbSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
index 27ab5f5e41914ca87f566f5aeaa0c85d479b25e2..cffd375942c3a2a20a31bb21a111685fa7656b0b 100644
--- a/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
+++ b/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
@@ -48,6 +48,8 @@ namespace otb
  * This Spectral response can be loaded from ASCII file (JPL spectral library Version 1.2)
  * http://speclib.jpl.nasa.gov.
  * \sa itk::DataObject
+ *
+ * \ingroup OTBSimulation
  */
 template<class TPrecision = double, class TValuePrecision = double>
 class SpectralResponse: public itk::DataObject
diff --git a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
index d5368eb022df32fbae3038cb46b7ce3acb8cffbe..2733f056140e84656976f0c9eb1c5bc6b79aa4a9 100644
--- a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
@@ -38,6 +38,8 @@ namespace Functor
    *
    * \ingroup Functor
    * \ingroup Radiometry
+ *
+ * \ingroup OTBSimulation
  */
 template <class TInput, class TOutput>
 class ReflectanceToSurfaceReflectanceImageFunctor
@@ -154,6 +156,8 @@ private:
  * \ingroup LuminanceToReflectanceImageFilter
  * \ingroup ImageToReflectanceImageFilter
  * \ingroup Radiometry
+ *
+ * \ingroup OTBSimulation
  */
 template <class TInputImage, class TOutputImage >
 class ITK_EXPORT SurfaceReflectanceToReflectanceFilter :
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
index 1d88c90d43f1710a19a16a13b4840592fc95ef9f..ded18110e7aca6ee33b543c9340179c4f47c7e64 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
@@ -46,6 +46,8 @@ namespace otb
  *  from CNES.
  *
  *  \sa FineRegistrationImageFilter, FastCorrelationImageFilter
+ *
+ * \ingroup OTBDisparityMap
  */
 template <class TFixedImage, class TMovingImage, class TPointSet>
 class ITK_EXPORT DisparityMapEstimationMethod
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
index 7be354b0356fc24225c5f7310aa2bb02ccff6098..e01c3f688008a4ab9cee6eb460cd2930a425b48a 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
@@ -63,6 +63,8 @@ namespace otb
  * \sa NeighborhoodIterator
  *
  * \ingroup IntensityImageFilters
+ *
+ * \ingroup OTBDisparityMap
  */
 template <class TInputImage, class TOutputImage, class TMask>
 class ITK_EXPORT DisparityMapMedianFilter :
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
index eb1689589098ebccf93f681100b2dff36b986ebe..705032abad5521442fd9043339c84523c5a9f730 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
@@ -42,6 +42,8 @@ namespace otb
  *  \ingroup Streamed
  *  \ingroup Threaded
  *
+ *
+ * \ingroup OTBDisparityMap
  */
 template <class TDisparityImage, class TOutputImage =  otb::VectorImage<float,2>,
           class TEpipolarGridImage = otb::VectorImage<float,2> , class TMaskImage = otb::Image<unsigned char> >
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
index fc12dd6917f31e50cbd175138df60a3767812011..f0929ab9d3a0939da0efbadb0ab5138a8e36550b 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
@@ -53,6 +53,8 @@ namespace otb
  *  \ingroup Streamed
  *  \ingroup Threaded
  *
+ *
+ * \ingroup OTBDisparityMap
  */
 template <class TDisparityImage, class TInputImage, class TOutputDEMImage = TDisparityImage,
           class TEpipolarGridImage = otb::VectorImage<float,2> , class TMaskImage = otb::Image<unsigned char> >
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
index 71fcfe7892e9da4c77fb14b8b88c3e16b901d0fd..f0e4d379be02c83ef3d81adb5e3a889d0a8d9328 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
@@ -37,6 +37,8 @@ namespace otb
  *  \ingroup Streamed
  *  \ingroup Threaded
  *
+ *
+ * \ingroup OTBDisparityMap
  */
 template <class TDisparityImage,  class TGridImage = otb::VectorImage<float,2> ,
   class TSensorImage = otb::Image<unsigned short,2> , class TMaskImage = otb::Image<unsigned char,2> >
diff --git a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
index 369bd1524169e8863e77ae87501084ef4592f996..7486c606c607aa9daf9e5f3acd74308f06e8b01c 100644
--- a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
@@ -49,6 +49,8 @@ namespace otb
  *  \ingroup Streamed
  *  \ingroup Threaded
  *
+ *
+ * \ingroup OTBDisparityMap
  */
 template <class TDisparityImage, class TOutputImage =  otb::VectorImage<float,2>,
           class TMaskImage = otb::Image<unsigned char>, class TResidueImage = otb::Image<float> >
diff --git a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
index fac1fb4c36e6d8e447cc14245d8c4d80f78081e1..cbdc4282d41f2b609c815708e7a810163628b7c0 100644
--- a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
@@ -56,6 +56,8 @@ namespace otb
  *  \ingroup Streamed
  *  \ingroup Threaded
  *
+ *
+ * \ingroup OTBDisparityMap
  */
 template <class TInputImage, class TOutputMetricImage, class TDisparityImage = TOutputMetricImage,
           class TMaskImage = otb::Image<unsigned char>,
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
index 2ef42b875fb8f35af45ee3ba721fe5951cbbe6df..8f987463b0c1f371296af0823a6071278361be80 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
@@ -27,6 +27,8 @@ namespace otb
  * sufficient.
  * \sa itk::DisplacementFieldSource
  * \ingroup DisparityMap
+ *
+ * \ingroup OTBDisplacementField
  */
 template <class TPointSet, class TDisplacementField>
 class ITK_EXPORT BSplinesInterpolateDisplacementFieldGenerator
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
index ee5c3e5b30f708541fa80279fb683ab4de4d38f9..52a7a77a6a8571fc65009f09597e11b6fecacc83 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
@@ -38,6 +38,8 @@ namespace otb
  *  which is a non-sense.
  *
  *  \sa itk::BSplineScatteredDataPointSetToImageFilter
+ *
+ * \ingroup OTBDisplacementField
  */
 template <class TPointSet, class TDisplacementField>
 class ITK_EXPORT BSplinesInterpolateTransformDisplacementFieldGenerator
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
index de236523b5eab13e38ec9fe0c325c1817f13ff90..e7df1f96dfc5e67138538c8b8a36c98665765e12 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
@@ -25,6 +25,8 @@ namespace otb
 /** \class NNearestPointsLinearInterpolateDisplacementFieldGenerator
  *  \brief This class generate the displacement field by performing a linear interpolation of the displacement induced by the n nearest point.
  * \ingroup DisparityMap
+ *
+ * \ingroup OTBDisplacementField
  */
 template <class TPointSet, class TDisplacementField>
 class ITK_EXPORT NNearestPointsLinearInterpolateDisplacementFieldGenerator
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
index 300824aca83064d30510001b9cb6805ea40d21e7..5ef63392f5bdf3c271fed4a59d6687d783240914 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
@@ -29,6 +29,8 @@ namespace otb
  * the displacements from the transforms induced by the n nearest points.
  *
  * \ingroup DisparityMap
+ *
+ * \ingroup OTBDisplacementField
  */
 template <class TPointSet, class TDisplacementField>
 class ITK_EXPORT NNearestTransformsLinearInterpolateDisplacementFieldGenerator
diff --git a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
index 31b484c9384fd4fbee538d8066ca7b89e7ba1558..81cecc3ca7ce6c7d6517b97698a068decbcae21c 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
@@ -27,6 +27,8 @@ namespace otb
  *  In each pixel location, the displacement is considered to be the displacement of the nearest seed point in the point set.
  *
  * \ingroup DisparityMap
+ *
+ * \ingroup OTBDisplacementField
  */
 template <class TPointSet, class TDisplacementField>
 class ITK_EXPORT NearestPointDisplacementFieldGenerator
diff --git a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
index afbea243e1adf59f38405c370c55968b1b921e57..c5dd9798e320171e583782a7e1418595329982c9 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
@@ -27,6 +27,8 @@ namespace otb
  *  nearest point in pointset.
  *
  * \ingroup DisparityMap
+ *
+ * \ingroup OTBDisplacementField
  */
 template <class TPointSet, class TDisplacementField>
 class ITK_EXPORT NearestTransformDisplacementFieldGenerator
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
index 04e2d6725c2fce8fa1ffa44526def927de431265..fad2a985c42b43362ab041e2b194c359d0e9a649 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
@@ -27,6 +27,8 @@ namespace Functor
 /** \class DistanceComparisonFunctor
  *  \brief This functor is used in nearest neighborhood sorting.
  *  \ingroup DisparityMap
+ *
+ * \ingroup OTBDisplacementField
  */
 class DistanceComparisonFunctor
 {
@@ -58,6 +60,8 @@ private:
  *  \sa DisparityMapEstimationMethod
  *   \sa itk::WarpImageFilter
    *  \ingroup DisparityMap
+ *
+ * \ingroup OTBDisplacementField
  */
 template <class TPointSet, class TDisplacementField>
 class ITK_EXPORT PointSetToDisplacementFieldGenerator
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
index 1fac68b9ff07f418dbaf183f1a3d0b51903e477c..2fe6858d8143e094c31d7d2dc9b06df71ce5f541 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
@@ -32,6 +32,8 @@ namespace otb
  *  \sa itk::WarpImageFilter
  *
  *  \ingroup DisparityMap
+ *
+ * \ingroup OTBDisplacementField
  */
 template <class TPointSet, class TDisplacementField>
 class ITK_EXPORT PointSetWithTransformToDisplacementFieldGenerator
diff --git a/Modules/Registration/DisplacementField/include/otbStereorectificationDisplacementFieldSource.h b/Modules/Registration/DisplacementField/include/otbStereorectificationDisplacementFieldSource.h
index 51fb3eaaf07a996fcc0eb9aa7a9c629ff5a2ebad..6ea65f6a6a97d6995c2724c50968a1186b6c03f9 100644
--- a/Modules/Registration/DisplacementField/include/otbStereorectificationDisplacementFieldSource.h
+++ b/Modules/Registration/DisplacementField/include/otbStereorectificationDisplacementFieldSource.h
@@ -80,6 +80,8 @@ namespace otb
  *
  *  \sa StreamingWarpImageFilter
  *  \sa StereoSensorModelToElevationMapFilter
+ *
+ * \ingroup OTBDisplacementField
  */
 template <class TInputImage, class TOutputImage >
 class ITK_EXPORT StereorectificationDisplacementFieldSource
diff --git a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
index e2f751bab5a18209b7f8c554de73649942f024b4..59e1cf42a53ab1edbfdabff4c309603eb12e84cf 100644
--- a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
+++ b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
@@ -56,6 +56,8 @@ namespace otb
  *
  * See Publications : N. Sabater, J.M. Morel, A. Almansa and G. Blanchet, "Discarding moving objects in quasi-simultaneous stereovision", in IEEE International Conference on Image Processing, ICIP'10, 2010.
  *                   N. Sabater, J.M. Morel and A. Almansa, "Sub-pixel stereo matching", in IEEE International Geoscience and Remote Sensing Symposium, IGARSS'10, 2010.
+ *
+ * \ingroup OTBStereo
  */
 
 
diff --git a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
index 16e654a4fa131611e140a8cb73fdf9e46e0190fa..25d849d136a872e613ccd66ced6c0dea0f4f1365 100644
--- a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
+++ b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
@@ -39,6 +39,8 @@ namespace otb
  *  \ingroup Streamed
  *  \ingroup Threaded
  *
+ *
+ * \ingroup OTBStereo
  */
 template <class TDisparityImage, class TOutputImage = otb::Image<unsigned char> >
 class ITK_EXPORT BijectionCoherencyFilter :
diff --git a/Modules/Registration/Stereo/include/otbFineRegistrationImageFilter.h b/Modules/Registration/Stereo/include/otbFineRegistrationImageFilter.h
index 1c19ffeb994d598739b8534db6d76a5805588991..c800c722e6d9a0932a75810383f86b6abc88db33 100644
--- a/Modules/Registration/Stereo/include/otbFineRegistrationImageFilter.h
+++ b/Modules/Registration/Stereo/include/otbFineRegistrationImageFilter.h
@@ -64,6 +64,8 @@ namespace otb
  *
  * \sa      FastCorrelationImageFilter, DisparityMapEstimationMethod
  * \ingroup IntensityImageFilters, Streamed
+ *
+ * \ingroup OTBStereo
  */
 template <class TInputImage, class T0utputCorrelation, class TOutputDisplacementField>
 class ITK_EXPORT FineRegistrationImageFilter : public itk::ImageToImageFilter<TInputImage, T0utputCorrelation>
diff --git a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
index e6997772e23c22e5457ce3aa927f77616b79b1a3..7bb90449cb30b34c537abf8abbd2dd3f0caf193c 100644
--- a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
+++ b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
@@ -32,6 +32,8 @@ namespace otb
  *  the intersection using a Mean Square optimization method.
  *  This filter is templated over the precision of 3 points coordinates
  *
+ *
+ * \ingroup OTBStereo
  */
 template <class TPrecision = float, class TLabel = int>
 class ITK_EXPORT LineOfSightOptimizer :
diff --git a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
index 7c8431d027e9271eba40a89ce764674cf202a36d..bc93b444d81660cfb38ffb5e775e8855c00b3fa9 100644
--- a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
+++ b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
@@ -71,6 +71,8 @@ enum CellFusionMode {
  *  \ingroup Streamed
  *  \ingroup Threaded
  *
+ *
+ * \ingroup OTBStereo
  */
 template <class T3DImage =  otb::VectorImage<double,2>,
           class TMaskImage = otb::Image<unsigned char>, class TOutputDEMImage = otb::Image<double> >
diff --git a/Modules/Registration/Stereo/include/otbNCCRegistrationFilter.h b/Modules/Registration/Stereo/include/otbNCCRegistrationFilter.h
index f6923037a629d1c1ffde99a45101571af33544c7..051b3433bb2b9ce654efaf9712842269dcf23319 100644
--- a/Modules/Registration/Stereo/include/otbNCCRegistrationFilter.h
+++ b/Modules/Registration/Stereo/include/otbNCCRegistrationFilter.h
@@ -62,6 +62,8 @@ namespace otb
  * \example  DisparityMap/NCCRegistrationFilterExample.cxx
  *
  *
+ *
+ * \ingroup OTBStereo
  */
 template<class TFixedImage, class TMovingImage, class TDisplacementField>
 class ITK_EXPORT NCCRegistrationFilter :
diff --git a/Modules/Registration/Stereo/include/otbNCCRegistrationFunction.h b/Modules/Registration/Stereo/include/otbNCCRegistrationFunction.h
index d2a7d0f0a77daccbcd55e12679e82e53cfbbe378..ea5fa362759c2fa2cae611ad44e1f8fb8e862e48 100644
--- a/Modules/Registration/Stereo/include/otbNCCRegistrationFunction.h
+++ b/Modules/Registration/Stereo/include/otbNCCRegistrationFunction.h
@@ -41,6 +41,8 @@ namespace otb
  *
  * \sa itk::NCCRegistrationFunction
  * \ingroup FiniteDifferenceFunctions
+ *
+ * \ingroup OTBStereo
  */
 template<class TFixedImage, class TMovingImage, class TDisplacementField>
 class ITK_EXPORT NCCRegistrationFunction :
diff --git a/Modules/Registration/Stereo/include/otbPixelWiseBlockMatchingImageFilter.h b/Modules/Registration/Stereo/include/otbPixelWiseBlockMatchingImageFilter.h
index 226beb0b799a947fa5a4fdc4e67b7aacfc9d024c..529ee40973971ae8f1161234e761011925f5571f 100644
--- a/Modules/Registration/Stereo/include/otbPixelWiseBlockMatchingImageFilter.h
+++ b/Modules/Registration/Stereo/include/otbPixelWiseBlockMatchingImageFilter.h
@@ -37,6 +37,8 @@ namespace Functor
  *  SSD (Sum of Square Distances) block-matching. The functor is
  *  templated by the type of inputs images and output metric image,
  *  and is using two neighborhood iterators as inputs.
+ *
+ * \ingroup OTBStereo
  */
 template <class TInputImage, class TOutputMetricImage>
 ITK_EXPORT class SSDBlockMatching
@@ -69,6 +71,8 @@ public:
  *  SSD (Sum of Square Distances) block-matching. The functor is
  *  templated by the type of inputs images and output metric image,
  *  and is using two neighborhood iterators as inputs.
+ *
+ * \ingroup OTBStereo
  */
 template <class TInputImage, class TOutputMetricImage>
 ITK_EXPORT class SSDDivMeanBlockMatching
@@ -112,6 +116,8 @@ public:
  *  NCC (Normalized Cross-Correlation) block-matching. The functor is
  *  templated by the type of inputs images and output metric image,
  *  and is using two neighborhood iterators as inputs.
+ *
+ * \ingroup OTBStereo
  */
 template <class TInputImage, class TOutputMetricImage>
 ITK_EXPORT class NCCBlockMatching
@@ -180,6 +186,8 @@ public:
  *  two windows based on the L^p pseudo norm (p greater than 0). The functor is
  *  templated by the type of inputs images and output metric image,
  *  and is using two neighborhood iterators as inputs.
+ *
+ * \ingroup OTBStereo
  */
 template <class TInputImage, class TOutputMetricImage>
 ITK_EXPORT class LPBlockMatching
@@ -280,6 +288,8 @@ private:
  *  \ingroup Streamed
  *  \ingroup Threaded
  *
+ *
+ * \ingroup OTBStereo
  */
 
 template <class TInputImage, class TOutputMetricImage, class TOutputDisparityImage = TOutputMetricImage, class TMaskImage = otb::Image<unsigned char>,
diff --git a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
index 83dead84ba5673f270efe20c5793d446dbbed242..7273aaf7a7924ec90639e72cb461c540317a3fda 100644
--- a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
+++ b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
@@ -73,6 +73,8 @@ namespace otb
  *
  *   \ingroup Streamed
  *   \ingroup Threaded
+ *
+ * \ingroup OTBStereo
  */
 template <class TInputImage, class TOutputHeight>
 class ITK_EXPORT StereoSensorModelToElevationFilter
diff --git a/Modules/Segmentation/CCOBIA/include/otbConnectedComponentMuParserFunctor.h b/Modules/Segmentation/CCOBIA/include/otbConnectedComponentMuParserFunctor.h
index c53bd730d7e422e8357a690d7e216deb7a0872b2..606403ddad22d778c70f17ff92f2a728c2b2d802 100644
--- a/Modules/Segmentation/CCOBIA/include/otbConnectedComponentMuParserFunctor.h
+++ b/Modules/Segmentation/CCOBIA/include/otbConnectedComponentMuParserFunctor.h
@@ -56,10 +56,14 @@ namespace otb
  *
  * \sa Parser
  *
+ *
+ * \ingroup OTBCCOBIA
  */
 
 /** \class ConnectedComponentMuParserFunctor
  *  \brief This functor use MuParser as criteria for itk connected component module
+ *
+ * \ingroup OTBCCOBIA
  */
 namespace Functor
 {
diff --git a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
index 02def3f79dd552363cbcd3a5f72999a39344c80a..87a85bd0ec3c1e4b5ad3a6cf9e5b8a6fb203a00f 100644
--- a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
+++ b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
@@ -55,6 +55,8 @@ namespace otb
  *
  * \sa Parser
  *
+ *
+ * \ingroup OTBCCOBIA
  */
 template<class TImage, class TFunction = Functor::OBIAMuParserFunctor<typename TImage::LabelObjectType> >
 class ITK_EXPORT LabelObjectOpeningMuParserFilter: public itk::InPlaceLabelMapFilter<TImage>
diff --git a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
index c32538979ff6a4c0ce29f3c8ca00016022cf9fdb..2ad1a455d2d908a8053aebf7eb89b5e4c4d612c2 100644
--- a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
+++ b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
@@ -52,6 +52,8 @@ namespace otb {
 *  - OBIAExpression : mathematical expression for OBIA filtering
 *
 * \ingroup Streamed
+ *
+ * \ingroup OTBCCOBIA
 */
 template <class TVImage, class TLabelImage, class TMaskImage, class TOutputVectorData>
 class PersistentConnectedComponentSegmentationOBIAToVectorDataFilter : public otb::PersistentImageToVectorDataFilter<TVImage, TOutputVectorData>
@@ -221,6 +223,8 @@ private:
 * \sa PersistentFilterStreamingDecorator
 *
 * \ingroup Streamed
+ *
+ * \ingroup OTBCCOBIA
 */
 template <class TVImage, class TLabelImage, class TMaskImage, class TOutputVectorData>
 class StreamingConnectedComponentSegmentationOBIAToVectorDataFilter
diff --git a/Modules/Segmentation/Conversion/include/otbGISTableToLabelMapFilter.h b/Modules/Segmentation/Conversion/include/otbGISTableToLabelMapFilter.h
index b57752c985573c79303c5ef121763d57a9ecfafe..f86d63c0d57e1817e570d48e08c293ac446aa49d 100644
--- a/Modules/Segmentation/Conversion/include/otbGISTableToLabelMapFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbGISTableToLabelMapFilter.h
@@ -35,6 +35,8 @@ namespace otb {
  *
  * \sa LabelMapSource
  * \ingroup Common, GeospatialAnalysis
+ *
+ * \ingroup OTBConversion
  */
 template<class TGISTable, class TLabelMap>
 class ITK_EXPORT GISTableToLabelMapFilter :
diff --git a/Modules/Segmentation/Conversion/include/otbGISTableToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbGISTableToVectorDataFilter.h
index 5b1ae21987fbdae79fb27df4a4baa0c5a75d88ce..575ef344c0411acbf50e3bc8646ba3c4605f7406 100644
--- a/Modules/Segmentation/Conversion/include/otbGISTableToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbGISTableToVectorDataFilter.h
@@ -35,6 +35,8 @@ namespace otb {
  *
  * \sa VectorDataSource
  * \ingroup Common, GeospatialAnalysis
+ *
+ * \ingroup OTBConversion
  */
 template<class TGISTable, class TVectorData>
 class ITK_EXPORT GISTableToVectorDataFilter :
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
index 6f538901e401995bcc70c0af5002ecb9d2138a4a..242439ddbcc2aeef78b5477ac1863a39bd6152d4 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
@@ -35,6 +35,8 @@ namespace otb
  *
  *
  * \ingroup ImageSegmentation
+ *
+ * \ingroup OTBConversion
  */
 template <class TInputLabelImage, class TInputSpectralImage, class TOutputLabelImage = TInputLabelImage, class TOutputClusteredImage = TInputSpectralImage>
 class ITK_EXPORT LabelImageRegionMergingFilter
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
index 0ab714e84631d8128a8d4af7f76bb64bf971aa4a..8643a00dfb84849db82a245a6c5192487ee361a4 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
@@ -36,6 +36,8 @@ namespace otb
  *
  *
  * \ingroup ImageSegmentation
+ *
+ * \ingroup OTBConversion
  */
 template <class TInputLabelImage, class TInputSpectralImage, class TOutputLabelImage = TInputLabelImage, class TOutputClusteredImage = TInputSpectralImage>
 class ITK_EXPORT LabelImageRegionPruningFilter
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
index ad1e5520c5240b7a44f20a1bb4662093564cd245..170d25c0c301d68f0405292c8b769955451f6a86 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
@@ -36,6 +36,8 @@ namespace otb
  * \Note It is a non-streamed version.
  * \ingroup OBIA
  *
+ *
+ * \ingroup OTBConversion
  */
 
 template <class TInputImage>
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
index 41bf745cf6502e2439904e59976c0cbd31d4989a..9efce6f18f89c86c8488fd82354a33ff981ada1a 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * can create cross polygons !
  * \Note It is a non-streamed version.
  *  \ingroup OBIA
+ *
+ * \ingroup OTBConversion
  */
 
 template <class TInputImage, class TPrecision = double>
diff --git a/Modules/Segmentation/Conversion/include/otbLabelMapToGISTableFilter.h b/Modules/Segmentation/Conversion/include/otbLabelMapToGISTableFilter.h
index c21776ff09268ce4866631f40f92faa406f3f23f..e3fc46d40e6adf729ff11624f325b8e0930a9ee3 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelMapToGISTableFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelMapToGISTableFilter.h
@@ -44,6 +44,8 @@ namespace otb {
  *
  * \sa LabelMapToBinaryImageFilter, LabelMapMaskImageFilter
  * \ingroup ImageEnhancement  MathematicalMorphologyImageFilters
+ *
+ * \ingroup OTBConversion
  */
 template<class TLabelMap, class TGISTable>
 class ITK_EXPORT LabelMapToGISTableFilter :
diff --git a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
index f2feecc04e0377c3d2c56b4a11a72778d708630d..d9004f4aa84e3bfdd5d7604a4810e6578ca76e11 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
@@ -47,6 +47,8 @@ namespace otb {
    *
    * \sa VectorDataSource
  * \ingroup GeoSpatialAnalysis
+ *
+ * \ingroup OTBConversion
  */
 template<class TLabelMap, class TVectorData,
          class TFieldsFunctor = Functor::LabelObjectFieldsFunctor<typename TLabelMap::LabelObjectType> >
diff --git a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
index 6cd7a0648810c4a6375a2addff2443e821a5c9d4..997c3d4f0bdd000c3fabdf3031ce57664135ae08 100644
--- a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
@@ -47,6 +47,8 @@ namespace otb {
  *    - Setting the Origin/Size/Spacing of the output image
  *    - Using an existing image as support via SetOutputParametersFromImage(ImageBase)
  *
+ *
+ * \ingroup OTBConversion
  */
 template < class TOutputImage >
 class  ITK_EXPORT OGRDataSourceToLabelImageFilter :
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
index 9861eedbacc5b5d8b22d4c7f3b198fe8e70e152a..c591ae3e99be9dd6297ddfea746eca52143ca810 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
@@ -44,6 +44,8 @@ namespace otb
  *
  * \sa PersistentImageFilter
  *
+ *
+ * \ingroup OTBConversion
  */
 template<class TImage>
 class ITK_EXPORT PersistentImageToOGRDataFilter :
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
index 7c8553b2201aaa24d7d9bed152c17c4df148365b..4e7727b94440f0e88a29195cfc0e3a24441938c8 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
@@ -43,6 +43,8 @@ namespace otb
  *
  * \sa PersistentImageFilter
  *
+ *
+ * \ingroup OTBConversion
  */
 template<class TImage>
 class ITK_EXPORT PersistentImageToOGRLayerFilter :
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
index 485ac31110db6bc94116ff6c80e15aeb740930b4..0a262e79a03f6ba1099a36cdaf065d246133f524 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
@@ -43,6 +43,8 @@ namespace otb
  *
  * \sa PersistentImageFilter
  *
+ *
+ * \ingroup OTBConversion
  */
 template<class TImage, class TOutputVectorData>
 class ITK_EXPORT PersistentImageToVectorDataFilter :
diff --git a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
index 4ab5e77fea71671f0d63a6da2ded73543b0aa1af..a8e7ad8fc5f766c03049de96a18af197bbacfe12 100644
--- a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
@@ -54,6 +54,8 @@ namespace otb {
  *  Note : The VectorDatas and the input raster must be in the same
  *  projectionRef. Nothing is done in this class to reproject the
  *  VectorData into the image coordinate system.
+ *
+ * \ingroup OTBConversion
  */
 template <class TVectorData, class TInputImage, class TOutputImage = TInputImage  >
 class  ITK_EXPORT RasterizeVectorDataFilter :
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToGISTableFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToGISTableFilter.h
index ef309bd338bb6c30203461e1c915abcdb2a88ccc..bea98a78629d015e8beafc995b4e9580422bfd3a 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToGISTableFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToGISTableFilter.h
@@ -43,6 +43,8 @@ namespace otb {
  *
  * \sa GISTableSource
  * \ingroup Common, GeospatialAnalysis
+ *
+ * \ingroup OTBConversion
  */
 template<class TVectorData, class TGISTable>
 class ITK_EXPORT VectorDataToGISTableFilter :
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
index 74ac0d17675f28bf2f93ff1ad665c2ed93ab6caf..75c60591b6312628599c95bb6d32cd5043f6ad3f 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
@@ -42,6 +42,8 @@ namespace otb {
  *
  *  OGRRegisterAll() method must have been called before applying filter.
  *
+ *
+ * \ingroup OTBConversion
  */
 template <class TVectorData, class TOutputImage  >
 class  ITK_EXPORT VectorDataToLabelImageFilter :
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
index 92855b5078bad23545dcb14b423b74c6c0b82828..776463cfba5299ad8083038edf85636500b3cc23 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
@@ -47,6 +47,8 @@ namespace otb
  * The final object labels start with 1 and are consecutive (depraced +10).
  *
  * \sa LabelMapSource
+ *
+ * \ingroup OTBConversion
  */
 
 template <class TVectorData, class TLabelMap>
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
index 7ddba0a65f4d24acade88f6b0359715c7ee47c21..3f7015a6ece0dd713edf8d1fc27b478c4fd8ad2a 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
@@ -54,6 +54,8 @@ namespace otb
  * Note : the coordinates in the vector data are assumed to be physical coordinates.
  *
  * \sa LabelMapSource
+ *
+ * \ingroup OTBConversion
  */
 
 template <class TVectorData, class TLabelMap>
diff --git a/Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftImageFilter.h b/Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftImageFilter.h
index 65f778a736b43753b97ea083c2f463b28621dc32..37072f6f38de23ffcfa2c96830aca8013337593e 100644
--- a/Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftImageFilter.h
+++ b/Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftImageFilter.h
@@ -35,6 +35,8 @@ namespace MeanShift
  *   This class handles buffer conversion when pixel type is scalar.
  *  \deprecated
  *
+ *
+ * \ingroup OTBEdisonMeanShift
  **/
 class ScalarBufferConverter
 {
@@ -97,6 +99,8 @@ public:
  * \sa MeanShiftSmootingImageFilter, MeanShiftSegmentationFilter
  *
  * \ingroup ImageEnhancement
+ *
+ * \ingroup OTBEdisonMeanShift
  */
 
 template <class TInputImage, class TOutputImage,
diff --git a/Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftVectorImageFilter.h b/Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftVectorImageFilter.h
index 1f61e789b1fd338852f04f19fceeba3fe6907901..c5b1c0132951f9a20aafba70b9190633a8f6b25d 100644
--- a/Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftVectorImageFilter.h
+++ b/Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftVectorImageFilter.h
@@ -29,6 +29,8 @@ namespace MeanShift
  *  \brief Small utilities class used for buffer conversion with EDISON standard.
  *   This class handles buffer conversion when pixel type is scalar.
  * \deprecated
+ *
+ * \ingroup OTBEdisonMeanShift
  **/
 class VectorBufferConverter
 {
@@ -75,6 +77,8 @@ public:
  * \sa MeanShiftSmootingImageFilter, MeanShiftSegmentationFilter
  *
  * \ingroup ImageEnhancement
+ *
+ * \ingroup OTBEdisonMeanShift
  */
 template <class TInputImage, class TOutputImage, class TLabeledOutput = otb::Image<unsigned short, 2> >
 class MeanShiftVectorImageFilter
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
index 8f332d1b66314d7de2eeda21bf606ffd961200bf..9e3e9a2f2625df6e371fa5b4810a96b646d055ea 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
@@ -29,6 +29,8 @@ namespace otb
  *
  *  This class implements abstract class otb::LabelizeImageFilterBase
  *  \see itk::ConfidenceConnectedImageFilter
+ *
+ * \ingroup OTBLabelling
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT LabelizeConfidenceConnectedImageFilter
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
index 44e2476e863c2f5f7494bdc676646869e7f293d3..f26a729e16da7b31f5dfc017b18061e5a25f4208 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
@@ -27,6 +27,8 @@ namespace otb
 /** \class LabelizeConnectedThresholdImageFilter
  *  \brief TODO
  *
+ *
+ * \ingroup OTBLabelling
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT LabelizeConnectedThresholdImageFilter
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
index c1827a1e188458f1af83f1a18fb429e0d9aa1063..755d8856d646d82df72d97b9bb63734d7c9aba3b 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
@@ -29,6 +29,8 @@ namespace otb
 /** \class LabelizeImageFilterBase
  *  \brief Base class for filter labelizing image region based on segmentation.
  *
+ *
+ * \ingroup OTBLabelling
  */
 template <class TInputImage, class TOutputImage, class TFilter>
 class ITK_EXPORT LabelizeImageFilterBase
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
index 75076fd937b2fb09512ee961d2877c684e871320..5dcf88b29f4d498c757f7ac8a2124c044a1ef73c 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
@@ -33,6 +33,8 @@ namespace otb
  *  First seeds are obtained with a theshold filter
  *  For each seed, itk::NeighborhoodConnectedImageFilter labels pixel
  *  Finally, filter produce a regions map
+ *
+ * \ingroup OTBLabelling
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT LabelizeNeighborhoodConnectedImageFilter
diff --git a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
index d18ba565d7c6a2e28d5d4b82d65d88bc254770d9..5c289b8209c281d1a630f051f4221ae5e9c3fd55 100644
--- a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
@@ -67,6 +67,8 @@ namespace otb
  * \sa ConnectedComponentImageFilter, BinaryThresholdImageFilter, ThresholdImageFilter
  *
  * \ingroup Singlethreaded
+ *
+ * \ingroup OTBLabelling
  */
 
 template <class TInputImage, class TOutputImage>
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
index fb6dfaa881de20019785ff5a5862c5b5545530c8..5b394fd9593de55adeda3f8b1bfc5b2a24e04918 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
@@ -45,6 +45,8 @@ namespace otb {
 *  - ConnectedComponentExpression : mathematical expression which connects two pixels
 *  - MinimumObjectSize : minimum object size kept after segmentation
 *
+ *
+ * \ingroup OTBMeanShift
 */
 
 
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
index 7359825da0badb242f2268f06937f2d2cfc67838..7057b2016990e8c3a37f7aeb2088b7c16604e69f 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
@@ -78,6 +78,8 @@ private:
 *  merging filter.
 *  This filter relies on MeanShift Labeled image created from clustered filtered output of meanshift filter.
 *  Mode search algorithm is not performed on tiles boundaries. Thus output depends on Thread numbers.
+ *
+ * \ingroup OTBMeanShift
 */
 
 
diff --git a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
index 6f219ce8fcc19174f7fa5bdf12e578a20ee95696..03c8a2b924a54871708e26dd443c1c042bc74ae8 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
+++ b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
@@ -62,6 +62,8 @@ namespace otb
  * (see Hoover et al., "An experimental comparison of range image segmentation algorithms", IEEE PAMI vol. 18, no. 7, July 1996)
  *
  * \sa HooverMatrixFilter
+ *
+ * \ingroup OTBMetrics
  */
 
 template< class TLabelMap >
diff --git a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
index be955e737e11a65748a6c82dc86c13719b917c36..fb2395bf90cb22fb5b16bdffa658365cca477e94 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
+++ b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
@@ -32,6 +32,8 @@ namespace otb
  * couples of region. These couples are made from a ground truth segmentation and
  * a machine segmentation. The line number gives the index of the ground truth region. The
  * column number gives the index of the machine segmentation region.
+ *
+ * \ingroup OTBMetrics
  */
 
 template< class TLabelMap >
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
index 122084647748e34c369e4b9af462edda0f7b7a63..c7290c59744daa911c443de3659901049d3cfdc1 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
@@ -38,6 +38,8 @@ namespace otb
  *
  * \sa ClosingOpeningMorphologicalFilter,
  * MorphologicalPyramidAnalysisFilter
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TInputImage, class TOutputImage, class TKernel>
 class ITK_EXPORT ClosingOpeningMorphologicalFilter
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
index a532359e8ab0c09b30aeffa516314878a6e46bf5..835d2c83dc9095f680d299b0702f292cc1c57db7 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
@@ -49,6 +49,8 @@ namespace Functor
  *  \end{array}\right.
  * \f]
  *
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template<class TInput, class TOutput>
 class ConvexOrConcaveDecisionRule
@@ -173,6 +175,8 @@ private:
  *
  * \sa GeodesicMorphologyDecompositionImageFilter
  * \sa GeodesicMorphologyLevelingFilter
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ConvexOrConcaveClassificationFilter
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
index d4bfba606d24095b83aac7ad11bf4872d6d45658..41b4e93458f27e694447ef6b3952559368b95641 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
@@ -75,6 +75,8 @@ namespace otb
  * \sa GeodesicMorphologyLevelingFilter
  * \sa itk::OpeningByReconstructionImageFilter
  * \sa itk::ClosingByReconstructionImageFilter
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TInputImage, class TOutputImage, class TStructuringElement>
 class ITK_EXPORT GeodesicMorphologyDecompositionImageFilter
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
index c482d1add66990cf0254a74338c073852d86f570..d29e0a923dff31c05915e1e7cf78002ad2aa866d 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
@@ -59,6 +59,8 @@ namespace otb
  * for the convex (resp. concave) objects whose size is comprised between \f$N_{n-1} \f$ and \f$N_n\f$ .
  *
  * \sa GeodescicMorphologyDecompositionImageFilter
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TImage, class TStructuringElement>
 class ITK_EXPORT GeodesicMorphologyIterativeDecompositionImageFilter
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
index 623ddd1ea4bc33828ad8df3a87c0e2c2f5f4330b..7f210c9ce4739e9c93b8bf3f6404bb615f989c0f 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
@@ -29,6 +29,8 @@ namespace Functor
  * geodesic morphology decomposition filter. For more details, please refer to
  * the documentation of this filter.
  * \sa GeodesicMorphologyDecompositionImageFilter
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TInput, class TInputMap, class TOutput>
 class LevelingFunctor
@@ -66,6 +68,8 @@ public:
  *  functions. Please refer to the documentation of this filter for more details.
  *
  * \sa GeodesicMorphologyDecompositionImageFilter
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TInputImage, class TInputMaps, class TOutputImage>
 class ITK_EXPORT GeodesicMorphologyLevelingFilter
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
index a40119828619ce397cf372401efc5cc194c1b577..fc75eb56daa378acf532a4bb7c02f4d7f88fed87 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
@@ -37,6 +37,8 @@ namespace otb
  *
  * \sa MorphologicalOpeningProfileFilter
  * \sa MorhologicalClosingProfileFilter
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TInputImage, class TOutputImage, class TFilter, class TParameter = unsigned int>
 class ITK_EXPORT ImageToProfileFilter
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
index c2f0ccc8c8280f8e07ba96f92187ce4d4c69d03a..b82fd77bf5c21c498e870f9f91c7c8e428bcff62 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
@@ -42,6 +42,8 @@ namespace otb
  *
  * \sa ImageToProfileFilter
  * \sa itk::ClosingByReconstructionImageFilter
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TInputImage, class TOutputImage, class TStructuringElement>
 class ITK_EXPORT MorphologicalClosingProfileFilter
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
index 345d084c4a97b605c740ec0dbd6042d091fd8e4b..8764c95be0956554692f92054f78b8f63fcb02f9 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
@@ -42,6 +42,8 @@ namespace otb
  *
  * \sa ImageToProfileFilter
  * \sa itk::OpeningByReconstructionImageFilter
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TInputImage, class TOutputImage, class TStructuringElement>
 class ITK_EXPORT MorphologicalOpeningProfileFilter
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
index 1e4b63ac3129324f6c519635fe02dd5b234ac856..15c29e8fc0afb8a96a78efe0381e9e572246ba48 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
@@ -51,6 +51,8 @@ namespace otb
 *   \sa otb::ProfileToProfileDerivativeFilter
 *   \sa otb::ProfileDerivativeToMultiScaleCharacteristicsFilter
 *   \sa otb::MultiScaleConvexOrConcaveClassificationFilter
+ *
+ * \ingroup OTBMorphologicalProfiles
 */
 template <class TInputImage,  class TOuputImage, class TInternalPrecision = float, class TStructuringElement = itk::BinaryBallStructuringElement<typename TInputImage::PixelType, TInputImage::ImageDimension> >
 class ITK_EXPORT MorphologicalProfilesSegmentationFilter
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
index 296f92994cf1e38e61daed42bea4504d1aac2f59..fe8b16dd9ea4c49dbba35e5e8a618866f751a448 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
@@ -51,6 +51,8 @@ namespace Functor
  *
  * This functor is the decision rule used for multi-scale classification using
  * morphological profiles.
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template<class TInput, class TLabeled>
 class MultiScaleConvexOrConcaveDecisionRule
@@ -141,6 +143,8 @@ private:
  *
  * See MultiScaleConvexOrConcaveDecisionRule functor documentation for more details.
  *
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT MultiScaleConvexOrConcaveClassificationFilter
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
index 92c6581ef6af7a7d048fc4be6f8b2eb1727f52d9..7bcf55ab9f92876ffac18e4db00ffeb431b7cfdd 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
@@ -38,6 +38,8 @@ namespace otb
  *
  * \sa ClosingOpeningMorphologicalFilter,
  * MorphologicalPyramidAnalyseFilter
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TInputImage, class TOutputImage, class TKernel>
 class ITK_EXPORT OpeningClosingMorphologicalFilter
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
index b8cf55eef41a13057fcbbd5961e3dc3c8a326250..c83db8aa56a8293174f40338b8c4ab7e501eb0a2 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
@@ -35,6 +35,8 @@ namespace otb
  *  parameter corresponding to the input profile.
  *
  * \sa ProfileToProfileDerivativeImageFilter
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TInputImage, class TOutputImage, class TLabeledImage>
 class ITK_EXPORT ProfileDerivativeToMultiScaleCharacteristicsFilter
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
index a65b9d2b5b39597daf4858d3bf17804cc78c89c6..0c899f10f1735d3632b27d155b11d78ab611d1d3 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
@@ -37,6 +37,8 @@ namespace otb
  * with \f$ \Delta\phi_{n}(f) = \mid \Pi_{\phi_{n2}}(f)-\Pi_{\phi_{n1}}(f) \mid \f$
  *
  * \ingroup Streamed
+ *
+ * \ingroup OTBMorphologicalProfiles
  */
 template <class TInputImage, class TOutputImage>
 class ITK_EXPORT ProfileToProfileDerivativeFilter
diff --git a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
index 535e63947c46d18ef9e90fcf13deb3272a1966c8..2c7f05b0fa1e74458a8e8a8aa42d54db08542d56 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
@@ -49,6 +49,8 @@ namespace otb
  *  \ingroup OBIA
  *
  *
+ *
+ * \ingroup OTBOGRProcessing
  */
 template <class TInputImage>
 class ITK_EXPORT OGRLayerStreamStitchingFilter :
diff --git a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
index 7bfcad4d7ef190f33f7c9c00bba6849fb790b8b0..8771421fd5848d00974394c73a87c71e5bf6e560 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
@@ -38,6 +38,8 @@ namespace otb
 /**
  * \class LabeledOutputAccessor
  * \brief Accessor to the index of the labeled output image of the Template Filter.
+ *
+ * \ingroup OTBOGRProcessing
  */
 template <class TFilter>
 class LabeledOutputAccessor
@@ -50,6 +52,8 @@ class LabeledOutputAccessor
 /**
  * \class LabeledOutputAccessor
  * \brief Specialized class to get the index of the labeled output image in mean shift filter.
+ *
+ * \ingroup OTBOGRProcessing
  */
 template <class TInputImage, class TOutputImage, class TLabeledImage, class TBufferConverter>
 class LabeledOutputAccessor<MeanShiftImageFilter<TInputImage, TOutputImage, TLabeledImage, TBufferConverter> >
@@ -62,6 +66,8 @@ class LabeledOutputAccessor<MeanShiftImageFilter<TInputImage, TOutputImage, TLab
 /**
  * \class LabeledOutputAccessor
  * \brief Specialized class to get the index of the labeled output image in mean shift vector image filter.
+ *
+ * \ingroup OTBOGRProcessing
  */
 template <class TInputImage, class TOutputImage, class TLabeledImage>
 class LabeledOutputAccessor<MeanShiftVectorImageFilter<TInputImage, TOutputImage, TLabeledImage> >
@@ -74,6 +80,8 @@ class LabeledOutputAccessor<MeanShiftVectorImageFilter<TInputImage, TOutputImage
 /**
  * \class LabeledOutputAccessor
  * \brief Specialized class to get the index of the labeled output image in mean shift filter (new version).
+ *
+ * \ingroup OTBOGRProcessing
  */
 template <class TInputImage, class TOutputImage, class TOutputImage2, class TKernelType>
 class LabeledOutputAccessor<MeanShiftSmoothingImageFilter<TInputImage, TOutputImage, TOutputImage2, TKernelType> >
@@ -87,6 +95,8 @@ class LabeledOutputAccessor<MeanShiftSmoothingImageFilter<TInputImage, TOutputIm
  * \brief This filter is a framework for large scale segmentation.
  * For a detailed description @see StreamingImageToOGRLayerSegmentationFilter
  * \Note
+ *
+ * \ingroup OTBOGRProcessing
  */
 template <class TImageType,  class TSegmentationFilter>
 class PersistentImageToOGRLayerSegmentationFilter
@@ -223,6 +233,8 @@ private:
  * can create cross polygons !
  * \Note The input mask can be used to exclude pixels from vectorization process.
  * All pixels with a value of 0 in the input mask image will not be suitable for vectorization.
+ *
+ * \ingroup OTBOGRProcessing
  */
 template <class TImageType,  class TSegmentationFilter>
 class ITK_EXPORT StreamingImageToOGRLayerSegmentationFilter :
diff --git a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
index a623ab3357f389f0f205901ec943fcef27a230b2..4a658542bfb5a4c6e56019746c18e33fc86b3e9c 100644
--- a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
+++ b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
@@ -37,6 +37,8 @@ namespace otb {
 *   For more information, please refere to the documentation of the
 *   original itk::WatershedImageFilter .
 *
+ *
+ * \ingroup OTBWatersheds
 */
 template <class TInputImage,  class TOutputLabelImage >
 class WatershedSegmentationFilter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h
index b95a8c2224ff015eb448cdd38c4358e427fdc9be..f8ee6e658ee0258fef663cbf87d34367d24bb4c4 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h
@@ -30,6 +30,8 @@ namespace Wrapper
  *  \brief This class implements an event storing a pointer to
  *  itk::ProcessObject and a string describing the process.
  *
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT AddProcessToWatchEvent: public itk::EventObject
 {
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
index 5fd9b0f0ad7f4f5733a9ac4fa02ec8f428dc0de7..9c83a78636b2390122104cb841870a8b87492c66 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
@@ -41,6 +41,8 @@ namespace Wrapper
  *  \brief This class represent an application
  *  TODO
  *
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT Application: public itk::Object
 {
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationHtmlDocGenerator.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationHtmlDocGenerator.h
index ad03a42d46a35c952616cc46aa8e522c51baa2a6..407aa35f299c25dd2bc6f20123d0010c3acca1f0 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationHtmlDocGenerator.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationHtmlDocGenerator.h
@@ -27,6 +27,8 @@ namespace Wrapper
 /** \class ApplicationHtmlDocGenerator
  *  \brief This class genertaes the documentation of a class usung the
  *  class doc attributes.
+ *
+ * \ingroup OTBApplicationEngine
  */
 
 class ITK_ABI_EXPORT ApplicationHtmlDocGenerator
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h
index f6b7a14252275f8ad55d9d6f2b3880f5a7f01225..ed1699d204be26826facb44523b4691d298e4308 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h
@@ -32,6 +32,8 @@ namespace Wrapper
  *  \brief This class represent an application
  *  TODO
  *
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT ApplicationRegistry : public itk::Object
 {
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h
index 4a3b09c689b888c7d9dc4079190332d93db215c2..5cff129f7f3810093460739f5735f96b795c0300 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
  *
  *  Represents an enumerated parameter.
  *  The different values of the enumeration can be associated with a parameter
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT ChoiceParameter
   : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
index f5d8fb5e145c0f3973368bdcf33dfb7d92c48c79..14eccd1f253c8a433b71912c8066f1dae79d3e3f 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
@@ -28,6 +28,8 @@ namespace Wrapper
 {
 /** \class ComplexInputImageParameter
  *  \brief This class represents a ComplexInputImage parameter
+ *
+ * \ingroup OTBApplicationEngine
  */
 
 class ITK_ABI_EXPORT ComplexInputImageParameter : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
index 59ee6d7f20bda7a4562779ce2c5e1716d68762b0..6500d54621d307f5f9a18db2d7e5e58d5617a413 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
@@ -28,6 +28,8 @@ namespace Wrapper
 {
 /** \class ComplexOutputImageParameter
  *  \brief This class represents a ComplexOutputImage parameter
+ *
+ * \ingroup OTBApplicationEngine
  */
 
 class ITK_ABI_EXPORT ComplexOutputImageParameter : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
index 079401aa4e9a971752f8100820f8f54d80d5ece5..9051bef4d3c6047e6c960e134ea0ee22141c827c 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class DirectoryParameter
  *  \brief This class represent a string parameter for the wrapper framework
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT DirectoryParameter
   : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h
index 4f3ef2ce7afffc04cd37254e3871f2e6ed62ebe6..c5573a114e3e21265eae751d1cee741bb5146381 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h
@@ -39,6 +39,8 @@ namespace Wrapper
  *  ...).
  * User has to set the application name, the binary path and a list of
  *  key/value couple.
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT DocExampleStructure :
   public itk::Object
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperElevationParametersHandler.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperElevationParametersHandler.h
index bc6ef2f57f514e42d4bb1d822e03c125c0616bbd..a7b2750f1eba4ffd9e2695671d7f8192b1410344 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperElevationParametersHandler.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperElevationParametersHandler.h
@@ -36,6 +36,8 @@ namespace Wrapper
  * using one the following methods Get{AverageElevation, DEMDirectory, GeoidFile}.
  *
  *
+ *
+ * \ingroup OTBApplicationEngine
  */
 
 class ElevationParametersHandler
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h
index 61a0df2533a3562e84325f1089915ac21218d2bd..0a13ef1469ee27998f19802e327ecd3f9fe55fa3 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h
@@ -27,6 +27,8 @@ namespace Wrapper
 
 /** \class EmptyParameter
  *  \brief This class represent an empty parameter for the wrapper framework (boolean value)
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT EmptyParameter
   : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameListParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameListParameter.h
index bb3739ed1048a23d5c86680e45b339c18e705554..1992608db84c832ad547a6eeb5e9f9d885de3a2c 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameListParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameListParameter.h
@@ -29,6 +29,8 @@ namespace Wrapper
 {
 /** \class InputFilenameListParameter
  *  \brief This class represents a list of InputFilename parameter
+ *
+ * \ingroup OTBApplicationEngine
  */
 
 class ITK_ABI_EXPORT InputFilenameListParameter : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h
index db2e65f28ab280fab7f483335b2341f6e14a4991..9c2f295418cedf5d3a561715ace7dd651dfb21e1 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h
@@ -28,6 +28,8 @@ namespace Wrapper
 
 /** \class InputFilenameParameter
  *  \brief This class represent a string parameter for the wrapper framework
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT InputFilenameParameter
   : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageListParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageListParameter.h
index cc3fb56695fcac2aa27d523f2adaea6091102aba..cb86b1e86621d035b97a4ee7708835b1c7e60326 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageListParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageListParameter.h
@@ -29,6 +29,8 @@ namespace Wrapper
 {
 /** \class InputImageListParameter
  *  \brief This class represents a list of InputImage parameter
+ *
+ * \ingroup OTBApplicationEngine
  */
 
 class ITK_ABI_EXPORT InputImageListParameter : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
index b70ca1c8cba1f108eedb516843ab98614b644f19..4c0e2fe9cea5f6a4e1311729f2b9a9f8ad162323 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
@@ -28,6 +28,8 @@ namespace Wrapper
 {
 /** \class InputImageParameter
  *  \brief This class represents a InputImage parameter
+ *
+ * \ingroup OTBApplicationEngine
  */
 
 class ITK_ABI_EXPORT InputImageParameter : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h
index f6ee85967ad35cf7877c86059e4a6884d262db8c..be5f9dc2154e8f13ebee5cefc1f14fb4dfa60112 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h
@@ -1,7 +1,7 @@
 #ifndef __otbWrapperInputProcessXMLParameter_h
 #define __otbWrapperInputProcessXMLParameter_h
 #include "otbWrapperApplication.h"
-#include "otbTinyXML.h"
+#include "otb_tinyxml.h"
 #include <sstream>
 
 namespace otb
@@ -11,6 +11,8 @@ namespace Wrapper
 
 /** \class InputProcessXMLParameter
  *  \brief This class represent a xml filename parameter for the wrapper framework to load otb application.
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT InputProcessXMLParameter
   : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataListParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataListParameter.h
index 738d4bc4d95af8cc47559e47b67621261cc1eeab..71df9b3830e10a575db919fdfe506f4c873d1704 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataListParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataListParameter.h
@@ -29,6 +29,8 @@ namespace Wrapper
 {
 /** \class InputVectorDataListParameter
  *  \brief This class represents a list of VectorData parameter
+ *
+ * \ingroup OTBApplicationEngine
  */
 
 class ITK_ABI_EXPORT InputVectorDataListParameter : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h
index 5a38da9d3ae3e6940d6dac24ffad839c36aa2ae2..7f9aac71f2ed4de160006c6eebce4df01d57a6d4 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h
@@ -27,6 +27,8 @@ namespace Wrapper
 {
 /** \class InputVectorDataParameter
  *  \brief This class represents a InputVectorData parameter
+ *
+ * \ingroup OTBApplicationEngine
  */
 
 class ITK_ABI_EXPORT InputVectorDataParameter : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h
index ae2d1ca2b02c164e38a142c7c72e969b509ddbf5..b50fa171e059e209a476146731a323f0dabb4fef 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h
@@ -31,6 +31,8 @@ namespace Wrapper
  * The row selected in the ListWidget are stored in a std::vector. The
  * method GetSelectedItems() allow the user to access to this method.
  *
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT ListViewParameter
   : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperMapProjectionParametersHandler.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperMapProjectionParametersHandler.h
index b2edd3173605b22a8149eed800ee28725508d585..08d1de8cf8f588431877ca02fb8ea3b849eb6e91 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperMapProjectionParametersHandler.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperMapProjectionParametersHandler.h
@@ -42,6 +42,8 @@ enum
  *
  * This class allow creating a Group with several mapProjection
  * parameters
+ *
+ * \ingroup OTBApplicationEngine
  */
 class MapProjectionParametersHandler
 {
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h
index e233a32484d5afefc32abeb2f1267382fa7fd638..5117a3af48c9561be0cf46c134e67164d6f433ce 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h
@@ -28,6 +28,8 @@ namespace Wrapper
 {
 /** \class NumericalParameter
  *  \brief This class represents a numerical parameter
+ *
+ * \ingroup OTBApplicationEngine
  */
 template <class T>
 class ITK_ABI_EXPORT NumericalParameter : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h
index e960bd4744daf5cb2c99840384f6e09884f5f108..31bacce37456176bebae679041bd3c5f6d7bb658 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h
@@ -28,6 +28,8 @@ namespace Wrapper
 
 /** \class OutputFilenameParameter
  *  \brief This class represent a string parameter for the wrapper framework
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT OutputFilenameParameter
   : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
index 33cc62dc9ce581fd4d5622570359be97890c8b12..a8dc212a7c314f05c640be02591a015b4b0eff45 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
@@ -29,6 +29,8 @@ namespace Wrapper
 {
 /** \class OutputImageParameter
  *  \brief This class represents a OutputImage parameter
+ *
+ * \ingroup OTBApplicationEngine
  */
 
 class ITK_ABI_EXPORT OutputImageParameter : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h
index 3d829ed97e512bd0027e5add850500532755382b..671caeef1c7b991f89652507a1d56940da9e05e9 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h
@@ -1,7 +1,7 @@
 #ifndef __otbWrapperOutputProcessXMLParameter_h
 #define __otbWrapperOutputProcessXMLParameter_h
 #include "otbWrapperApplication.h"
-#include "otbTinyXML.h"
+#include "otb_tinyxml.h"
 
 namespace otb
 {
@@ -10,6 +10,8 @@ namespace Wrapper
 
 /** \class OutputProcessXMLParameter
  *  \brief This class represent a xml filename parameter for the wrapper framework to save otb application.
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT OutputProcessXMLParameter
   : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
index afee4912ce9d3fa86c27c63320ec7d8647a67440..c06d25dc47288b6c99e2fe675bb1db708efae1ec 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
@@ -29,6 +29,8 @@ namespace Wrapper
 {
 /** \class OutputVectorDataParameter
  *  \brief This class represents a OutputVectorData parameter
+ *
+ * \ingroup OTBApplicationEngine
  */
 
 class ITK_ABI_EXPORT OutputVectorDataParameter : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
index 9506ecbc0ec1acb36141429089cff075f255b3c2..c9bdcfd0ebf2b4d99bb368d3fbe3e8eb8c225812 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
@@ -53,6 +53,8 @@ enum DefaultValueMode
  *  This class is a high level class representing a parameter for the
  *  wrapper framework. It should be subclassed to represent different
  *  kinds of parameters
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT Parameter
   : public itk::Object
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h
index ecef2a7b6c531773356e991e19a57bdf3554061b..e03311025f6aee9b0be9bf046b7a912d09be7014 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h
@@ -29,6 +29,8 @@ namespace Wrapper
 
 /**
  * \class Group
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT ParameterGroup
   : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h
index a425af8c25734fd4c868a02814af0ebf80b38324..d7f17907dfa49b322a61bb3f30bbc38d189d4e41 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h
@@ -34,6 +34,8 @@ namespace Wrapper
  *
  *  The constructor accepts a string key constructed as follow : parent.me.child.
  *  It implements some key manipulation as described in the code.
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT ParameterKey
 {
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
index 990adda83d69d4b97060fc0bff143a8fb98a9e1d..d4fc76029137fc4501638ff78d2f58d6003d9de5 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
@@ -27,6 +27,8 @@ namespace Wrapper
 
 /** \class RAMParameter
  *  \brief This class represent a RAM parameter for the wrapper framework
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT RAMParameter : public Parameter
 {
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h
index 13fd1fc0baf8da15ebba91b70d0c09941a344ccc..07cd91aeaa8337e5feb4936f0c7ded91dd995643 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h
@@ -27,6 +27,8 @@ namespace Wrapper
 
 /** \class StringParameter
  *  \brief This class represent a radius parameter for the wrapper framework
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT RadiusParameter
   : public IntParameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringListParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringListParameter.h
index 1a17121804ea1f19008ce5eac44f705e73169ca7..f9d07e8c2eb796dbdf7087d6b268a71ba9e153cb 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringListParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringListParameter.h
@@ -28,6 +28,8 @@ namespace Wrapper
 
 /** \class StringListParameter
  *  \brief This class represent a list of string parameter for the wrapper framework
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT StringListParameter
   : public Parameter
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h
index f0f625458ece3c1fd4b418bd264d1cc3c9957f35..101eee7f74e2117328aa197b33f3994c45df93a7 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h
@@ -28,6 +28,8 @@ namespace Wrapper
 
 /** \class StringParameter
  *  \brief This class represent a string parameter for the wrapper framework
+ *
+ * \ingroup OTBApplicationEngine
  */
 class ITK_ABI_EXPORT StringParameter
   : public Parameter
diff --git a/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h
index 6aa793537e68aaf75586ca8bde11422e68eb07ff..5bcf47e04cc18ee678818681c7ac473f9a89cce2 100644
--- a/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h
+++ b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h
@@ -46,6 +46,8 @@ namespace Wrapper
  * After the attribute key, if the user give several values (expression
  * without \"--\" separated by space), it will automatically be
  * interpreted as a list.
+ *
+ * \ingroup OTBCommandLine
  */
 
 class ITK_ABI_EXPORT CommandLineLauncher : public itk::Object
diff --git a/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h
index e5fb027d8fe153b140a0e755ddb9a5230f2f518f..be529fbffb27c65ebccc425e1ea6f4f97bcef91c 100644
--- a/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h
+++ b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h
@@ -32,6 +32,8 @@ namespace Wrapper
  * To be valid, the expression must be as follow:
  * ModuleName (ModulePaths) --attribut1_Key attrubut1_Value --attribut2_Key attrubut2_Value
  * After the attribut key, if the user give several values (expression without \"--\" separated by space), it will automacally be interpreted as a list.
+ *
+ * \ingroup OTBCommandLine
  */
 
 class ITK_ABI_EXPORT CommandLineParser : public itk::Object
diff --git a/Modules/Wrappers/CommandLine/src/otbApplicationLauncherCommandLine.cxx b/Modules/Wrappers/CommandLine/src/otbApplicationLauncherCommandLine.cxx
index 047ffa77447f15accee33e6efd2aff517b0cd8cc..8544c663f69cb22c6312e37efcfcbcdb0747380e 100644
--- a/Modules/Wrappers/CommandLine/src/otbApplicationLauncherCommandLine.cxx
+++ b/Modules/Wrappers/CommandLine/src/otbApplicationLauncherCommandLine.cxx
@@ -17,7 +17,7 @@
  =========================================================================*/
 
 #include "otbWrapperCommandLineLauncher.h"
-#include "otbTinyXML.h"
+#include "otb_tinyxml.h"
 #include <vector>
 
 const std::string GetChildNodeTextOf(TiXmlElement *parentElement, std::string key);
diff --git a/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h b/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h
index 4ac54aa56fe0757f37f5e8db54d0bf82e9117d11..0ea7bca6dd303857a2b1d30c53f8a14d6ef8fe05 100644
--- a/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h
+++ b/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h
@@ -31,6 +31,8 @@ namespace Wrapper
 
 /** \class QtFileSelectionWidget
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtFileSelectionWidget : public QWidget
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h b/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h
index d3ed3e23943447c3c06717fcae810777003a73d8..089644b810e9feaa1e00631678e279de443fce3c 100644
--- a/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h
+++ b/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h
@@ -31,6 +31,8 @@ namespace otb
  *
  *
  * \ingroup OTBQtWidget
+ *
+ * \ingroup OTBQtWidget
  */
 
 class ITK_ABI_EXPORT QtLogOutput : public QObject, public itk::LogOutput
diff --git a/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h b/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h
index c39a069ec1e5316de061bd6f3f30cb28e2141ef4..24a2d2a674a3f568b5202b85c22dea09eae808cd 100644
--- a/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h
+++ b/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtStringSelectionWidget
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtStringSelectionWidget : public QWidget
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h
index d9dacc4f7c398cb422803c7f7962e72575314a69..7b61a075ae0c0697726c0848a03ea271c1e76ede 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h
@@ -29,6 +29,8 @@ namespace Wrapper
 
 /** \class QtWidgetChoiceParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetChoiceParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h
index 16eed555adc34a936f283b27d641b319e1b96ff7..2209410cb76b3d16cb331e2bdb00d3a79bd818f5 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetComplexInputImageParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetComplexInputImageParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h
index 6baca2a5f2ce1f241e95c989618ab360b8140856..7b4f82648ccee1e551378e7f7a952494e91644e5 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetComplexOutputImageParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetComplexOutputImageParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h
index cb9371a5c05d0f7bcae7e78f7e2dcc20c0cdd570..544c0b254ed860c528d8c2bfe036c5f8067fc386 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetDirectoryParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetDirectoryParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h
index 54a8292be778fd1a9f40ac911e2ed71a1c8ebdfb..801704cfe9149def31ca3bf0a06ed6983b6dd5e6 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h
@@ -29,6 +29,8 @@ namespace Wrapper
 
 /** \class QtWidgetEmptyParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetEmptyParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h
index 22088232ac94573abf7747bc6e5270ff4a40cdeb..4fa580365b0b81da3c554640d0eadd37715fdbc2 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h
@@ -29,6 +29,8 @@ namespace Wrapper
 
 /** \class QtWidgetFloatParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetFloatParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h
index 21b9a0b47e6420e75ed34226791b4bdffa0250fd..9ba8cbb34a4ca0494ae08ffc7f76d11f4b432be1 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h
@@ -28,6 +28,8 @@ namespace Wrapper
 
 /** \class QtWidgetInputFilenameListParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetInputFilenameListParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h
index d94465a61b70d6a615a0534b6ecb8e1221176086..5bd8760d85cef2812cf00f915a70290912dc8736 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetInputFilenameParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetInputFilenameParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h
index 962a919478c37b58e69ddfb9345965d01f8637ac..5fd3612e4df23ad8c34297de22ea87cfc6918b48 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h
@@ -28,6 +28,8 @@ namespace Wrapper
 
 /** \class QtWidgetInputImageListParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetInputImageListParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h
index 43239c8811eda90cb4d594f2469c84f67ce0c326..e5319923c9b8ed7909d5a41e04af161ee984e329 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetInputImageParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetInputImageParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h
index a818ddf181d250e1c2a8883047532eb4b7a86c1f..f71d8eb0783bb295a727a86ca2099f2f5d8ad47b 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetInputProcessXMLParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetInputProcessXMLParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h
index 20e5061068704483feec7dd58d92251e15f90337..55bef403bebe57c3220713473b39e3bb01a7a9fe 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h
@@ -29,6 +29,8 @@ namespace Wrapper
 
 /** \class QtWidgetInputVectorDataListParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetInputVectorDataListParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h
index d1f82d627b229afe4d1fef74265617610087f5a7..b7af9098fb3173474ab56e7b63d7fe0c9bcfc96a 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetInputVectorDataParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetInputVectorDataParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h
index 48828064914d11343b7f9b417d4cadda04d2045e..6961220b05531f007bc27db060bb333368873a6f 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetIntParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetIntParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h
index 2db28d0a3c4bd9c06c2b18dd851e26ef2c36dc51..499c0f14204dd55efd05fd3f6fab660c1ca4104a 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h
@@ -29,6 +29,8 @@ namespace Wrapper
 
 /** \class QtWidgetListViewParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetListViewParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h
index 8f6033d79522c6ddfc3e7a5254b47c0099c15e82..c36ab2191c5a86f85c42f84acf229e237cff405e 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h
@@ -75,6 +75,8 @@ private:
 
 /** \class QtWidgetModel
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetModel : public QObject
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h
index 7c2a599220512fb04fd6535489baf0b11143208e..092f34c538176332d29646c35c8704b2f3304cc1 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetOutputFilenameParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetOutputFilenameParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h
index 56f817da97936dcfd9e4a4af6c69789c0f714730..e0216aee1c33e6427a1cb680a68db4c723c55fbd 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetOutputImageParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetOutputImageParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h
index 81fc26a9fdb6546ab83c12efe28fa13f4689fa6f..caebce80a4bbb2fa4464339e6b15959c82f7a88f 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetOutputProcessXMLParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetOutputProcessXMLParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h
index 5835f494573905f88a4e55174e3276283a76d6d3..79a5d7af1663f31d9162c68b0be4ba54b77ab4e9 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetOutputVectorDataParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetOutputVectorDataParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h
index e7021e6a6505a270f3d71d7d15d7babaf7be1133..85d8e9436b37e817d30da29f8119b930415afa1c 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h
@@ -29,6 +29,8 @@ namespace Wrapper
 
 /** \class QtWidgetParameterBase
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetParameterBase : public QWidget
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h
index 070425c1d82333561d76628dd9a6bb42d0962c70..a013918d65dbdee8eba751ca5658fdf21d437422 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h
@@ -35,6 +35,8 @@ class QtWidgetParameterBase;
  * \brief
  *
  * \ingroup OTBQtWidget
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetParameterFactory : public itk::Object
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h
index 085a5c9297815a5582ea420cc7d279b859378fe0..7410d9d06ecb714533643500d2420dfe6ab11597 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h
@@ -33,6 +33,8 @@ namespace Wrapper
 
 /** \class QtWidgetParameterGroup
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetParameterGroup : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h
index 7f0624c76ab782b55aae063b296ba66366ab391d..01c7b82d47c48fd518114a60a380eb952e69ccee 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h
@@ -28,6 +28,8 @@ namespace Wrapper
 
 /** \class QtWidgetParameterLabel
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetParameterLabel : public QWidget
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h
index be870bcd19185af46f21102abe6f14d4731973db..908dfd173ce8395c21afe3877087eba53b2d8a15 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h
@@ -32,6 +32,8 @@ namespace Wrapper
 /** \class QtWidgetProgressReport
  * \brief Create a widget reporting the progress of the application
  *        process.
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetProgressReport : public QWidget
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h
index f4a5bd2459ca9091046bcecfbd6622cb3ed36387..ac1435d5edef928a271a8b8b14326bdf2599b06a 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h
@@ -30,6 +30,8 @@ namespace Wrapper
 
 /** \class QtWidgetRAMParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetRAMParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h
index 0ffa73fd689d3fdc72d2c453dd6638e23e517cbe..d04cbbc4aacb94919ee3c7d547baf8b1a1633f81 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h
@@ -32,6 +32,8 @@ namespace Wrapper
 /** \class QtWidgetSimpleProgressReport
  * \brief Create a widget reporting the progress of the application
  *        process.
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetSimpleProgressReport : public QWidget
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h
index 059d8997df42f6c7b09838c5f142bca60b874d60..3eac3bbc0dbf98290447451af9913cbef0c888d5 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h
@@ -28,6 +28,8 @@ namespace Wrapper
 
 /** \class QtWidgetStringListParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetStringListParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h
index e42d7d64477904a3e00e2f55975f89d4274a82b3..98f65e846dbb0571c06d820fb26172fd99366572 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h
@@ -29,6 +29,8 @@ namespace Wrapper
 
 /** \class QtWidgetStringParameter
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetStringParameter : public QtWidgetParameterBase
 {
diff --git a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h
index c785ba31770813440222b3a805cc0e49df10db7f..067e5e219efa471f4fb78374155812a67e533c13 100644
--- a/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h
+++ b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h
@@ -29,6 +29,8 @@ namespace Wrapper
 
 /** \class QtWidgetView
  * \brief
+ *
+ * \ingroup OTBQtWidget
  */
 class ITK_ABI_EXPORT QtWidgetView : public QWidget
 {
diff --git a/README b/README
index 6b82ee8dc73795aa3149f259f0bd0c5b5dfdd222..ba5a440e79754a2ced27b946c3538dc8a177ecee 100644
--- a/README
+++ b/README
@@ -1,76 +1,9 @@
-README
-======
-
 This is the ORFEO Toolbox README file.
-
 Please see the Copyright directory for legal issues on the use of the software.
-
 Install information is available in the OTB Software Guide which can be downloaded from http://www.orfeo-toolbox.org.
 
+Thank you.
 
-Software Guide
---------------
-
-The main source of information is the OTB Software Guide. This is a comprehensive guide which comprises about 800 pages, detailing the steps to install OTB and use it. Most of the classes available are heavily illustrated with results from real remote sensing processing. 
-
-- http://orfeo-toolbox.org/packages/OTBSoftwareGuide.pdf
-
-CookBook
---------
-A guide for OTB applications and Monteverdi dedicated for non-developers is also available. This guide is composed of a brief tour of of applications and Monteverdi, followed by a set of recipes to perform usual remote sensing tasks with both tools. 
-
-- http://orfeo-toolbox.org/packages/OTBCookBook.pdf
-
-FAQ
----
-
-- http://orfeo-toolbox.org/packages/OTB-FAQ.pdf
-
-Doxygen
--------
-
-The doxygen guide which details the full API of the library is a compulsory guide. Two versions of the doxygen are available:
-
-- http://orfeo-toolbox.org/doxygen/  (Release)
-- http://orfeo-toolbox.org/doxygen-current/ (Weekly build)
-
-
-Mailing lists
--------------
-
-Another good source of information is the OTB mailing list. 
-
-You are always welcomed to ask about OTB on mailing list. 
-Even though one important point to remember is response time and quality is always directly proportional to how better you can explain your problem
-So if you are new to OTB, Before shooting an e-mail you may try our FAQ page and Software Guide. 
-
-- otb-user  http://groups.google.com/group/otb-users
-- otb-developers http://groups.google.com/group/otb-developers
-
-Sample Data
------------
-
-- http://orfeo-toolbox.org/packages/OTB-Data-Examples.zip
-
-Blog
-----
-
-- http://blog.orfeo-toolbox.org/
-
-Courses
--------
-There are tutorials and presentations that help you learn OTB. you can find them in sourceforge page [#]_ or have 
-the latex source via mercurial [#]_ .
-
-.. [1] http://sourceforge.net/projects/orfeo-toolbox/files/OTBCourses-4.2.pdf
-.. [2] http://hg.orfeo-toolbox.org/OTB-Documents/file/tip/Courses
-
-RELEASE NOTES
--------------
-
-- http://hg.orfeo-toolbox.org/OTB/file/tip/RELEASE_NOTES.txt
-
-
-*All urls provided are concerned with latest release of OTB.*
+The OTB Development Team.
 
 
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index f1ee531fdc1addde2ac23ff91d13fa7d4164ba81..6295574caa5f47affad330a197a5921e29ffb2fb 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -1,71 +1,3 @@
-OTB-v.4.4.0 - Changes since version 4.4.0 (2015/02/13)
---------------------------------------------------------
-
-* Library:
-
-  * Core:
-    * Add a BandMathXImageFilter, otbParserX, otbParserXPlugins filters based on MuParserX  
-    * Correct a lot of issues related to Coverity scan 
-    * Giving access to probability estimates mode in libSVMMachineLearningModel and RandomForestsMachineLearningModel
-    * Clean and update the header include into OTB
-    * Enhance p to xs registration formula
-    * Reduce Curl dependencies
-    * Remove 6S dependency for VarSol computation
-    * Clean and udpate the Mapnik adapters code into OTB
-    * Add an option to limit the number of samples by class into otbListSampleGenerator
-    * Fix BCO interpolation about coefficients normalization
-    * Fix missing boost namespace
-    * Fix Production date issue in IkonosImageMetadataInterface 
-    * Mark ancillary methods as deprecated otbWrapperCommandLineLauncher
-    * Add regression mode to Random Forests 
-    * Add absorptances and fcover to SAIL code
-    * Remove MeanShiftKernel file, duplicates of SVMKernel file, and not used anywhere
-    
-  * CMake:
-    * Improve compatibility with cmake 3.0
-     
-  * Testing:
-    * Avoid multiple declaration of same function over different compilation units
-    * Add test to use SVM machine learning class in regression mode
-    * Remove obsolete and not compiled anymore tests
-    * Rewrite add_test declaration to have exe name on the first line. will help modularisation script
-    * Use a single cmake var for referencing large inputs
-    
-  * Documentation:
-    * Enhance Doxygen Documentation
-   
-* Applications:
-  * New:
-    * New BandMathX application with awesome mathematical functions
-    * New applications for learning/classification of geometries in a shapefile: 
-        * ComputeOGRLayersFeaturesStatistics
-        * TrainOGRLayersClassifier
-        * OGRLayerClassifier 
-  * Updated applications:
-    * Smoothing: add conductance parameter for anidifusion which was added recently in ITK filter 
-    * Smoothing: keep the time step independant from the image spacing
-    * HomologousPoint: proper computation of the opposite region
-    * Rasterization: fix computation of output image extent
-    * GridBasedImageResampling: fix the wrong channel number otbGridBasedImageResampling.
-    * ColorMapping: clamp before cast to uchar
-    * OpticalCalibration: the toc computation is no more marked as experimental
-    * OpticalCalibration: add an internal test to check if RSR file is correclty set
-    * BundleToPerfectSensor and SuperImpose: Allowing to force default mode with Pleiades images
-    * SuperImpose: fix a bug in PHR mode detection logic
-    * TrainImagesClassifier: add option to limit the min number of samples to the smallest class
-    * MeanShiftSmoothing: add missing ram parameter
-    * StereoRectificationGridGenerator: add warning message about image sizes when enabling inverse transformation estimations.
-    
-* Bugs fixed:    
-  * OTB-lib:
-    * 0001003: logical bug in IkonosImageMetadataInterface ::GetPhysicalGain(),resolved,fixed,"In IkonosImageMetadataInterface::GetPhysicalGain()
-    * 0001005: build error with otbUtilitiesTests
-    * 0000987: update contents of README
-    * 0000974: Bad processing of OTB Smoothing Anisotropic Filtering
-  * OTB-Applications:
-    * 0000975: OTB Applications which use OpenMP cannot be loaded with gcc version < 4.3.0
-    * 0000976: Strange output for ColorMapping application with LUT computed on support image
-
 OTB-v.4.2.1 - Changes since version 4.2.0 (2014/09/19)
 --------------------------------------------------------
 
@@ -1791,22 +1723,22 @@ OTB-v.2.8.0 - Changes since version 2.6.0 (2009/01/15)
 --------------------------------------------------------
 
 * System
-    - ITK version updated to 3.10.1
-    - liblas library added
-    - ossim gdal plugin added
-    - change in OpenGL access for viewer
-    - Edison code from mean shift
+	- ITK version updated to 3.10.1
+	- liblas library added
+	- ossim gdal plugin added
+	- change in OpenGL access for viewer
+	- Edison code from mean shift
 
 * Library
-    - Support for Lidat data
-    - SIFT and SURF implementation
-    - Mean Shift algorithm
-    - Conversion of vector data projection (kml, shapefiles)
+	- Support for Lidat data
+	- SIFT and SURF implementation
+	- Mean Shift algorithm
+	- Conversion of vector data projection (kml, shapefiles)
 
 * Applications
-    - Object counting
-    - Fine Registration
-    - Road Extraction
+	- Object counting
+	- Fine Registration
+	- Road Extraction
 
 
 
@@ -1814,91 +1746,91 @@ OTB-v.2.6.0 - Changes since version 2.4.0 (2008/10/31)
 --------------------------------------------------------
 
 * System
-    - GCC 4.3 compatibility
-    - ITK version updated to 3.8
-    - FLTK version updated to 1.1.9
-    - OpenThreads library added
-    - Expat library added
+	- GCC 4.3 compatibility
+	- ITK version updated to 3.8
+	- FLTK version updated to 1.1.9
+	- OpenThreads library added
+	- Expat library added
 
 * Library
-    - SAR Polarimetry synthesis classes
-    - Kullback Leibler supervised change detection
-    - KML support
-    - Gabor filters implementation
-    - Optimized convolution using FFT
-    - CNES RAD format support
-    - NCC and MI registration filters for diparity map estimation
-    - Support for MegaWave image format (contributed by Eric Bughin)
+	- SAR Polarimetry synthesis classes
+	- Kullback Leibler supervised change detection
+	- KML support
+	- Gabor filters implementation
+	- Optimized convolution using FFT
+	- CNES RAD format support
+	- NCC and MI registration filters for diparity map estimation
+	- Support for MegaWave image format (contributed by Eric Bughin)
 
 * Applications
-    - Object segmentation application
-    - Feature extraction application
-    - Land Cover Map application
-    - SAR polarimetric synthesis application
-    - 3D & stereo anaglyh viewer application
-    - Command line conversion from/to all image formats supported
-      by OTB
+	- Object segmentation application
+	- Feature extraction application
+	- Land Cover Map application
+	- SAR polarimetric synthesis application
+	- 3D & stereo anaglyh viewer application
+	- Command line conversion from/to all image formats supported
+	  by OTB
 
 
 OTB-v.2.4.0 - Changes since version 2.2.0 (2008/07/24)
 --------------------------------------------------------
 
-    - Added OTB_DISABLE_CXX_EXAMPLES_TESTING : allows to generate or
-      not only examples testing
-    - Added OTB_USE_JPEG2000 : experimental support for jpeg2000
-      files.
+	- Added OTB_DISABLE_CXX_EXAMPLES_TESTING : allows to generate or
+	  not only examples testing
+	- Added OTB_USE_JPEG2000 : experimental support for jpeg2000
+	  files.
 
 *Common:
 
-      Extraction ROI Classes :
-    - Lifting of the otbExtractionBase classe
-    - Correction of the SetExtractionRegion method
+	  Extraction ROI Classes :
+	- Lifting of the otbExtractionBase classe
+	- Correction of the SetExtractionRegion method
 
 *BasicFilters:
 
-    - Added pixel size matching in otbSpectralAngleDistanceImageFilter
-    - Modification of otb::ConvolutionImageFilter class to allow the
-      use of non-normalized convolution filters
+	- Added pixel size matching in otbSpectralAngleDistanceImageFilter
+	- Modification of otb::ConvolutionImageFilter class to allow the
+	  use of non-normalized convolution filters
 
 *Platforms:
 
-    - Fixed compilation problems using external FLTK version < 1.1.9
-      under fedora unix distribution.
-    - Mac OS X 10.5 supported
+	- Fixed compilation problems using external FLTK version < 1.1.9
+	  under fedora unix distribution.
+	- Mac OS X 10.5 supported
 
 *Applications:
 
-    - Added an supervised image classification application
-      (otbSupervisedClassification)
-    - Added an orthorectifcation application (otbOrthoRectifAppli)
-    - Added an orthofusion application (otbOrthoFusionAppli)
+	- Added an supervised image classification application
+	  (otbSupervisedClassification)
+	- Added an orthorectifcation application (otbOrthoRectifAppli)
+	- Added an orthofusion application (otbOrthoFusionAppli)
 
 *Markov:
-      Added full Markov framework for segmentation, restauration
-      and filtering
-      Added related classes:
-    - otb::MarkovRandomFieldFilter
-    - otb::MRFEnergyEdgeFidelity
-    - otb::MRFEnergyGaussianClassification
-    - otb::MRFEnergyGaussian
-    - otb::MRFEnergy
-    - otb::MRFEnergyPotts
-    - otb::MRFOptimizer
-    - otb::MRFOptimizerICM
-    - otb::MRFOptimizerMetropolis
-    - otb::MRFSampler
-    - otb::MRFSamplerMAP
-    - otb::MRFSamplerRandom
-    - otb::MRFSamplerRandomMAP
-      Added related examples:
-    - MarkovClassification1Example
-    - MarkovClassification2Example
-    - MarkovRegularizationExample
-    - MarkovRestaurationExample
+	  Added full Markov framework for segmentation, restauration
+	  and filtering
+	  Added related classes:
+	- otb::MarkovRandomFieldFilter
+	- otb::MRFEnergyEdgeFidelity
+	- otb::MRFEnergyGaussianClassification
+	- otb::MRFEnergyGaussian
+	- otb::MRFEnergy
+	- otb::MRFEnergyPotts
+	- otb::MRFOptimizer
+	- otb::MRFOptimizerICM
+	- otb::MRFOptimizerMetropolis
+	- otb::MRFSampler
+	- otb::MRFSamplerMAP
+	- otb::MRFSamplerRandom
+	- otb::MRFSamplerRandomMAP
+	  Added related examples:
+	- MarkovClassification1Example
+	- MarkovClassification2Example
+	- MarkovRegularizationExample
+	- MarkovRestaurationExample
 
 *Projections
-      Added Lambert 93 cartographic projection with
-      otb::Lambert93Projection class
+	  Added Lambert 93 cartographic projection with
+	  otb::Lambert93Projection class
 
 * Utilities:
 
@@ -1910,133 +1842,133 @@ OTB-v.2.2.0 - Changes since version 2.0.0 (2008/05/29)
 
 *BasicFilters:
 
-      Added classes for data importation:
-    - otb::ImportImageFilter
-    - otb::ImportVectorImageFilter
-      Added classes for image interpolation:
-    - otb::WindowedSincInterpolateImageBlackmanFunction
-    - otb::WindowedSincInterpolateImageCosineFunction
-    - otb::WindowedSincInterpolateImageGaussianFunction
-    - otb::WindowedSincInterpolateImageHammingFunction
-    - otb::WindowedSincInterpolateImageLanczosFunction
-    - otb::WindowedSincInterpolateImageWelchFunction
-    - otb::ProlateInterpolateImageFunction
-      Added class for resampling
-    - otb::RationalQuotientResampleImageFilter
-      Added classes for labelization
-    - otb::LabelizeImageFilterBase
-    - otb::LabelizeConfidenceConnectedImageFilter
-    - otb::LabelizeConnectedThresholdImageFilter
-    - otb::LabelizeNeighborhoodConnectedImageFilter
+	  Added classes for data importation:
+	- otb::ImportImageFilter
+	- otb::ImportVectorImageFilter
+	  Added classes for image interpolation:
+	- otb::WindowedSincInterpolateImageBlackmanFunction
+	- otb::WindowedSincInterpolateImageCosineFunction
+	- otb::WindowedSincInterpolateImageGaussianFunction
+	- otb::WindowedSincInterpolateImageHammingFunction
+	- otb::WindowedSincInterpolateImageLanczosFunction
+	- otb::WindowedSincInterpolateImageWelchFunction
+	- otb::ProlateInterpolateImageFunction
+	  Added class for resampling
+	- otb::RationalQuotientResampleImageFilter
+	  Added classes for labelization
+	- otb::LabelizeImageFilterBase
+	- otb::LabelizeConfidenceConnectedImageFilter
+	- otb::LabelizeConnectedThresholdImageFilter
+	- otb::LabelizeNeighborhoodConnectedImageFilter
 
 *Radiometry:
 
-    - Bug fixed on otb::DEMCaracteristicExtractor
+	- Bug fixed on otb::DEMCaracteristicExtractor
 
 *Visu
 
-    - Added histogram windows in otb::ImageViewer main class.
-    - Added polygon drawing support in otb::ImageViewer main class
+	- Added histogram windows in otb::ImageViewer main class.
+	- Added polygon drawing support in otb::ImageViewer main class
 
 *IO:
 
-    - Fixed bug in GDALImageIO to handle complex images
-      Added classes for vector data use:
-    - otb::VectorDataFileReader
-    - otb::VectorDataFileWriter
-    - otb::VectorDataIOFactory
-    - otb::VectorDataSource
+	- Fixed bug in GDALImageIO to handle complex images
+	  Added classes for vector data use:
+	- otb::VectorDataFileReader
+	- otb::VectorDataFileWriter
+	- otb::VectorDataIOFactory
+	- otb::VectorDataSource
 
 *Common:
 
-      Added classes to handle vector data:
-    - otb::Polygon
-    - otb::VectorData
-    - otb::DataNode
+	  Added classes to handle vector data:
+	- otb::Polygon
+	- otb::VectorData
+	- otb::DataNode
 
-      Added classes to watch filter progression (ASCII mode):
-    - otb::StandardFilterWatcher
-    - otb::FilterWatcherBase
+	  Added classes to watch filter progression (ASCII mode):
+	- otb::StandardFilterWatcher
+	- otb::FilterWatcherBase
 
 *Learning:
 
-    - Creation otb::SVMKernels containing a list a useful kernel
-      for SVM
-    - Correction in Kohonen map classes
-    - Added convenience methods in SVMModel class
+	- Creation otb::SVMKernels containing a list a useful kernel
+	  for SVM
+	- Correction in Kohonen map classes
+	- Added convenience methods in SVMModel class
 
-      Added classification filters (streamed and threaded):
-    - otb::SVMImageClassificationFilter
-    - otb::SOMImageClassificationFilter
-    - otb::KMeansImageClassificationFilter
+	  Added classification filters (streamed and threaded):
+	- otb::SVMImageClassificationFilter
+	- otb::SOMImageClassificationFilter
+	- otb::KMeansImageClassificationFilter
 
 *FeatureExtraction:
 
-      Added implementation of Scalar Invariant Feature Transform
-    - otb::ImageToSIFTKeyPointSetFilter
+	  Added implementation of Scalar Invariant Feature Transform
+	- otb::ImageToSIFTKeyPointSetFilter
 
 *MultiScale:
 
-      Added mono and multi-scale convex/concave image classification
+	  Added mono and multi-scale convex/concave image classification
          based on geodesic morphology characteristics.
-    - otb::ConvexOrConcaveClassificationFilter
-    - otb::GeodesicMorphologyDecompositionImageFilter
-    - otb::GeodesicMorphologyIterativeDecompositionImageFilter
-    - otb::GeodesicMorphologyLevelingFilter
-    - otb::ImageToProfileFilter
-    - otb::MorphologicalClosingProfileFilter
-    - otb::MorphologicalOpeningProfileFilter
-    - otb::MultiScaleConvexOrConcaveClassificationFilter
-    - otb::ProfileDerivativeToMultiScaleCharacteristicsFilter
-    - otb::ProfileToProfileDerivativeFilter
+	- otb::ConvexOrConcaveClassificationFilter
+	- otb::GeodesicMorphologyDecompositionImageFilter
+	- otb::GeodesicMorphologyIterativeDecompositionImageFilter
+	- otb::GeodesicMorphologyLevelingFilter
+	- otb::ImageToProfileFilter
+	- otb::MorphologicalClosingProfileFilter
+	- otb::MorphologicalOpeningProfileFilter
+	- otb::MultiScaleConvexOrConcaveClassificationFilter
+	- otb::ProfileDerivativeToMultiScaleCharacteristicsFilter
+	- otb::ProfileToProfileDerivativeFilter
 
 *Utilities:
 
-    - Updated the internal version of ITK to 3.6.0
-    - Corrections on OSSIM integration
-    - SVM library: creation of otb::ComposedKernelFunctor
-      allowing composed kernels
-    - Added SAR models in OSSIM library:
-          . Radarsat 1 (SGX and SGF)
-          . Envisat ASAR - SLC (IMS, APS) and PRI (IMP, APP)
-          . ERS - SLC and PRI
-          . Terrasar X - SLC and PRI
-          . Cosmo-Skymed - SLC and PRI
-          . Radarsat 2 - SLC and PRI
-    - Bug fixed in CMake configuration
-    - Added SIFT implementation in InsigthJournal
+	- Updated the internal version of ITK to 3.6.0
+	- Corrections on OSSIM integration
+	- SVM library: creation of otb::ComposedKernelFunctor
+	  allowing composed kernels
+	- Added SAR models in OSSIM library:
+		  . Radarsat 1 (SGX and SGF)
+		  . Envisat ASAR - SLC (IMS, APS) and PRI (IMP, APP)
+		  . ERS - SLC and PRI
+		  . Terrasar X - SLC and PRI
+		  . Cosmo-Skymed - SLC and PRI
+		  . Radarsat 2 - SLC and PRI
+	- Bug fixed in CMake configuration
+	- Added SIFT implementation in InsigthJournal
 
 *Applications:
-    - Various Bug fix
-    - otbConvertGeoToCartoPoint and otbConvertCartoToGeoPoint map
-      precision enhancement
-    - Added of histogram manipulation functionalities in
-      otbImageViewer
-    - Added of shape file functionalities and large image support in
-      ICD application
-    - Added otbConcatenateImages application to concatenate multiple
-      image in the spectral domain
-    - Added an unsupervised image classification application based
-      on the KMeans algorithm (otbKMeansClassification)
-    - Added an unsupervised image classification application based
-      on the SOM algorithm (otbSOMClassification)
-    - Added an unsupervised image classification application based
-      on the SVM algorithm (otbSVMClassification)
-    - Added an application to create a contiguous unsigned short
-      labeled image from a colored labeled image
-      (otbUnsignedShortRelabeling)
-    - Added an application to create a colored labeled image from an
-      unsigned short labeled image (otbRgbRelabeling)
+	- Various Bug fix
+	- otbConvertGeoToCartoPoint and otbConvertCartoToGeoPoint map
+	  precision enhancement
+	- Added of histogram manipulation functionalities in
+	  otbImageViewer
+	- Added of shape file functionalities and large image support in
+	  ICD application
+	- Added otbConcatenateImages application to concatenate multiple
+	  image in the spectral domain
+	- Added an unsupervised image classification application based
+	  on the KMeans algorithm (otbKMeansClassification)
+	- Added an unsupervised image classification application based
+	  on the SOM algorithm (otbSOMClassification)
+	- Added an unsupervised image classification application based
+	  on the SVM algorithm (otbSVMClassification)
+	- Added an application to create a contiguous unsigned short
+	  labeled image from a colored labeled image
+	  (otbUnsignedShortRelabeling)
+	- Added an application to create a colored labeled image from an
+	  unsigned short labeled image (otbRgbRelabeling)
 
 *Examples:
-    - Added SIFT example (otb)
-    - Added SIFT example (ij)
-    - Added LabelizeNeighborhoodConnected example
-    - Added RationQuotientResample example
+	- Added SIFT example (otb)
+	- Added SIFT example (ij)
+	- Added LabelizeNeighborhoodConnected example
+	- Added RationQuotientResample example
 
 *Platforms:
 
-    - Fixed some problems under Visual, Cygwin and MinGW platforms.
+	- Fixed some problems under Visual, Cygwin and MinGW platforms.
 
 
 OTB-v.2.0.0 - Changes since version 1.6.0 (2007/12/14)
@@ -2045,77 +1977,77 @@ OTB-v.2.0.0 - Changes since version 1.6.0 (2007/12/14)
 
 *Projections
 
-    - Bug correction in otb::OrthoRectificationFilter
+	- Bug correction in otb::OrthoRectificationFilter
 
 *Fusion
 
-    - Added simple Pansharpening algorithm
-    - Fixed streaming bug on BayesianFusion filter
+	- Added simple Pansharpening algorithm
+	- Fixed streaming bug on BayesianFusion filter
 
 *Radiometry:
 
-      Added classes for atmospheric correction using the 6S Radiative
-      Transfer Code:
-    - Luminance estimation otb::ImageToLuminanceImageFilter
-    - Reflectance estimation TOA:
-      otb::LuminanceToReflectanceImageFilter
-    - Added Composite transform filter:
-      otb::ImageToReflectanceImageFilter,
-        equivalent to the pipeline process ImageToLuminanceImageFilter
-        and LuminanceToReflectanceImageFilter filters
-    - Reflectance estimation TOC:
-      otb::ReflectanceToSurfaceReflectanceImageFilter
-    - 6S effect correction:
-      otb::SurfaceAdjacencyEffect6SCorrectionSchemeFilter
-    - DEM slope and shading estimations:
-      otb::DEMCaracteriticsExtractor
+	  Added classes for atmospheric correction using the 6S Radiative
+	  Transfer Code:
+	- Luminance estimation otb::ImageToLuminanceImageFilter
+	- Reflectance estimation TOA:
+	  otb::LuminanceToReflectanceImageFilter
+	- Added Composite transform filter:
+	  otb::ImageToReflectanceImageFilter,
+	    equivalent to the pipeline process ImageToLuminanceImageFilter
+	    and LuminanceToReflectanceImageFilter filters
+	- Reflectance estimation TOC:
+	  otb::ReflectanceToSurfaceReflectanceImageFilter
+	- 6S effect correction:
+	  otb::SurfaceAdjacencyEffect6SCorrectionSchemeFilter
+	- DEM slope and shading estimations:
+	  otb::DEMCaracteriticsExtractor
 
 *Common:
 
-    - Added otb::UnaryFunctorNeighborhoodVectorImageFilter
-    - Fixed bug on otb::ExtractROIBase class
+	- Added otb::UnaryFunctorNeighborhoodVectorImageFilter
+	- Fixed bug on otb::ExtractROIBase class
 
 *IO:
 
-    - Bug fixed on otb::VectorImage class
+	- Bug fixed on otb::VectorImage class
 
 *BasicFilters:
 
-    - Bug correction in otb::StreamingStatisticsVectorImageFilter,
-      otb::StreamingStatisticsImageFilter,StreamingMatrixTransposeMatrixImageFilter
-    - Added PrintableImageFilter
-    - Fixed bugs on otb::FrostImageFilter and otb::LeeImageFilter
+	- Bug correction in otb::StreamingStatisticsVectorImageFilter,
+	  otb::StreamingStatisticsImageFilter,StreamingMatrixTransposeMatrixImageFilter
+	- Added PrintableImageFilter
+	- Fixed bugs on otb::FrostImageFilter and otb::LeeImageFilter
 
 *Utilities:
 
-    - Fixed memory allocation bug on svm.cxx file
-    - 4 files from ITK 3.4.0 have been replaced by the cvs version
-      to allow
-      correct use of the itkDivideImageFilter.h with VectorImage. These
-      files
-      are:
-          Common/itkNumericTraitsVariableLengthVectorPixel.h
-          Common/itkNumericTraitsVariableLengthVectorPixel.cxx
-          Common/itkConceptChecking.h
-          BasicFilters/itkDivideImageFilter.h
+	- Fixed memory allocation bug on svm.cxx file
+	- 4 files from ITK 3.4.0 have been replaced by the cvs version
+	  to allow
+	  correct use of the itkDivideImageFilter.h with VectorImage. These
+	  files
+	  are:
+	      Common/itkNumericTraitsVariableLengthVectorPixel.h
+	      Common/itkNumericTraitsVariableLengthVectorPixel.cxx
+	      Common/itkConceptChecking.h
+	      BasicFilters/itkDivideImageFilter.h
 
 *Examples
 
-    - Tutorials: Added OrthoFusion example
-    - Radiometry: Added AtmosphericCorrectionSequencement example
+	- Tutorials: Added OrthoFusion example
+	- Radiometry: Added AtmosphericCorrectionSequencement example
 
 *Applications:
 
-    - Rename Pireo application to otbPireo
-    - Added transform coordinate point applications:
-      otbConvertCartoToGeo
-      otbConvertGeoToCarto
-    - Pireo corrections in CMakeLists.txt (GUI dir source code) and
-      source code (suppress of call VnlModifiedOptimizer class)
+	- Rename Pireo application to otbPireo
+	- Added transform coordinate point applications:
+	  otbConvertCartoToGeo
+	  otbConvertGeoToCarto
+	- Pireo corrections in CMakeLists.txt (GUI dir source code) and
+	  source code (suppress of call VnlModifiedOptimizer class)
 
 *Platforms:
 
-    - Fixed some problems under Visual and MinGW platforms.
+	- Fixed some problems under Visual and MinGW platforms.
 
 
 
@@ -2124,13 +2056,13 @@ OTB-v.1.6.0 - Changes since version 1.4.0 (2007/10/25)
 
 *BasicFilters:
 
-    - Added StreamingVectorStatisticsImageFilter to compute
-      the second order stastics on a large vector image.
+	- Added StreamingVectorStatisticsImageFilter to compute
+	  the second order stastics on a large vector image.
 
-    - Added the MatrixTransposeMatrixImageFilter to compute
-      the product of the matrix of vector pixels from image 1
-      in rowwith the the matrix of vector pixels from image 2
-      columns for large vector image.
+	- Added the MatrixTransposeMatrixImageFilter to compute
+	  the product of the matrix of vector pixels from image 1
+	  in rowwith the the matrix of vector pixels from image 2
+	  columns for large vector image.
 
        - Added the otb::VectorImageTo3DScalarImageFilter which transforms
          a vector image into a 3D scalar image where each band is
@@ -2157,342 +2089,342 @@ OTB-v.1.6.0 - Changes since version 1.4.0 (2007/10/25)
 
 *ChangeDetection:
 
-    - Added the otb::KullbackLeiblerDistanceImageFilter to compute the
-      Kullback-Leibler distance between two images.
+	- Added the otb::KullbackLeiblerDistanceImageFilter to compute the
+	  Kullback-Leibler distance between two images.
 
-    - Added the otb::KullbackLeiblerProfileImageFilter to perform a
-      multi-scale change detection using the Kullback-Leibler distance.
+	- Added the otb::KullbackLeiblerProfileImageFilter to perform a
+	  multi-scale change detection using the Kullback-Leibler distance.
 
 
 *Common:
 
-    - Added an otb::Polygon, which represents a closed polyline
-      on which
-      intersection or point interiority can be tested.
+	- Added an otb::Polygon, which represents a closed polyline
+	  on which
+	  intersection or point interiority can be tested.
 
 *IO:
 
-    - Added an otb::DEMHandler to fetch the elevation value in
-      SRTMor DTED
-        directories.
+	- Added an otb::DEMHandler to fetch the elevation value in
+	  SRTMor DTED
+	    directories.
 
-    - Added an otb::DEMToImageGenerator to generate an elevation map.
+	- Added an otb::DEMToImageGenerator to generate an elevation map.
 
-    - Added a new tiling streaming mode.
+	- Added a new tiling streaming mode.
 
-    - Added the otb::ImageGeometryHandler, which allows to handle
-      seamlessly
-      the image geometry information.
+	- Added the otb::ImageGeometryHandler, which allows to handle
+	  seamlessly
+	  the image geometry information.
 
-    - Fixed a bug in the otb::MSTARImageIO.
+	- Fixed a bug in the otb::MSTARImageIO.
 
 *Learning:
 
-    - Added methods to access the alpha values, the number of
-      support vectors,
-      the support vectors themselves, the distance to the hyperplanes.
+	- Added methods to access the alpha values, the number of
+	  support vectors,
+	  the support vectors themselves, the distance to the hyperplanes.
 
-    - Added the otb::SEMClassifier, implementing the Stochastic
-      Expectation
-      Maximization algorithm to perform an estimation of a mixture
-      model.
+	- Added the otb::SEMClassifier, implementing the Stochastic
+	  Expectation
+	  Maximization algorithm to perform an estimation of a mixture
+	  model.
 
 *MultiScale:
 
-    - Various name changes and bugfixes in the morphological pyramid
-      segmentation classes.
+	- Various name changes and bugfixes in the morphological pyramid
+	  segmentation classes.
 
 *Radiometry:
 
-    - The 6S Transfer Radiative Code compiles within OTB.
-    - Added the Radiometry directory, containing everything that
-      has to do
-      with image radiometry.
-    - Added the NDVI and ARVI (3 input bands) vegetation index
-      filters.
+	- The 6S Transfer Radiative Code compiles within OTB.
+	- Added the Radiometry directory, containing everything that
+	  has to do
+	  with image radiometry.
+	- Added the NDVI and ARVI (3 input bands) vegetation index
+	  filters.
 
 *Projections:
 
-    - Added the Projections directory, containing everything that
-      has to do
-      with image projections.
+	- Added the Projections directory, containing everything that
+	  has to do
+	  with image projections.
 
-    - Added an otb::DEMHandler to fetch the elevation value in
-      SRTM/DTED
-        directories.
+	- Added an otb::DEMHandler to fetch the elevation value in
+	  SRTM/DTED
+	    directories.
 
-    - Added an otb::DEMToImageGenerator to generate an elevation map.
+	- Added an otb::DEMToImageGenerator to generate an elevation map.
 
-    - Added an otb::OrthoRectificationFilter to perform
-      orthorectification of
-      geo-referenced images.
+	- Added an otb::OrthoRectificationFilter to perform
+	  orthorectification of
+	  geo-referenced images.
 
-    - Added the forward and inverse sensor model projection.
+	- Added the forward and inverse sensor model projection.
 
-    - Added several map projection transforms (Eckert4,
-      LambertConformalConic,
-      TransMercator, Mollweid, Sinusoidal, UTM)
+	- Added several map projection transforms (Eckert4,
+	  LambertConformalConic,
+	  TransMercator, Mollweid, Sinusoidal, UTM)
 
 *Fusion:
 
-    - Added the Fusion directory, containing everything that has to do
-      with image fusion.
+	- Added the Fusion directory, containing everything that has to do
+	  with image fusion.
 
-    - Added the otb::BayesianFusionImageFilter, a pan-sharpening
-      filter which
-      algoritm has been kindly contributed by Julien Radoux.
+	- Added the otb::BayesianFusionImageFilter, a pan-sharpening
+	  filter which
+	  algoritm has been kindly contributed by Julien Radoux.
 
 
 *Documentation:
 
-    - Added various documented examples in the SoftwareGuide for
-      the new classes.
+	- Added various documented examples in the SoftwareGuide for
+	  the new classes.
 
-    - Added a Tutorial section in the SoftwareGuide.
+	- Added a Tutorial section in the SoftwareGuide.
 
 *Utilities:
 
-    - Added the 6S library which will soon play a role in the
-      radiometry module.
+	- Added the 6S library which will soon play a role in the
+	  radiometry module.
 
-    - Updated the internal version of ITK to 3.4.0.
+	- Updated the internal version of ITK to 3.4.0.
 
 *Platforms:
 
-    - Fixed the random segfault of otbInteractiveChangeDetectionAppli
-      under Visual 8.0.
+	- Fixed the random segfault of otbInteractiveChangeDetectionAppli
+	  under Visual 8.0.
 
 *Applications:
 
-    - Added the otbImageViewerManager application which allows to
-      open multiple images,
-      configure viewers and link displays.
+	- Added the otbImageViewerManager application which allows to
+	  open multiple images,
+	  configure viewers and link displays.
 
-    - Added the otbRoadExtraction which demonstrates the road
-      extraction algorithm
-      implemented in the FeatureExtraction module.
+	- Added the otbRoadExtraction which demonstrates the road
+	  extraction algorithm
+	  implemented in the FeatureExtraction module.
 
-    - Added the otbOrthoRectifAppli application which allows to
-      ortho rectify images in
-      command line using the brand new Projections module of the Orfeo
-      ToolBox. Old rigid
-      orthoo rectification application has been moved to
-      otbPseudoOrthoRectif.
+	- Added the otbOrthoRectifAppli application which allows to
+	  ortho rectify images in
+	  command line using the brand new Projections module of the Orfeo
+	  ToolBox. Old rigid
+	  orthoo rectification application has been moved to
+	  otbPseudoOrthoRectif.
 
-    - Added an option in CMakeLists.txt to use VTK or not (enable
-      or disable the
-      following application).
+	- Added an option in CMakeLists.txt to use VTK or not (enable
+	  or disable the
+	  following application).
 
-    - Added the Pireo registration application (VTK needed).
+	- Added the Pireo registration application (VTK needed).
 
 
 OTB-v.1.4.1 - Changes since version 1.4.0
 --------------------------------------------------------
 
 *Platforms:
-    - Minor corrections of main ./CMakeLists.txt to support users
-      applications using OTB
-        install directory when using internal ITK.
+	- Minor corrections of main ./CMakeLists.txt to support users
+	  applications using OTB
+	    install directory when using internal ITK.
 
 OTB-v.1.4.0 - Changes since version 1.2.1
 --------------------------------------------------------
 
 *IO:
 
-    - Added the LineSpatialObject class.
+	- Added the LineSpatialObject class.
 
-    - Added the ArcSpatialObject class.
+	- Added the ArcSpatialObject class.
 
-    - Added a DXF file reader to read spatial objects from DXF files.
+	- Added a DXF file reader to read spatial objects from DXF files.
 
 *Common:
 
-    - Added a PolylineParametricPathWithValue class, to store a
-      scalar value along with
-        a polyline.
+	- Added a PolylineParametricPathWithValue class, to store a
+	  scalar value along with
+	    a polyline.
 
-    - DrawPathFilter and DrawPathListFilter can now use the internal
-      scalar values of the path(if present) as a value to draw the path.
+	- DrawPathFilter and DrawPathListFilter can now use the internal
+	  scalar values of the path(if present) as a value to draw the path.
 
-    - Improved performances of the DrawPathFilter and
-      DrawPathListFilter.
+	- Improved performances of the DrawPathFilter and
+	  DrawPathListFilter.
 
-    - Added the base class
-      otbBinaryFunctorNeighborhoodVectorImageFilter (see
-      ChangeDetection)
+	- Added the base class
+	  otbBinaryFunctorNeighborhoodVectorImageFilter (see
+	  ChangeDetection)
 
 *BasicFilters:
 
-    - Added the ImportGeoInformationImageFilter providing a workaround
-      for metadata handling in pipeline execution.
+	- Added the ImportGeoInformationImageFilter providing a workaround
+	  for metadata handling in pipeline execution.
 
-    - Added a VectorRescaleIntensityImageFilter, which rescales
-      a vector
-      image on a per-band basis, clamping a user-defined percent of the
-      pixels lowest and highest values.
+	- Added a VectorRescaleIntensityImageFilter, which rescales
+	  a vector
+	  image on a per-band basis, clamping a user-defined percent of the
+	  pixels lowest and highest values.
 
-    - Added a filter to compute spectral angle distance image with
-      respect to a reference pixel.
+	- Added a filter to compute spectral angle distance image with
+	  respect to a reference pixel.
 
 *FeatureExtraction:
 
-    - Added a set of image and path filters to perform road
-      extraction.
+	- Added a set of image and path filters to perform road
+	  extraction.
 
-    - Added a composite filter to perform road extraction.
+	- Added a composite filter to perform road extraction.
 
 *ChangeDetection:
 
     - Added the Kullback-Leibler distance change detector with optimized
       algorithm.
 
-    - Added a Kullback-Leibler multi-scale change profile image filter
-      with optimized algorithm.
+	- Added a Kullback-Leibler multi-scale change profile image filter
+	  with optimized algorithm.
 
 *DisparityMap:
 
-    - Added the DisparityMapEstimationMethod, performing local
-      disparity
-      estimation with respect to a given transform using the ITK
-      registration framework.
+	- Added the DisparityMapEstimationMethod, performing local
+	  disparity
+	  estimation with respect to a given transform using the ITK
+	  registration framework.
 
-    - Added several methods for deformation field estimation from
-      the estimated disparity map (represented as a pointset with
-      associated point data).
+	- Added several methods for deformation field estimation from
+	  the estimated disparity map (represented as a pointset with
+	  associated point data).
 
 *Documentation:
 
-    - Corrected several warning and French comments in doxygen.
+	- Corrected several warning and French comments in doxygen.
 
 *Utilities:
 
-    - Split of the OSSIM lib to support compilation on the mingw
-      platform.
+	- Split of the OSSIM lib to support compilation on the mingw
+	  platform.
 
-    - DXFlib integration.
+	- DXFlib integration.
 
-    - InsightJournal code integration :
-      ScatteredDataPointSetImageFilter.
+	- InsightJournal code integration :
+	  ScatteredDataPointSetImageFilter.
 
 *Platforms:
 
-    - Corrected runtime errors of the interactive change detection
-      application under cygwin.
+	- Corrected runtime errors of the interactive change detection
+	  application under cygwin.
 
-    - Workaround for ImageViewer on very specific mandrake version.
+	- Workaround for ImageViewer on very specific mandrake version.
 
 
 OTB-v.1.2.1 - Changes since version 1.2.0
 --------------------------------------------------------
 
 *IO:
-    - Improved support of geographic meta data handling in pipeline
-      execution.
+	- Improved support of geographic meta data handling in pipeline
+	  execution.
 
 *BasicFilters:
-    - Added a cast filter otb::ImageToVectorImageCastFilter to convert
-        otb::Image (templated with scalar pixel types) to
-        mono-channel otb::VectorImage.
+	- Added a cast filter otb::ImageToVectorImageCastFilter to convert
+	    otb::Image (templated with scalar pixel types) to
+	    mono-channel otb::VectorImage.
 
 *FeatureExtraction:
     - Added a contour extraction filter otb::ImageToEdgePathFilter.
 
 *Visualization:
     - Viewer accepts now otb::Image (templated with scalar pixel types)
-        as well as otb::VectorImage.
+	    as well as otb::VectorImage.
     - Added FlRun() method to the Viewer, which execute Show() method from
-        the Viewer followed by the Fl::run() method from FLTK.
+	    the Viewer followed by the Fl::run() method from FLTK.
 
 *Platforms:
-    - Minor correction of otb::ObjectList and otb::List in order
-      to support
-            visual 7.0 compiler.
+	- Minor correction of otb::ObjectList and otb::List in order
+	  to support
+	        visual 7.0 compiler.
 
 *Experimental:
     - Support for python binding compilation including itk binding
-        templated with OTB images, OTB IO and OTB Image viewer.
+	    templated with OTB images, OTB IO and OTB Image viewer.
     - OSSIM has been integrated in the OTB Utilities directory to
-        prepare its future use in new geometric features.
+	    prepare its future use in new geometric features.
 
 
 OTB-v.1.2.0 - Changes since version 1.0.2
 --------------------------------------------------------
 
 *Platforms:
-    - OTB can now been compiled on several new platforms :
-      - SunOS 5.8 (32bits and 64bits).
+	- OTB can now been compiled on several new platforms :
+	  - SunOS 5.8 (32bits and 64bits).
 
-    - Improved robustness of
-      - the Microsoft Visual Studio .NET 2003 (7.1), .NET 2005 (8.0)
-      - the Cygwin and MinGW installation.
+	- Improved robustness of
+	  - the Microsoft Visual Studio .NET 2003 (7.1), .NET 2005 (8.0)
+	  - the Cygwin and MinGW installation.
 
 *Common:
 
-    - Various bug fixes and warning corrections.
+	- Various bug fixes and warning corrections.
 
-    - Added support for ObjectList (ie SmartPointers) and thus
-        support for ImageList.
+	- Added support for ObjectList (ie SmartPointers) and thus
+	    support for ImageList.
 
-    - Added base classes for image to image list filters, image
-        list to image filters, image list to image list filters.
+	- Added base classes for image to image list filters, image
+	    list to image filters, image list to image list filters.
 
-    - Precision for internal calculus has been tuned to double in
-        every filter.
+	- Precision for internal calculus has been tuned to double in
+	    every filter.
 
 *Multiscale:
 
-    - Added filters for multiscale analysis and synthesis based on
-        the morphological pyramid algorithm.
+	- Added filters for multiscale analysis and synthesis based on
+	    the morphological pyramid algorithm.
 
-    - Added automated region-growing multiscale segmentation
-        algorithm based on the morphological pyramid analysis.
+	- Added automated region-growing multiscale segmentation
+	    algorithm based on the morphological pyramid analysis.
 
 *Spatial Reasoning:
 
-    - Added support for graph representation of RCC8 spatial
-         reasoning relationships.
+	- Added support for graph representation of RCC8 spatial
+	     reasoning relationships.
 
-    - Added filters for atomic RCC8 computation based on two
-        segmented regions.
+	- Added filters for atomic RCC8 computation based on two
+	    segmented regions.
 
-    - Added filter for multiscale segmentation to RCC8 graph
-        calculation with optimisations.
+	- Added filter for multiscale segmentation to RCC8 graph
+	    calculation with optimisations.
 
 *IO:
 
-    - Added full support (reading and writing) of the HFA image
-        format (ERDAS img files).
+	- Added full support (reading and writing) of the HFA image
+	    format (ERDAS img files).
 
-     - Bug fixes on metada writing (now works for tif and HFA
-         formats, limited support envi header file formats due to
-         Gdal limitations).
+	 - Bug fixes on metada writing (now works for tif and HFA
+	     formats, limited support envi header file formats due to
+	     Gdal limitations).
 
-    - Bug fixes on memory management in the Reader.
+	- Bug fixes on memory management in the Reader.
 
-    - Bug fixes related to the IO framework on MS Windows platforms.
+	- Bug fixes related to the IO framework on MS Windows platforms.
 
 *Learning:
 
-    - Added filters for learning, classification and activation
-        map of data sets using Kohonen's self organizing maps.
+	- Added filters for learning, classification and activation
+	    map of data sets using Kohonen's self organizing maps.
 
 *Visualization:
 
-    - Re-factoring of the base classes for visualization.
+	- Re-factoring of the base classes for visualization.
 
-    - Re-factoring of the viewer object (and viewer apps). The
-        viewer can now be used to visualised large remote-sensing
-        images (Quickbird, Spot5) with limited memory footprint.
+	- Re-factoring of the viewer object (and viewer apps). The
+	    viewer can now be used to visualised large remote-sensing
+	    images (Quickbird, Spot5) with limited memory footprint.
 
 
 *Applications:
 
-    - Minor changes needed for the portability of OTB-Applications.
+	- Minor changes needed for the portability of OTB-Applications.
 
-    - Added a viewer application in OTB-Applications.
+	- Added a viewer application in OTB-Applications.
 
-    - Added a interactive change detection application in
-      OTB-Applications.
+	- Added a interactive change detection application in
+	  OTB-Applications.
 
 
 OTB-v.1.0.2 - Changes since version 1.0.1