From 23f6dfccdeebcf18a5d11b88cce933617d200ef3 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Wed, 18 Feb 2015 10:38:22 +0100
Subject: [PATCH] ENH: Apply patches necessary after modularization

---
 .../CurlAdapters/include/otbCurlHelper.h      |   2 +
 .../include/otbCurlHelperInterface.h          |   2 +
 .../CurlAdapters/include/otbCurlHelperStub.h  |   2 +
 .../GdalAdapters/include/otbGeometriesSet.h   |   2 +
 .../include/otbGeometriesSource.h             |   2 +
 .../include/otbGeometriesToGeometriesFilter.h |   6 +
 .../GdalAdapters/include/otbImageReference.h  |   2 +
 .../include/otbOGRDataSourceWrapper.h         |   4 +
 .../include/otbOGRFeatureWrapper.h            |   2 +
 .../GdalAdapters/include/otbOGRFieldWrapper.h |   4 +
 .../GdalAdapters/include/otbOGRHelpers.h      |   2 +
 .../GdalAdapters/include/otbOGRLayerWrapper.h |   4 +
 .../itkFFTComplexToComplexImageFilter.h       |   2 +
 .../itkFFTWComplexToComplexImageFilter.h      |   2 +
 .../itkImageRegionMultidimensionalSplitter.h  |   2 +
 .../include/itkImageRegionSplitter.h          |   2 +
 .../itkTransformToDisplacementFieldSource.h   |   2 +
 .../include/itkUnaryFunctorImageFilter.h      |   2 +
 .../include/otbWarpImageFilter.h              |   2 +
 .../OSSIMAdapters/include/otbDEMHandler.h     |   2 +
 .../include/otbDateTimeAdapter.h              |   2 +
 .../include/otbEllipsoidAdapter.h             |   2 +
 .../include/otbFilterFunctionValues.h         |   2 +
 .../otbGeometricSarSensorModelAdapter.h       |   2 +
 .../include/otbImageKeywordlist.h             |   2 +
 .../include/otbMapProjectionAdapter.h         |   2 +
 .../OSSIMAdapters/include/otbMetaDataKey.h    |   2 +
 .../include/otbPlatformPositionAdapter.h      |   2 +
 .../include/otbRPCProjectionAdapter.h         |   2 +
 .../include/otbRPCSolverAdapter.h             |   2 +
 .../include/otbSensorModelAdapter.h           |   2 +
 .../otbBoostMachineLearningModelFactory.h     |   2 +
 ...bDecisionTreeMachineLearningModelFactory.h |   2 +
 ...ntBoostedTreeMachineLearningModelFactory.h |   2 +
 ...restNeighborsMachineLearningModelFactory.h |   2 +
 ...NeuralNetworkMachineLearningModelFactory.h |   2 +
 ...tbNormalBayesMachineLearningModelFactory.h |   2 +
 ...RandomForestsMachineLearningModelFactory.h |   2 +
 .../otbSVMMachineLearningModelFactory.h       |   2 +
 .../OpenThreadsAdapters/include/otbThreads.h  |   2 +
 .../app/otbTrainImagesClassifier.h            |   1 +
 .../include/otbChannelSelectorFunctor.h       |   2 +
 .../include/otbCommandLineArgumentParser.h    |  10 +
 .../Common/include/otbCommandProgressUpdate.h |   2 +
 .../otbComplexToIntensityImageFilter.h        |   2 +
 .../otbComplexToVectorImageCastFilter.h       |   2 +
 .../Common/include/otbConfigurationFile.h     |   4 +-
 .../Common/include/otbDecimateImageFilter.h   |   2 +
 .../Common/include/otbDotProductImageFilter.h |   4 +
 .../Common/include/otbFilterWatcherBase.h     |   2 +
 .../Common/include/otbFunctionToImageFilter.h |   2 +
 .../otbImageAndVectorImageOperationFilter.h   |   2 +
 .../otbImageRegionAdaptativeSplitter.h        |   2 +
 ...RegionNonUniformMultidimensionalSplitter.h |   2 +
 .../otbImageRegionSquareTileSplitter.h        |   2 +
 .../include/otbImageRegionTileMapSplitter.h   |   2 +
 ...otbImageToModulusAndDirectionImageFilter.h |   2 +
 .../otbImaginaryImageToComplexImageFilter.h   |   2 +
 .../Common/include/otbImportImageFilter.h     |   2 +
 .../include/otbImportVectorImageFilter.h      |   2 +
 .../Common/include/otbMachineLearningModel.h  |   2 +
 .../Common/include/otbModelComponentBase.h    |   2 +
 .../include/otbQuaternaryFunctorImageFilter.h |   2 +
 .../Common/include/otbRGBAPixelConverter.h    |   2 +
 Modules/Core/Common/include/otbRectangle.h    |   2 +
 .../Common/include/otbStandardFilterWatcher.h |   2 +
 .../include/otbStandardOneLineFilterWatcher.h |   2 +
 .../Common/include/otbStandardWriterWatcher.h |   2 +
 .../otbSubsampledImageRegionIterator.h        |   2 +
 Modules/Core/Common/include/otbSystem.h       |   2 +
 .../include/otbUnaryFunctorImageFilter.h      |   2 +
 ...naryFunctorNeighborhoodVectorImageFilter.h |   2 +
 .../otbUnaryFunctorVectorImageFilter.h        |   2 +
 ...unctorWithIndexWithOutputSizeImageFilter.h |   2 +
 .../include/otbUniformAlphaBlendingFunctor.h  |   2 +
 Modules/Core/Common/include/otbUtils.h        |   2 +
 .../otbVariableLengthVectorConverter.h        |   2 +
 .../include/otbVectorImageToASImageAdaptor.h  |   2 +
 .../include/otbVectorImageToASPixelAccessor.h |   2 +
 .../Common/include/otbWriterWatcherBase.h     |   2 +
 .../ImageBase/include/otbConvertPixelBuffer.h |   2 +
 .../include/otbDefaultConvertPixelTraits.h    |   2 +
 ...bEuclideanDistanceMetricWithMissingValue.h |   2 +
 ...lideanDistanceMetricWithMissingValuePow2.h |   2 +
 .../Core/ImageBase/include/otbExtractROI.h    |   2 +
 .../ImageBase/include/otbExtractROIBase.h     |   2 +
 .../otbFlexibleDistanceWithMissingValue.h     |   2 +
 Modules/Core/ImageBase/include/otbImage.h     |   2 +
 .../include/otbImageFunctionAdaptor.h         |   2 +
 .../Core/ImageBase/include/otbImageIOBase.h   |   4 +
 ...otbImageOfVectorsToMonoChannelExtractROI.h |   2 +
 .../ImageBase/include/otbMetaImageFunction.h  |   2 +
 .../include/otbMultiChannelExtractROI.h       |   2 +
 .../include/otbMultiToMonoChannelExtractROI.h |   2 +
 .../Core/ImageBase/include/otbVectorImage.h   |   2 +
 .../include/otbBCOInterpolateImageFunction.h  |   2 +
 .../otbBSplineDecompositionImageFilter.h      |   2 +
 .../otbBSplineInterpolateImageFunction.h      |   2 +
 .../otbGenericInterpolateImageFunction.h      |   2 +
 .../otbProlateInterpolateImageFunction.h      |   4 +
 .../include/otbStreamingTraits.h              |   6 +
 ...owedSincInterpolateImageBlackmanFunction.h |   4 +
 ...ndowedSincInterpolateImageCosineFunction.h |   4 +
 ...WindowedSincInterpolateImageFunctionBase.h |   2 +
 ...owedSincInterpolateImageGaussianFunction.h |   4 +
 ...dowedSincInterpolateImageHammingFunction.h |   4 +
 ...dowedSincInterpolateImageLanczosFunction.h |   4 +
 ...indowedSincInterpolateImageWelchFunction.h |   4 +
 .../include/otbAttributesMapLabelObject.h     |   6 +
 ...tbAttributesMapLabelObjectWithClassLabel.h |   2 +
 .../otbAttributesMapOpeningLabelMapFilter.h   |   2 +
 .../otbKMeansAttributesLabelMapFilter.h       |   2 +
 ...bLabelImageToLabelMapWithAdjacencyFilter.h |   2 +
 .../otbLabelMapFeaturesFunctorImageFilter.h   |   2 +
 .../Core/LabelMap/include/otbLabelMapSource.h |   2 +
 .../otbLabelMapToAttributeImageFilter.h       |   2 +
 .../include/otbLabelMapToLabelImageFilter.h   |   2 +
 .../include/otbLabelMapToSampleListFilter.h   |   2 +
 .../include/otbLabelMapWithAdjacency.h        |   2 +
 ...MapWithClassLabelToClassLabelImageFilter.h |   2 +
 ...pWithClassLabelToLabeledSampleListFilter.h |   2 +
 .../include/otbLabelObjectFieldsFunctor.h     |   2 +
 .../include/otbLabelObjectToPolygonFunctor.h  |   2 +
 ...tbLabelObjectWithClassLabelFieldsFunctor.h |   2 +
 .../include/otbMergeLabelObjectFunctor.h      |   2 +
 .../otbMinMaxAttributesLabelMapFilter.h       |   2 +
 .../otbNormalizeAttributesLabelMapFilter.h    |   4 +
 .../otbStatisticsAttributesLabelMapFilter.h   |   4 +
 .../otbDefaultImageMetadataInterface.h        |   2 +
 .../otbDefaultImageMetadataInterfaceFactory.h |   2 +
 .../otbFormosatImageMetadataInterface.h       |   2 +
 ...otbFormosatImageMetadataInterfaceFactory.h |   2 +
 .../include/otbIkonosImageMetadataInterface.h |   2 +
 .../otbIkonosImageMetadataInterfaceFactory.h  |   2 +
 .../include/otbImageMetadataInterfaceBase.h   |   2 +
 .../otbImageMetadataInterfaceFactory.h        |   2 +
 .../otbOpticalDefaultImageMetadataInterface.h |   2 +
 ...icalDefaultImageMetadataInterfaceFactory.h |   2 +
 .../otbOpticalImageMetadataInterface.h        |   2 +
 .../otbOpticalImageMetadataInterfaceFactory.h |   2 +
 .../otbPleiadesImageMetadataInterface.h       |   2 +
 ...otbPleiadesImageMetadataInterfaceFactory.h |   2 +
 .../otbQuickBirdImageMetadataInterface.h      |   2 +
 ...tbQuickBirdImageMetadataInterfaceFactory.h |   2 +
 .../otbSarDefaultImageMetadataInterface.h     |   2 +
 ...bSarDefaultImageMetadataInterfaceFactory.h |   2 +
 .../include/otbSarImageMetadataInterface.h    |   2 +
 .../otbSarImageMetadataInterfaceFactory.h     |   2 +
 .../include/otbSpot6ImageMetadataInterface.h  |   2 +
 .../otbSpot6ImageMetadataInterfaceFactory.h   |   2 +
 .../include/otbSpotImageMetadataInterface.h   |   2 +
 .../otbSpotImageMetadataInterfaceFactory.h    |   2 +
 .../otbTerraSarImageMetadataInterface.h       |   2 +
 ...otbTerraSarImageMetadataInterfaceFactory.h |   2 +
 .../otbWorldView2ImageMetadataInterface.h     |   2 +
 ...bWorldView2ImageMetadataInterfaceFactory.h |   2 +
 .../Core/ObjectList/include/otbImageList.h    |   2 +
 .../ObjectList/include/otbImageListSource.h   |   2 +
 .../include/otbImageListToImageFilter.h       |   2 +
 .../otbImageListToImageListApplyFilter.h      |   2 +
 .../include/otbImageListToImageListFilter.h   |   2 +
 .../include/otbImageListToSingleImageFilter.h |   2 +
 .../include/otbImageListToVectorImageFilter.h |   2 +
 .../Core/ObjectList/include/otbObjectList.h   |  10 +
 .../ObjectList/include/otbObjectListSource.h  |   2 +
 .../include/otbObjectListToObjectListFilter.h |   2 +
 .../otbUnaryFunctorObjectListBooleanFilter.h  |   2 +
 .../include/otbUnaryFunctorObjectListFilter.h |   2 +
 .../include/otbImageToPointSetFilter.h        |   2 +
 .../include/otbPointSetAndValuesFunction.h    |   2 +
 .../PointSet/include/otbPointSetExtractROI.h  |   2 +
 .../PointSet/include/otbPointSetFunction.h    |   2 +
 .../Core/PointSet/include/otbPointSetSource.h |   2 +
 .../include/otbPointSetToPointSetFilter.h     |   2 +
 .../include/otbRandomPointSetSource.h         |   2 +
 .../include/otbSimplePointCountStrategy.h     |   2 +
 .../otbThresholdImageToPointSetFilter.h       |   2 +
 .../include/otbTransformPointSetFilter.h      |   2 +
 .../include/otbDrawLineSpatialObjectFilter.h  |   2 +
 .../otbDrawLineSpatialObjectListFilter.h      |   2 +
 .../include/otbFillGapsFilter.h               |   2 +
 .../otbImageToLineSpatialObjectListFilter.h   |   2 +
 .../include/otbLineSpatialObject.h            |   2 +
 .../include/otbLineSpatialObjectList.h        |   2 +
 ...otbLineSpatialObjectListToPointSetFilter.h |   2 +
 .../include/otbSpatialObjectSource.h          |   2 +
 .../otbSpatialObjectToImageDrawingFilter.h    |   2 +
 ...umberOfDivisionsStrippedStreamingManager.h |   2 +
 ...tbNumberOfDivisionsTiledStreamingManager.h |   2 +
 ...otbNumberOfLinesStrippedStreamingManager.h |   2 +
 .../otbPersistentFilterStreamingDecorator.h   |   2 +
 .../include/otbPersistentImageFilter.h        |   2 +
 .../otbPipelineMemoryPrintCalculator.h        |   2 +
 .../otbRAMDrivenAdaptativeStreamingManager.h  |   2 +
 .../otbRAMDrivenStrippedStreamingManager.h    |   2 +
 .../otbRAMDrivenTiledStreamingManager.h       |   2 +
 .../include/otbStreamingImageVirtualWriter.h  |   2 +
 .../Streaming/include/otbStreamingManager.h   |   2 +
 .../otbTileDimensionTiledStreamingManager.h   |   2 +
 .../Transform/include/otbCompositeTransform.h |   2 +
 .../Transform/include/otbForwardSensorModel.h |   2 +
 .../include/otbGenericMapProjection.h         |   2 +
 .../Transform/include/otbGenericRSTransform.h |   2 +
 .../include/otbGeocentricTransform.h          |   2 +
 .../otbImageToGenericRSOutputParameters.h     |   2 +
 .../Transform/include/otbInverseSensorModel.h |   2 +
 .../Transform/include/otbLogPolarTransform.h  |   2 +
 .../Transform/include/otbSensorModelBase.h    |   2 +
 .../include/otbStreamingWarpImageFilter.h     |   2 +
 Modules/Core/Transform/include/otbTransform.h |   2 +
 .../Core/VectorDataBase/include/otbDataNode.h |   2 +
 .../include/otbDataNodeFunctionBase.h         |   2 +
 .../include/otbDataNodeImageFunction.h        |   2 +
 .../include/otbDataNodeVectorDataFunction.h   |   2 +
 .../include/otbGISConnectionImplementation.h  |   2 +
 .../Core/VectorDataBase/include/otbGISTable.h |   2 +
 .../include/otbGISTableSource.h               |   2 +
 .../otbPolyLineParametricPathWithValue.h      |   2 +
 .../Core/VectorDataBase/include/otbPolygon.h  |   2 +
 .../include/otbRemoteSensingRegion.h          |   2 +
 .../VectorDataBase/include/otbVectorData.h    |   2 +
 .../include/otbVectorDataIOBase.h             |   2 +
 .../include/otbVectorDataKeywordlist.h        |   2 +
 .../include/otbVectorDataProperties.h         |   2 +
 .../include/otbVectorDataSource.h             |   2 +
 .../include/otbCloudDetectionFilter.h         |   2 +
 .../include/otbCloudDetectionFunctor.h        |   2 +
 .../include/otbCloudEstimatorFilter.h         |   2 +
 .../include/otbCloudEstimatorFunctor.h        |   2 +
 .../otbDescriptorsListSampleGenerator.h       |   4 +
 .../include/otbFlusserMomentsIFFactory.h      |   2 +
 .../otbFourierMellinDescriptorsIFFactory.h    |   2 +
 .../include/otbHaralickTexturesIFFactory.h    |   2 +
 .../otbLabeledSampleLocalizationGenerator.h   |   2 +
 .../include/otbLocalHistogramIFFactory.h      |   2 +
 .../include/otbMultiChannelIFFactory.h        |   2 +
 .../include/otbRadiometricMomentsIFFactory.h  |   2 +
 .../otbStandardMetaImageFunctionBuilder.h     |   2 +
 .../include/otbGenericRoadExtractionFilter.h  |   2 +
 .../include/otbImageToPathListAlignFilter.h   |   2 +
 .../include/otbLikelihoodPathListFilter.h     |   2 +
 .../include/otbLinkPathListFilter.h           |   2 +
 ...otbModulusAndDirectionImageToImageFilter.h |   2 +
 .../otbNeighborhoodScalarProductFilter.h      |   2 +
 .../otbNonMaxRemovalByDirectionFilter.h       |   4 +
 .../include/otbParallelLinePathListFilter.h   |   2 +
 .../otbRemoveIsolatedByDirectionFilter.h      |   4 +
 .../include/otbRemoveTortuousPathListFilter.h |   2 +
 .../include/otbRemoveWrongDirectionFilter.h   |   4 +
 .../include/otbRoadExtractionFilter.h         |   2 +
 .../include/otbSimplifyPathListFilter.h       |   2 +
 .../otbVectorDataToRoadDescriptionFilter.h    |   2 +
 .../otbUrbanAreaDetectionImageFilter.h        |   6 +
 .../Corner/include/otbHarrisImageFilter.h     |   2 +
 .../include/otbHarrisImageToPointSetFilter.h  |   2 +
 ...tialObjectListToRightAnglePointSetFilter.h |   2 +
 ...tbVectorDataToRightAngleVectorDataFilter.h |   2 +
 .../include/otbKeyPointDensityImageFilter.h   |   2 +
 .../otbPointSetDensityEpanechnikovFunction.h  |   2 +
 .../include/otbPointSetDensityFunction.h      |   2 +
 .../otbPointSetDensityGaussianFunction.h      |   2 +
 .../include/otbPointSetToDensityImageFilter.h |   2 +
 ...ForwardFourierMellinTransformImageFilter.h |   2 +
 ...otbFourierMellinDescriptorsImageFunction.h |   2 +
 .../include/otbHessianToScalarImageFilter.h   |   2 +
 ...OfOrientedGradientCovariantImageFunction.h |   2 +
 .../otbImageToHessianDeterminantImageFilter.h |   4 +
 .../include/otbImageToSIFTKeyPointSetFilter.h |   6 +
 .../include/otbImageToSURFKeyPointSetFilter.h |   2 +
 .../include/otbKeyPointSetsMatchingFilter.h   |   2 +
 .../Feature/Descriptors/include/otbLandmark.h |   2 +
 .../include/otbSiftFastImageFilter.h          |   2 +
 .../otbAssociativeSymmetricalSumImageFilter.h |   4 +
 ...symmetricFusionOfLineDetectorImageFilter.h |   2 +
 .../Edge/include/otbEdgeDensityImageFilter.h  |   2 +
 .../Edge/include/otbEdgeDetectorImageFilter.h |   2 +
 .../include/otbExtractSegmentsImageFilter.h   |   2 +
 .../Edge/include/otbGaborFilterGenerator.h    |   2 +
 .../otbHorizontalSobelVectorImageFilter.h     |   4 +
 .../otbHoughTransform2DLinesImageFilter.h     |   2 +
 .../otbLineCorrelationDetectorImageFilter.h   |   2 +
 .../include/otbLineDetectorImageFilterBase.h  |   2 +
 .../include/otbLineRatioDetectorImageFilter.h |   2 +
 .../Edge/include/otbLineSegmentDetector.h     |   6 +
 .../Edge/include/otbLocalHoughFilter.h        |   2 +
 .../otbPersistentVectorizationImageFilter.h   |   2 +
 ...tbPixelSuppressionByDirectionImageFilter.h |   2 +
 .../Edge/include/otbSobelVectorImageFilter.h  |   4 +
 .../include/otbStreamingLineSegmentDetector.h |   2 +
 .../include/otbTouziEdgeDetectorImageFilter.h |   2 +
 .../otbVerticalSobelVectorImageFilter.h       |   4 +
 .../include/otbComplexMomentPathFunction.h    |   2 +
 .../include/otbComplexMomentsImageFunction.h  |   2 +
 .../include/otbFlusserMomentsImageFunction.h  |   2 +
 .../Moments/include/otbFlusserPathFunction.h  |   2 +
 .../include/otbGeometricMomentPathFunction.h  |   2 +
 .../include/otbHuMomentsImageFunction.h       |   2 +
 .../Moments/include/otbHuPathFunction.h       |   2 +
 .../otbImageToLabelMapWithAttributesFilter.h  |   2 +
 .../include/otbRadiometricMomentsFunctor.h    |   2 +
 .../otbRadiometricMomentsImageFilter.h        |   2 +
 .../otbRadiometricMomentsImageFunction.h      |   2 +
 .../include/otbRealMomentPathFunction.h       |   2 +
 .../include/otbRealMomentsImageFunction.h     |   2 +
 .../otbShapeAttributesLabelMapFilter.h        |   4 +
 .../include/otbImageToCarvingPathFilter.h     |   2 +
 .../include/otbRemoveCarvingPathFilter.h      |   2 +
 .../otbGreyLevelCooccurrenceIndexedList.h     |   2 +
 ...rixAdvancedTextureCoefficientsCalculator.h |   2 +
 .../otbHaralickTexturesImageFunction.h        |   2 +
 .../Textures/include/otbSFSTexturesFunctor.h  |   2 +
 .../include/otbSFSTexturesImageFilter.h       |   2 +
 .../otbScalarImageToAdvancedTexturesFilter.h  |   2 +
 ...tbScalarImageToHigherOrderTexturesFilter.h |   2 +
 .../otbScalarImageToPanTexTextureFilter.h     |   2 +
 .../include/otbScalarImageToTexturesFilter.h  |   2 +
 .../include/otbTextureImageFunction.h         |   2 +
 ...ctorNeighborhoodJoinHistogramImageFilter.h |   2 +
 .../include/otbCBAMIChangeDetector.h          |   2 +
 .../include/otbCorrelationChangeDetector.h    |   2 +
 .../include/otbCrossCorrelation.h             |   2 +
 .../include/otbJoinHistogramMIImageFilter.h   |   2 +
 .../otbKullbackLeiblerDistanceImageFilter.h   |   6 +
 .../otbKullbackLeiblerProfileImageFilter.h    |   6 +
 ...backLeiblerSupervizedDistanceImageFilter.h |   4 +
 .../ChangeDetection/include/otbLHMI.h         |   2 +
 .../include/otbLHMIChangeDetector.h           |   2 +
 .../include/otbMeanDifferenceImageFilter.h    |   2 +
 .../ChangeDetection/include/otbMeanRatio.h    |   2 +
 .../include/otbMeanRatioImageFilter.h         |   2 +
 ...ultivariateAlterationDetectorImageFilter.h |   2 +
 .../include/otbAmplitudePhaseToRGBFunctor.h   |   2 +
 .../include/otbReliefColormapFunctor.h        |   2 +
 .../otbScalarToRainbowRGBPixelFunctor.h       |   4 +
 .../include/otbConvolutionImageFilter.h       |   2 +
 .../otbOverlapSaveConvolutionImageFilter.h    |   2 +
 .../otbAngularProjectionBinaryImageFilter.h   |   2 +
 .../include/otbAngularProjectionImageFilter.h |   2 +
 .../otbAngularProjectionSetImageFilter.h      |   2 +
 .../otbEstimateInnerProductPCAImageFilter.h   |   2 +
 .../include/otbFastICAImageFilter.h           |   2 +
 ...astICAInternalOptimizerVectorImageFilter.h |   2 +
 .../include/otbInnerProductPCAImageFilter.h   |   2 +
 .../include/otbMNFImageFilter.h               |   2 +
 ...bMaximumAutocorrelationFactorImageFilter.h |   2 +
 .../include/otbNAPCAImageFilter.h             |   2 +
 .../otbNormalizeInnerProductPCAImageFilter.h  |   2 +
 .../include/otbPCAImageFilter.h               |   2 +
 .../otbSparseWvltToAngleMapperListFilter.h    |   2 +
 .../include/otbAlphaBlendingFunctor.h         |   2 +
 .../include/otbAmplitudeFunctor.h             |   2 +
 .../otbBinaryFunctorNeighborhoodImageFilter.h |   2 +
 ...naryFunctorNeighborhoodVectorImageFilter.h |   2 +
 .../include/otbBinaryImageDensityFunction.h   |   2 +
 ...naryImageMinimalBoundingRegionCalculator.h |   2 +
 .../otbBinaryImageToDensityImageFilter.h      |   2 +
 .../include/otbBinarySpectralAngleFunctor.h   |   2 +
 .../include/otbBoxAndWhiskerImageFilter.h     |   2 +
 .../include/otbChangeLabelImageFilter.h       |   2 +
 .../include/otbClampImageFilter.h             |   2 +
 .../include/otbClampVectorImageFilter.h       |   2 +
 .../otbConcatenateScalarValueImageFilter.h    |   4 +
 .../include/otbConcatenateVectorImageFilter.h |   2 +
 .../include/otbDEMToImageGenerator.h          |   2 +
 ...otbFunctionWithNeighborhoodToImageFilter.h |   2 +
 .../include/otbHillShadingFilter.h            |   2 +
 .../include/otbHillShadingFunctor.h           |   4 +
 .../include/otbImageToImageListFilter.h       |   2 +
 .../include/otbImageToVectorImageCastFilter.h |   4 +
 .../include/otbInverseLogPolarTransform.h     |   2 +
 .../otbLocalActivityVectorImageFilter.h       |   4 +
 .../otbLocalGradientVectorImageFilter.h       |   4 +
 .../include/otbLog10ThresholdedImageFilter.h  |   2 +
 .../include/otbMatrixImageFilter.h            |   2 +
 .../include/otbMeanFunctor.h                  |   2 +
 .../include/otbMultiplyByScalarImageFilter.h  |   2 +
 .../include/otbPerBandVectorImageFilter.h     |   2 +
 .../include/otbPhaseFunctor.h                 |   2 +
 .../include/otbPrintableImageFilter.h         |   4 +
 ...ealAndImaginaryImageToComplexImageFilter.h |   2 +
 .../otbRealImageToComplexImageFilter.h        |   2 +
 .../include/otbShiftScaleImageAdaptor.h       |   4 +
 .../include/otbShiftScaleVectorImageFilter.h  |   4 +
 .../otbSpectralAngleDistanceImageFilter.h     |   2 +
 .../include/otbSpectralAngleFunctor.h         |   2 +
 .../include/otbSqrtSpectralAngleFunctor.h     |   2 +
 ...tbStreamingInnerProductVectorImageFilter.h |   4 +
 ...treamingMatrixTransposeMatrixImageFilter.h |   4 +
 .../include/otbStreamingResampleImageFilter.h |   2 +
 .../include/otbStreamingShrinkImageFilter.h   |   4 +
 .../include/otbThresholdVectorImageFilter.h   |   2 +
 .../include/otbTileImageFilter.h              |   2 +
 .../otbUnaryFunctorNeighborhoodImageFilter.h  |   2 +
 ...FunctorNeighborhoodWithOffsetImageFilter.h |   2 +
 .../otbUnaryFunctorWithIndexImageFilter.h     |   2 +
 ...tbUnaryImageFunctorWithVectorImageFilter.h |   2 +
 .../otbVectorImageTo3DScalarImageFilter.h     |   2 +
 .../otbVectorImageToAmplitudeImageFilter.h    |   2 +
 .../include/otbVectorImageToImageListFilter.h |   2 +
 .../otbVectorRescaleIntensityImageFilter.h    |   4 +
 .../ImageNoise/include/otbFrostImageFilter.h  |   2 +
 .../ImageNoise/include/otbLeeImageFilter.h    |   2 +
 .../include/otbBandMathImageFilter.h          |   2 +
 .../include/otbBandMathXImageFilter.h         |   2 +
 .../include/otbMaskMuParserFilter.h           |   2 +
 .../include/otbMaskMuParserFunctor.h          |   4 +
 .../include/otbOBIAMuParserFunctor.h          |   4 +
 .../Filtering/MathParser/include/otbParser.h  |   2 +
 ...tbParserConditionDataNodeFeatureFunction.h |   2 +
 .../Filtering/MathParser/include/otbParserX.h |   2 +
 .../otbMorphologicalPyramidAnalysisFilter.h   |   2 +
 .../otbMorphologicalPyramidMRToMSConverter.h  |   2 +
 .../otbMorphologicalPyramidResampler.h        |   2 +
 ...tbMorphologicalPyramidSegmentationFilter.h |   2 +
 .../otbMorphologicalPyramidSegmenter.h        |   2 +
 .../otbMorphologicalPyramidSynthesisFilter.h  |   2 +
 .../Path/include/otbAddCarvingPathFilter.h    |   2 +
 .../include/otbBreakAngularPathListFilter.h   |   2 +
 .../Path/include/otbClosePathFunctor.h        |   2 +
 .../Path/include/otbCompacityPathFunction.h   |   2 +
 .../Path/include/otbDrawPathFilter.h          |   2 +
 .../Path/include/otbDrawPathListFilter.h      |   2 +
 .../otbImageFittingPolygonListFilter.h        |   2 +
 .../Path/include/otbImageToEdgePathFilter.h   |   2 +
 .../Path/include/otbImageToPathFilter.h       |   2 +
 .../Path/include/otbImageToPathListFilter.h   |   2 +
 .../Path/include/otbOrientationPathFunction.h |   2 +
 .../Filtering/Path/include/otbPathFunction.h  |   2 +
 .../Path/include/otbPathLengthFunctor.h       |   2 +
 .../Path/include/otbPathListSource.h          |   2 +
 .../include/otbPathListToHistogramGenerator.h |   2 +
 .../include/otbPathListToPathListFilter.h     |   2 +
 .../Path/include/otbPathMeanDistanceFunctor.h |   2 +
 .../include/otbPolyLineImageConstIterator.h   |   2 +
 .../Path/include/otbPolyLineImageIterator.h   |   2 +
 ...tbRegionImageToRectangularPathListFilter.h |   2 +
 .../include/otbVectorizationPathListFilter.h  |   2 +
 ...rToPolarisationDegreeAndPowerImageFilter.h |   4 +
 ...MuellerToReciprocalCovarianceImageFilter.h |   4 +
 ...MultiChannelsPolarimetricSynthesisFilter.h |   2 +
 .../Polarimetry/include/otbPolarimetricData.h |   2 +
 .../include/otbPolarimetricSynthesisFunctor.h |   2 +
 ...lCoherencyToReciprocalMuellerImageFilter.h |   4 +
 ...alCovarianceToCoherencyDegreeImageFilter.h |   4 +
 ...varianceToReciprocalCoherencyImageFilter.h |   4 +
 .../include/otbReciprocalHAlphaImageFilter.h  |   4 +
 ...oReciprocalCircularCovarianceImageFilter.h |   4 +
 .../include/otbSinclairImageFilter.h          |   2 +
 .../otbSinclairReciprocalImageFilter.h        |   2 +
 ...inclairToCircularCovarianceMatrixFunctor.h |   2 +
 .../otbSinclairToCoherencyMatrixFunctor.h     |   2 +
 .../otbSinclairToCovarianceMatrixFunctor.h    |   2 +
 .../otbSinclairToMuellerMatrixFunctor.h       |   2 +
 ...eciprocalCircularCovarianceMatrixFunctor.h |   2 +
 ...nclairToReciprocalCoherencyMatrixFunctor.h |   2 +
 ...clairToReciprocalCovarianceMatrixFunctor.h |   2 +
 .../include/otbEckert4MapProjection.h         |   2 +
 .../otbGCPsToRPCSensorModelImageFilter.h      |   2 +
 .../include/otbGenericRSResampleImageFilter.h |   2 +
 .../include/otbGeographicalDistance.h         |   2 +
 .../include/otbGeometriesProjectionFilter.h   |   2 +
 .../include/otbGroundSpacingImageFunction.h   |   2 +
 .../otbImageToEnvelopeVectorDataFilter.h      |   2 +
 .../otbImportGeoInformationImageFilter.h      |   2 +
 .../include/otbLambert2EtenduProjection.h     |   2 +
 .../include/otbLambert3CartoSudProjection.h   |   2 +
 .../include/otbLambert93Projection.h          |   2 +
 .../otbLambertConformalConicMapProjection.h   |   2 +
 .../otbLeastSquareAffineTransformEstimator.h  |   2 +
 .../include/otbMapProjectionDeprecated.h      |   2 +
 .../include/otbMollweidMapProjection.h        |   2 +
 .../include/otbOrthoRectificationFilter.h     |   2 +
 .../otbPhysicalToRPCSensorModelImageFilter.h  |   2 +
 ...tbPleiadesPToXSAffineTransformCalculator.h |   2 +
 .../otbProjectiveProjectionImageFilter.h      |   4 +
 .../Projection/include/otbROIdataConversion.h |   2 +
 .../Projection/include/otbRationalTransform.h |   2 +
 .../include/otbSVY21MapProjection.h           |   2 +
 .../include/otbSinusoidalMapProjection.h      |   2 +
 .../Projection/include/otbTileMapTransform.h  |   2 +
 .../include/otbTransMercatorMapProjection.h   |   2 +
 .../Projection/include/otbUtmMapProjection.h  |   2 +
 .../otbVectorDataIntoImageProjectionFilter.h  |   2 +
 .../include/otbVectorDataProjectionFilter.h   |   2 +
 .../include/otbVectorDataTransformFilter.h    |   2 +
 ...nvelopeSavitzkyGolayInterpolationFunctor.h |   2 +
 .../otbMeanShiftSmoothingImageFilter.h        |   8 +
 .../otbSavitzkyGolayInterpolationFunctor.h    |   2 +
 .../otbTimeSeriesLeastSquareFittingFunctor.h  |   2 +
 ...bBandsStatisticsAttributesLabelMapFilter.h |   4 +
 .../include/otbConcatenateSampleListFilter.h  |   2 +
 ...bContinuousMinimumMaximumImageCalculator.h |   2 +
 .../include/otbDEMCaracteristicsExtractor.h   |   2 +
 ...otbGaussianAdditiveNoiseSampleListFilter.h |   2 +
 .../include/otbHistogramStatisticsFunction.h  |   2 +
 .../include/otbListSampleGenerator.h          |   2 +
 .../Statistics/include/otbListSampleSource.h  |   2 +
 .../otbListSampleToBalancedListSampleFilter.h |   2 +
 .../otbListSampleToHistogramListGenerator.h   |   2 +
 .../include/otbListSampleToListSampleFilter.h |   2 +
 ...pleToVariableDimensionHistogramGenerator.h |   2 +
 .../include/otbLocalHistogramImageFunction.h  |   2 +
 .../include/otbNormalizeVectorImageFilter.h   |   2 +
 .../include/otbShiftScaleSampleListFilter.h   |   2 +
 .../include/otbStreamingCompareImageFilter.h  |   4 +
 .../otbStreamingHistogramVectorImageFilter.h  |   4 +
 .../include/otbStreamingMinMaxImageFilter.h   |   4 +
 .../otbStreamingMinMaxVectorImageFilter.h     |   4 +
 .../otbStreamingStatisticsImageFilter.h       |   4 +
 ...reamingStatisticsMapFromLabelImageFilter.h |   4 +
 .../otbStreamingStatisticsVectorImageFilter.h |   4 +
 .../include/otbVarianceImageFilter.h          |   2 +
 .../otbVectorImageToIntensityImageFilter.h    |   2 +
 .../otbVectorImageToMatrixImageFilter.h       |   4 +
 .../include/otbConcatenateVectorDataFilter.h  |   2 +
 .../include/otbCorrectPolygonFunctor.h        |   2 +
 .../otbDBOverlapDataNodeFeatureFunction.h     |   2 +
 .../include/otbGISTableToGISTableFilter.h     |   2 +
 .../include/otbPolygonCompacityFunctor.h      |   2 +
 ...sWithNeighborhoodDataNodeFeatureFunction.h |   2 +
 .../include/otbSimplifyPathFunctor.h          |   2 +
 .../otbSpectralAngleDataNodeFeatureFunction.h |   2 +
 .../include/otbVectorDataAdapter.h            |   2 +
 .../include/otbVectorDataExtractROI.h         |   2 +
 .../otbVectorDataToRandomLineGenerator.h      |   2 +
 ...ectorDataToSpecificDescriptionFilterBase.h |   2 +
 .../include/otbVectorDataToVectorDataFilter.h |   2 +
 .../include/otbVectorDataStyle.h              |   2 +
 .../include/otbVectorDataToImageFilter.h      |   2 +
 .../include/otbVectorDataToMapFilter.h        |   2 +
 .../Wavelet/include/otbSubsampleImageFilter.h |   2 +
 .../Wavelet/include/otbWaveletFilterBank.h    |   6 +
 .../Wavelet/include/otbWaveletGenerator.h     |   2 +
 .../include/otbWaveletHighPassOperator.h      |   2 +
 .../include/otbWaveletLowPassOperator.h       |   2 +
 .../Wavelet/include/otbWaveletOperator.h      |   2 +
 .../Wavelet/include/otbWaveletOperatorBase.h  |   2 +
 .../otbWaveletPacketDecompositionCosts.h      |   2 +
 .../include/otbWaveletPacketTransform.h       |   6 +
 .../Wavelet/include/otbWaveletTransform.h     |   6 +
 .../include/otbFuzzyDescriptorsModelManager.h |   2 +
 .../Fusion/Fuzzy/include/otbFuzzyVariable.h   |   2 +
 .../src/otbFuzzyDescriptorsModelManager.cxx   |   2 +-
 ...otbNeighborhoodMajorityVotingImageFilter.h |   2 +
 .../include/otbBayesianFusionFilter.h         |   4 +
 .../include/otbFusionImageBase.h              |   2 +
 .../otbLmvmPanSharpeningFusionImageFilter.h   |   4 +
 ...bSimpleRcsPanSharpeningFusionImageFilter.h |   4 +
 .../include/otbLocalRxDetectorFilter.h        |   2 +
 .../otbLocalRxDetectorNonThreadFilter.h       |   2 +
 .../otbEigenvalueLikelihoodMaximisation.h     |   2 +
 .../include/otbVcaImageFilter.h               |   2 +
 .../include/otbVirtualDimensionality.h        |   2 +
 .../include/otbISRAUnmixingImageFilter.h      |   4 +
 .../Unmixing/include/otbMDMDNMFImageFilter.h  |   2 +
 .../include/otbNCLSUnmixingImageFilter.h      |   4 +
 .../include/otbSparseUnmixingImageFilter.h    |   2 +
 .../otbUnConstrainedLeastSquareImageFilter.h  |   4 +
 .../IO/Carto/include/otbCoordinateToName.h    |   2 +
 .../otbImageToOSMVectorDataGenerator.h        |   2 +
 .../Carto/include/otbMapFileProductWriter.h   |   2 +
 .../include/otbOSMDataToVectorDataGenerator.h |   2 +
 .../IO/Carto/include/otbPlaceNameToLonLat.h   |   2 +
 Modules/IO/Carto/include/otbWorldFile.h       |   2 +
 Modules/IO/Carto/src/otbCoordinateToName.cxx  |   2 +-
 .../src/otbOSMDataToVectorDataGenerator.cxx   |   2 +-
 Modules/IO/Carto/src/otbPlaceNameToLonLat.cxx |   2 +-
 .../include/otbExtendedFilenameHelper.h       |   2 +
 .../otbExtendedFilenameToReaderOptions.h      |   2 +
 .../otbExtendedFilenameToWriterOptions.h      |   2 +
 Modules/IO/IOBSQ/include/otbBSQImageIO.h      |   2 +
 .../IO/IOBSQ/include/otbBSQImageIOFactory.h   |   2 +
 .../include/otbGDALDriverManagerWrapper.h     |   2 +
 Modules/IO/IOGDAL/include/otbGDALImageIO.h    |   2 +
 .../IO/IOGDAL/include/otbGDALImageIOFactory.h |   2 +
 Modules/IO/IOGDAL/include/otbOGRIOHelper.h    |   2 +
 .../IO/IOGDAL/include/otbOGRVectorDataIO.h    |   2 +
 .../include/otbOGRVectorDataIOFactory.h       |   2 +
 Modules/IO/IOGDAL/src/otbGDALImageIO.cxx      |   2 +-
 .../IOJPEG2000/include/otbJPEG2000ImageIO.h   |   2 +
 .../include/otbJPEG2000ImageIOFactory.h       |   2 +
 .../IO/IOJPEG2000/src/otbJPEG2000ImageIO.cxx  |   4 +-
 Modules/IO/IOKML/include/otbKMLVectorDataIO.h |   2 +
 .../IOKML/include/otbKMLVectorDataIOFactory.h |   2 +
 Modules/IO/IOLUM/include/otbLUMImageIO.h      |   2 +
 .../IO/IOLUM/include/otbLUMImageIOFactory.h   |   2 +
 Modules/IO/IOMSTAR/include/otbMSTARImageIO.h  |   2 +
 .../IOMSTAR/include/otbMSTARImageIOFactory.h  |   2 +
 Modules/IO/IOMW/include/otbMWImageIO.h        |   2 +
 Modules/IO/IOMW/include/otbMWImageIOFactory.h |   2 +
 Modules/IO/IOONERA/include/otbONERAImageIO.h  |   2 +
 .../IOONERA/include/otbONERAImageIOFactory.h  |   2 +
 Modules/IO/IORAD/include/otbRADImageIO.h      |   2 +
 .../IO/IORAD/include/otbRADImageIOFactory.h   |   2 +
 .../IO/IOTileMap/include/otbTileMapImageIO.h  |   2 +
 .../include/otbTileMapImageIOFactory.h        |   2 +
 .../include/otbTileMapImageIOHelper.h         |   2 +
 .../include/otbStatisticsXMLFileReader.h      |   2 +
 .../include/otbStatisticsXMLFileReader.txx    |   2 +-
 .../include/otbStatisticsXMLFileWriter.h      |   2 +
 .../include/otbStatisticsXMLFileWriter.txx    |   2 +-
 .../IO/ImageIO/include/otbImageFileReader.h   |   4 +
 .../IO/ImageIO/include/otbImageFileWriter.h   |   2 +
 .../IO/ImageIO/include/otbImageIOFactory.h    |   2 +
 .../include/otbImageSeriesFileReader.h        |   8 +
 .../include/otbImageSeriesFileReaderBase.h    |   2 +
 .../otbScalarBufferToImageFileWriter.h        |   2 +
 .../include/otbStreamingImageFileWriter.h     |   2 +
 .../KMZWriter/include/otbKmzProductWriter.h   |   2 +
 .../include/otbDifferenceImageFilter.h        |   2 +
 Modules/IO/TestKernel/include/otbTestHelper.h |   2 +
 .../include/otbVectorDataFileReader.h         |   2 +
 .../include/otbVectorDataFileWriter.h         |   4 +
 .../include/otbVectorDataIOFactory.h          |   2 +
 .../otbConfusionMatrixToMassOfBelief.h        |   2 +
 .../otbDSFusionOfClassifiersImageFilter.h     |   2 +
 .../include/otbJointMassOfBeliefFilter.h      |   2 +
 .../DempsterShafer/include/otbMassOfBelief.h  |   2 +
 .../include/otbStandardDSCostFunction.h       |   2 +
 ...bVectorDataToDSValidatedVectorDataFilter.h |   2 +
 .../include/otbConfusionMatrixCalculator.h    |   2 +
 .../include/otbConfusionMatrixMeasurements.h  |   2 +
 .../LearningBase/include/otbDecisionTree.h    |   2 +
 .../include/otbGaussianModelComponent.h       |   2 +
 .../include/otbImageClassificationFilter.h    |   2 +
 .../otbKMeansImageClassificationFilter.h      |   2 +
 .../include/otbMachineLearningModelFactory.h  |   2 +
 .../otbMachineLearningModelFactoryBase.h      |   2 +
 .../LearningBase/include/otbSEMClassifier.h   |   2 +
 .../Learning/Markov/include/otbMRFEnergy.h    |   2 +
 .../Markov/include/otbMRFEnergyEdgeFidelity.h |   2 +
 .../otbMRFEnergyFisherClassification.h        |   2 +
 .../Markov/include/otbMRFEnergyGaussian.h     |   2 +
 .../otbMRFEnergyGaussianClassification.h      |   2 +
 .../Markov/include/otbMRFEnergyPotts.h        |   2 +
 .../Learning/Markov/include/otbMRFOptimizer.h |   2 +
 .../Markov/include/otbMRFOptimizerICM.h       |   2 +
 .../include/otbMRFOptimizerMetropolis.h       |   2 +
 .../Learning/Markov/include/otbMRFSampler.h   |   2 +
 .../Markov/include/otbMRFSamplerMAP.h         |   2 +
 .../Markov/include/otbMRFSamplerRandom.h      |   2 +
 .../Markov/include/otbMRFSamplerRandomMAP.h   |   2 +
 .../include/otbMarkovRandomFieldFilter.h      |   2 +
 .../otbCzihoSOMLearningBehaviorFunctor.h      |   2 +
 .../otbCzihoSOMNeighborhoodBehaviorFunctor.h  |   2 +
 Modules/Learning/SOM/include/otbPeriodicSOM.h |   2 +
 Modules/Learning/SOM/include/otbSOM.h         |   2 +
 .../SOM/include/otbSOMActivationBuilder.h     |   2 +
 .../Learning/SOM/include/otbSOMClassifier.h   |   2 +
 .../include/otbSOMImageClassificationFilter.h |   2 +
 .../include/otbSOMLearningBehaviorFunctor.h   |   2 +
 Modules/Learning/SOM/include/otbSOMMap.h      |   2 +
 .../SOM/include/otbSOMWithMissingValue.h      |   2 +
 .../SOM/include/otbSOMbasedImageFilter.h      |   4 +
 .../include/otbChangeProfileKernelFunctor.h   |   4 +-
 .../otbExhaustiveExponentialOptimizer.h       |   2 +
 .../include/otbLabelMapSVMClassifier.h        |   2 +
 .../otbLibSVMMachineLearningModelFactory.h    |   2 +
 .../include/otbMixturePolyRBFKernelFunctor.h  |   4 +-
 .../include/otbNonGaussianRBFKernelFunctor.h  |   4 +-
 .../include/otbObjectDetectionClassifier.h    |   4 +
 .../SVMLearning/include/otbSVMClassifier.h    |   2 +
 .../otbSVMCrossValidationCostFunction.h       |   2 +
 .../include/otbSVMImageClassificationFilter.h |   2 +
 .../otbSVMImageClassificationWithRuleFilter.h |   2 +
 .../include/otbSVMImageModelEstimator.h       |   2 +
 .../SVMLearning/include/otbSVMKernels.h       |  32 +-
 .../SVMLearning/include/otbSVMMarginSampler.h |   2 +
 .../SVMLearning/include/otbSVMModel.h         |   4 +-
 .../include/otbSVMModelEstimator.h            |   2 +
 .../include/otbSVMPointSetModelEstimator.h    |   2 +
 .../include/otbSVMSampleListModelEstimator.h  |   6 +
 .../include/otbSpectralAngleKernelFunctor.h   |   4 +-
 .../include/otbImageListToRCC8GraphFilter.h   |   2 +
 ...bImageMultiSegmentationToRCC8GraphFilter.h |   2 +
 .../include/otbImageToImageRCC8Calculator.h   |   2 +
 .../include/otbPolygonListToRCC8GraphFilter.h |   2 +
 .../otbPolygonToPolygonRCC8Calculator.h       |   2 +
 Modules/OBIA/RCC8/include/otbRCC8Edge.h       |   2 +
 .../OBIA/RCC8/include/otbRCC8EdgeIterator.h   |   2 +
 Modules/OBIA/RCC8/include/otbRCC8Graph.h      |   2 +
 .../RCC8/include/otbRCC8GraphFileReader.h     |   4 +
 .../RCC8/include/otbRCC8GraphFileWriter.h     |   4 +
 .../OBIA/RCC8/include/otbRCC8GraphSource.h    |   2 +
 .../OBIA/RCC8/include/otbRCC8InEdgeIterator.h |   2 +
 .../RCC8/include/otbRCC8OutEdgeIterator.h     |   2 +
 Modules/OBIA/RCC8/include/otbRCC8VertexBase.h |   2 +
 .../OBIA/RCC8/include/otbRCC8VertexIterator.h |   2 +
 .../RCC8/include/otbRCC8VertexWithCompacity.h |   2 +
 .../include/otbRCC8VertexWithRegionCenter.h   |   2 +
 .../include/otbBuiltUpIndicesFunctor.h        |   6 +
 .../include/otbGAndRIndexImageFilter.h        |   2 +
 .../Indices/include/otbLandsatTMIndices.h     |  62 ++
 .../otbMultiChannelGAndRIndexImageFilter.h    |   2 +
 ...bMultiChannelRAndBAndNIRIndexImageFilter.h |   2 +
 ...bMultiChannelRAndGAndNIRIndexImageFilter.h |   2 +
 .../otbMultiChannelRAndNIRIndexImageFilter.h  |   2 +
 .../otbMultiChannelRadiometricImageFilter.h   |   2 +
 .../include/otbNDVIDataNodeFeatureFunction.h  |   2 +
 .../include/otbRAndBAndNIRIndexImageFilter.h  |   2 +
 .../include/otbRAndGAndNIRIndexImageFilter.h  |   2 +
 .../include/otbRAndNIRIndexImageFilter.h      |   2 +
 .../Indices/include/otbSoilIndicesFunctor.h   |  12 +
 .../include/otbVegetationIndicesFunctor.h     |  42 +
 .../Indices/include/otbWaterIndicesFunctor.h  |  18 +
 .../otbWaterSqrtSpectralAngleImageFilter.h    |   2 +
 .../include/otbAeronetData.h                  |   2 +
 .../include/otbAeronetFileReader.h            |   4 +
 .../otbAtmosphericCorrectionParameters.h      |   2 +
 .../include/otbAtmosphericRadiativeTerms.h    |   4 +
 .../otbImageMetadataCorrectionParameters.h    |   2 +
 .../include/otbImageToLuminanceImageFilter.h  |   4 +
 .../otbImageToReflectanceImageFilter.h        |   4 +
 .../otbLandsatTMSpectralRuleBasedClassifier.h |   2 +
 .../include/otbLuminanceToImageImageFilter.h  |   4 +
 .../otbLuminanceToReflectanceImageFilter.h    |   4 +
 ...ionParametersToAtmosphericRadiativeTerms.h |   2 +
 .../otbReflectanceToImageImageFilter.h        |   4 +
 .../otbReflectanceToLuminanceImageFilter.h    |   4 +
 ...flectanceToSurfaceReflectanceImageFilter.h |   4 +
 .../include/otbSIXSTraits.h                   |   2 +
 .../include/otbSpectralSensitivityReader.h    |   2 +
 ...aceAdjacencyEffectCorrectionSchemeFilter.h |   4 +
 .../OpticalCalibration/include/otbVarSol.h    |   2 +
 .../include/otbWavelengthSpectralBands.h      |   2 +
 .../include/otbSarBrightnessFunction.h        |   2 +
 .../include/otbSarBrightnessFunctor.h         |   2 +
 .../include/otbSarBrightnessToImageFilter.h   |   2 +
 .../include/otbSarParametricMapFunction.h     |   2 +
 .../otbSarRadiometricCalibrationFunction.h    |   2 +
 .../otbSarRadiometricCalibrationFunctor.h     |   2 +
 ...tbSarRadiometricCalibrationToImageFilter.h |   2 +
 .../include/otbTerraSarBrightnessFunctor.h    |   2 +
 .../otbTerraSarBrightnessImageFilter.h        |   2 +
 .../include/otbAtmosphericEffects.h           |   2 +
 .../include/otbImageSimulationMethod.h        |   2 +
 .../otbLabelMapToSimulatedImageFilter.h       |   2 +
 .../include/otbLabelToProSailParameters.h     |   2 +
 .../otbLabelToSimulationParametersBase.h      |   2 +
 .../Simulation/include/otbLeafParameters.h    |   2 +
 .../Simulation/include/otbProSailParameters.h |   2 +
 .../Simulation/include/otbProspectModel.h     |   2 +
 .../include/otbReduceSpectralResponse.h       |   2 +
 ...bReduceSpectralResponseClassifierRAndNIR.h |   2 +
 .../Simulation/include/otbSailModel.h         |   2 +
 .../Simulation/include/otbSatelliteRSR.h      |   2 +
 .../include/otbSimulationStep1Base.h          |   2 +
 .../include/otbSimulationStep2Base.h          |   2 +
 .../include/otbSpatialisationFilter.h         |   2 +
 .../Simulation/include/otbSpectralResponse.h  |   2 +
 ...otbSurfaceReflectanceToReflectanceFilter.h |   4 +
 .../include/otbDisparityMapEstimationMethod.h |   2 +
 .../include/otbDisparityMapMedianFilter.h     |   2 +
 .../include/otbDisparityMapTo3DFilter.h       |   2 +
 .../include/otbDisparityMapToDEMFilter.h      |   2 +
 .../include/otbDisparityTranslateFilter.h     |   2 +
 .../include/otbMultiDisparityMapTo3DFilter.h  |   2 +
 .../include/otbSubPixelDisparityImageFilter.h |   2 +
 ...nesInterpolateDisplacementFieldGenerator.h |   2 +
 ...olateTransformDisplacementFieldGenerator.h |   2 +
 ...earInterpolateDisplacementFieldGenerator.h |   2 +
 ...earInterpolateDisplacementFieldGenerator.h |   2 +
 ...tbNearestPointDisplacementFieldGenerator.h |   2 +
 ...arestTransformDisplacementFieldGenerator.h |   2 +
 .../otbPointSetToDisplacementFieldGenerator.h |   4 +
 ...ithTransformToDisplacementFieldGenerator.h |   2 +
 ...ereorectificationDisplacementFieldSource.h |   2 +
 .../include/otbAdhesionCorrectionFilter.h     |   2 +
 .../include/otbBijectionCoherencyFilter.h     |   2 +
 .../include/otbFineRegistrationImageFilter.h  |   2 +
 .../Stereo/include/otbLineOfSightOptimizer.h  |   2 +
 .../Stereo/include/otbMulti3DMapToDEMFilter.h |   2 +
 .../Stereo/include/otbNCCRegistrationFilter.h |   2 +
 .../include/otbNCCRegistrationFunction.h      |   2 +
 .../otbPixelWiseBlockMatchingImageFilter.h    |  10 +
 ...otbStereoSensorModelToElevationMapFilter.h |   2 +
 .../otbConnectedComponentMuParserFunctor.h    |   4 +
 .../otbLabelObjectOpeningMuParserFilter.h     |   2 +
 ...ponentSegmentationOBIAToVectorDataFilter.h |   4 +
 .../include/otbGISTableToLabelMapFilter.h     |   2 +
 .../include/otbGISTableToVectorDataFilter.h   |   2 +
 .../otbLabelImageRegionMergingFilter.h        |   2 +
 .../otbLabelImageRegionPruningFilter.h        |   2 +
 .../otbLabelImageToOGRDataSourceFilter.h      |   2 +
 .../include/otbLabelImageToVectorDataFilter.h |   2 +
 .../include/otbLabelMapToGISTableFilter.h     |   2 +
 .../include/otbLabelMapToVectorDataFilter.h   |   2 +
 .../otbOGRDataSourceToLabelImageFilter.h      |   2 +
 .../otbPersistentImageToOGRDataFilter.h       |   2 +
 .../otbPersistentImageToOGRLayerFilter.h      |   2 +
 .../otbPersistentImageToVectorDataFilter.h    |   2 +
 .../include/otbRasterizeVectorDataFilter.h    |   2 +
 .../include/otbVectorDataToGISTableFilter.h   |   2 +
 .../include/otbVectorDataToLabelImageFilter.h |   2 +
 .../include/otbVectorDataToLabelMapFilter.h   |   2 +
 ...VectorDataToLabelMapWithAttributesFilter.h |   2 +
 .../include/otbMeanShiftImageFilter.h         |   4 +
 .../include/otbMeanShiftVectorImageFilter.h   |   4 +
 ...tbLabelizeConfidenceConnectedImageFilter.h |   2 +
 ...otbLabelizeConnectedThresholdImageFilter.h |   2 +
 .../include/otbLabelizeImageFilterBase.h      |   2 +
 ...LabelizeNeighborhoodConnectedImageFilter.h |   2 +
 .../include/otbRelabelComponentImageFilter.h  |   2 +
 ...hiftConnectedComponentSegmentationFilter.h |   2 +
 .../include/otbMeanShiftSegmentationFilter.h  |   2 +
 .../Metrics/include/otbHooverInstanceFilter.h |   2 +
 .../Metrics/include/otbHooverMatrixFilter.h   |   2 +
 .../otbClosingOpeningMorphologicalFilter.h    |   2 +
 .../otbConvexOrConcaveClassificationFilter.h  |   4 +
 ...odesicMorphologyDecompositionImageFilter.h |   2 +
 ...phologyIterativeDecompositionImageFilter.h |   2 +
 .../otbGeodesicMorphologyLevelingFilter.h     |   4 +
 .../include/otbImageToProfileFilter.h         |   2 +
 .../otbMorphologicalClosingProfileFilter.h    |   2 +
 .../otbMorphologicalOpeningProfileFilter.h    |   2 +
 ...bMorphologicalProfilesSegmentationFilter.h |   2 +
 ...ScaleConvexOrConcaveClassificationFilter.h |   4 +
 .../otbOpeningClosingMorphologicalFilter.h    |   2 +
 ...ivativeToMultiScaleCharacteristicsFilter.h |   2 +
 .../otbProfileToProfileDerivativeFilter.h     |   2 +
 .../otbOGRLayerStreamStitchingFilter.h        |   2 +
 ...reamingImageToOGRLayerSegmentationFilter.h |  12 +
 .../include/otbWatershedSegmentationFilter.h  |   2 +
 .../otbWrapperAddProcessToWatchEvent.h        |   2 +
 .../include/otbWrapperApplication.h           |   2 +
 .../otbWrapperApplicationHtmlDocGenerator.h   |   2 +
 .../include/otbWrapperApplicationRegistry.h   |   2 +
 .../include/otbWrapperChoiceParameter.h       |   2 +
 .../otbWrapperComplexInputImageParameter.h    |   2 +
 .../otbWrapperComplexOutputImageParameter.h   |   2 +
 .../include/otbWrapperDirectoryParameter.h    |   2 +
 .../include/otbWrapperDocExampleStructure.h   |   2 +
 .../otbWrapperElevationParametersHandler.h    |   2 +
 .../include/otbWrapperEmptyParameter.h        |   2 +
 .../otbWrapperInputFilenameListParameter.h    |   2 +
 .../otbWrapperInputFilenameParameter.h        |   2 +
 .../otbWrapperInputImageListParameter.h       |   2 +
 .../include/otbWrapperInputImageParameter.h   |   2 +
 .../otbWrapperInputProcessXMLParameter.h      |   4 +-
 .../otbWrapperInputVectorDataListParameter.h  |   2 +
 .../otbWrapperInputVectorDataParameter.h      |   2 +
 .../include/otbWrapperListViewParameter.h     |   2 +
 ...otbWrapperMapProjectionParametersHandler.h |   2 +
 .../include/otbWrapperNumericalParameter.h    |   2 +
 .../otbWrapperOutputFilenameParameter.h       |   2 +
 .../include/otbWrapperOutputImageParameter.h  |   2 +
 .../otbWrapperOutputProcessXMLParameter.h     |   4 +-
 .../otbWrapperOutputVectorDataParameter.h     |   2 +
 .../include/otbWrapperParameter.h             |   2 +
 .../include/otbWrapperParameterGroup.h        |   2 +
 .../include/otbWrapperParameterKey.h          |   2 +
 .../include/otbWrapperRAMParameter.h          |   2 +
 .../include/otbWrapperRadiusParameter.h       |   2 +
 .../include/otbWrapperStringListParameter.h   |   2 +
 .../include/otbWrapperStringParameter.h       |   2 +
 .../include/otbWrapperCommandLineLauncher.h   |   2 +
 .../include/otbWrapperCommandLineParser.h     |   2 +
 .../src/otbApplicationLauncherCommandLine.cxx |   2 +-
 .../include/otbQtFileSelectionWidget.h        |   2 +
 .../QtWidget/include/otbQtLogOutput.h         |   2 +
 .../include/otbQtStringSelectionWidget.h      |   2 +
 .../otbWrapperQtWidgetChoiceParameter.h       |   2 +
 ...rapperQtWidgetComplexInputImageParameter.h |   2 +
 ...apperQtWidgetComplexOutputImageParameter.h |   2 +
 .../otbWrapperQtWidgetDirectoryParameter.h    |   2 +
 .../otbWrapperQtWidgetEmptyParameter.h        |   2 +
 .../otbWrapperQtWidgetFloatParameter.h        |   2 +
 ...rapperQtWidgetInputFilenameListParameter.h |   2 +
 ...otbWrapperQtWidgetInputFilenameParameter.h |   2 +
 ...tbWrapperQtWidgetInputImageListParameter.h |   2 +
 .../otbWrapperQtWidgetInputImageParameter.h   |   2 +
 ...bWrapperQtWidgetInputProcessXMLParameter.h |   2 +
 ...pperQtWidgetInputVectorDataListParameter.h |   2 +
 ...bWrapperQtWidgetInputVectorDataParameter.h |   2 +
 .../include/otbWrapperQtWidgetIntParameter.h  |   2 +
 .../otbWrapperQtWidgetListViewParameter.h     |   2 +
 .../include/otbWrapperQtWidgetModel.h         |   2 +
 ...tbWrapperQtWidgetOutputFilenameParameter.h |   2 +
 .../otbWrapperQtWidgetOutputImageParameter.h  |   2 +
 ...WrapperQtWidgetOutputProcessXMLParameter.h |   2 +
 ...WrapperQtWidgetOutputVectorDataParameter.h |   2 +
 .../include/otbWrapperQtWidgetParameterBase.h |   2 +
 .../otbWrapperQtWidgetParameterFactory.h      |   2 +
 .../otbWrapperQtWidgetParameterGroup.h        |   2 +
 .../otbWrapperQtWidgetParameterLabel.h        |   2 +
 .../otbWrapperQtWidgetProgressReport.h        |   2 +
 .../include/otbWrapperQtWidgetRAMParameter.h  |   2 +
 .../otbWrapperQtWidgetSimpleProgressReport.h  |   2 +
 .../otbWrapperQtWidgetStringListParameter.h   |   2 +
 .../otbWrapperQtWidgetStringParameter.h       |   2 +
 .../QtWidget/include/otbWrapperQtWidgetView.h |   2 +
 README                                        |  71 +-
 RELEASE_NOTES.txt                             | 838 ++++++++----------
 893 files changed, 2597 insertions(+), 541 deletions(-)

diff --git a/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h
index 087279e43f..978f38e9e2 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 724301db1d..20176d0b2a 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 659d908481..0f150cb9ee 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 7774025173..921f4de97e 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 7fb98fb490..a5a1bc68ee 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 89fd40fe57..2b36e9c32e 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 e5035ae085..83d0cc4df9 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 6b5ce9b82b..0a37948fab 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 51f6c1b628..a7c24b8456 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 d3f686c72b..cfe17bc373 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 26416ecd3b..109e9c2abb 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 0e8d2158f7..60a84b3624 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 1ed4e96464..69b22e4c10 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 22509230ba..60939ebd97 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 e8c2fc06f3..8844607899 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 03fe4b8209..10934fffad 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 c2c1e376c7..dc9005bec4 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 12e794d07d..2f764f1973 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 6ace761b7b..c14092d74c 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 f446e76b90..528144e916 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 a8cd95dd38..f373409359 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 001c5ed733..9764e772ca 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 48ff44dea1..d14e2f41f8 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 2075b8913f..e4395106f9 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 6808aa1edf..475665a60d 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 7edbc6a6b4..b935f8e7e0 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 0e117131c6..d563485bd5 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 19a91f0dd8..ea0535417b 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 d478d517e3..084fc51a21 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 ac4b911358..3fe64808ca 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 f61b7b6b89..25808e93d4 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 6820ebc95e..453abba5a8 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 9f422d322b..2c61e28322 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 914cd06e87..c15fc0205d 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 43333c3027..7be090ab88 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 bf0e77fd40..1232f3ed42 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 b85ecbc624..b9aa111228 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 87f56b140c..72a44a91fc 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 7bc70b8f0e..11d0ae309c 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 2263145c9b..b486567871 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 1c723ddbd8..add5ec353b 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 ae8ec86ad6..8780dc3910 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 6278642c5c..edb5805d05 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 f63d53da2e..7842014edd 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 3e05e61b7c..6c2ab5ffc8 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 3614e5f855..763447c385 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 d0b3d29b1d..c90de81087 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 c1008b0c0b..d0edccc95b 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 4aba646478..ac78b385a9 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 65e6fe677b..66a01f0857 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 02aa7bc26d..9edb416f67 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 09e12a2007..f0f192dc0a 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 5578b660cb..16ce4cd343 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 cdfa1ed4aa..cf2a68bd8f 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 8fe331d0e8..a9ad5ccb23 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 6f117c929b..34a3ea7800 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 91afd98113..359edfd4c3 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 48f7ff8005..e84721599d 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 015a3ac581..c5a927129e 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 22d21f8ee5..08ebbf63cd 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 9f2c39e7dc..9ecd77eb01 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 e80e6b8d5f..cdf80a0fa2 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 6e2b3cbd0a..80be874f90 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 fdb4bcfc45..932b4ba311 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 552947ba15..c6d6c07b4f 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 5e4fd7f690..53b9cb67cb 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 feac7b60a9..4508b4632c 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 180d6ee478..4bb1aa5ed3 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 dc698b0662..eb0e45d7d0 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 0bfee0d30c..eecd10785a 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 418cfc26c5..e0df8601f8 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 532a1c0c39..ba29df414a 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 fcde10f804..47bf386feb 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 dc15c8d0ab..6ec57f90ef 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 47a18a7b28..fe69507c8c 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 dd0b5b8c10..0894276c62 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 7497bdb57f..febc9c5d48 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 879777e8db..48832da89e 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 dbe8620c4c..4fefbcaf8f 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 9658fd8764..657733eedf 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 40053d627c..36c022f185 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 f1009bced6..343bfc1acb 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 62aa5bc8e2..94fd9bc212 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 b716b6c60a..383454fef0 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 fc46dfa297..831456ad04 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 01374f8355..7112ad4f6b 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 f954e159f7..2aa1801932 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 919f8cc31f..6ba202e938 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 ea85901ff4..0f461ddecc 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 e9d96b7f9a..94785c1cf7 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 85d00f97e4..027e1497c8 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 deca40ce79..59023a4194 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 99632088a6..1744295145 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 d5a528b774..f08cfa46b0 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 0d771f4f4f..3b9468dd5a 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 b338bd82ec..0baf3bb53d 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 484c8edff6..48cafebae4 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 4f87dc491c..f84a97cb6c 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 7fd61dd31e..d27ee46e03 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 cf6c0b6f91..705e93d5f4 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 4d542fb6c8..b973290a32 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 b64f4b4ef9..ddbe8e3b19 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 397f1f1a02..a00ce82ee5 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 3a069971a6..5eb242b636 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 1e2c4e31b0..2302606115 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 0365397b18..2da34dd799 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 7a3ffe2efe..85e157536e 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 bd891004cb..20f0fc6072 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 67efda31f5..2564bc27bb 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 2797b660db..de7b7c9a6d 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 90522cba1e..6b5a949ce4 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 7e8cf7d76e..a2c4a7e4b0 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 5071cdcf48..3b597fe26e 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 182d87ec9f..a4e077f082 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 7a27530f5e..be10ce584e 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 da9c87d8a3..ab9fb5c174 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 f500c5f438..647e431cda 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 82c547f38e..a5c71d9d2e 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 ce0b00fd3c..92a132d29c 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 60c6ec68b7..f86b3f7798 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 dc5a04c521..d80c23121e 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 da55a66cf6..4875537cfb 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 3c943c41ee..f050fe1d65 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 79dc6fa4e2..0317b60c01 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 1f620749da..5c279fdca7 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 4ebcc057f9..1b955558fa 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 bfc1a24d18..4e61817e70 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 c001bacd26..25bce7d0c7 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 99cd2b279c..775b42e909 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 a01d6b8588..f5fca02115 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 72386db66b..e7860a1d78 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 315215a44d..b2dc609d07 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 492f6b744e..ec961bfa61 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 87efb52673..9bec791d4d 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 bc5e906336..c3aa5e70b7 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 ed17cf40fe..9f10f645f8 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 0c83cbe87c..515d32b466 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 f41fbb5da4..c379df4a19 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 df6972ae51..39f2db5910 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 3bb7820afd..135259d19a 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 2c3861eb2a..ea7f49d270 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 96609049b8..13e293b50d 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 7543578010..94d2313352 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 23786d2b0e..070138b369 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 deeff3dae9..f78fa3e87c 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 6766328b6c..8eb0f38490 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 21f6ef718a..73f055cbdc 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 f687a08038..caa77c33d3 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 c56fea37a5..269af29003 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 d72ac305d7..5534e97e24 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 3586f5b12c..4e6555cf0c 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 1661b533ce..7413f1e8f0 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 b26addf14b..22687cfca5 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 cb720c55e7..9a92a0b8bb 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 b77ae00b4c..3fb4b79d65 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 569ff63b00..7434ed9856 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 aeece2eeba..760eea8815 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 09f15312a2..2e2b02b0b9 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 fc049d2f40..84b836d8bd 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 1ae63bd910..8ed1dd401e 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 aef1b4b910..7db9fc83f3 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 093435c676..259224ae17 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 d6e8ff6544..5df80bdf8b 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 0cb82c7a8d..9e66210f2b 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 05860d90a9..007b33ddac 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 0e97aebabb..9ed6cb632e 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 22d972f92d..2555e22d1c 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 63b92e669b..ac644bdede 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 055a17d2ed..e4650e8a3c 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 cd60cae36f..ef4a9cbe22 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 dd14e156d8..ffb7a76c83 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 ff52a2114c..784c4a5c4c 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 f2313b56de..a91a5b4084 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 60f12a8c92..3564772755 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 1b99c9f44a..553dbd4041 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 c767bdd76e..d2f443f091 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 73f6039af9..91227d3881 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 22fc26c907..620a06086b 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 9a71e394bf..5fd838de30 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 060db608bd..7563d8552e 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 ef405ef695..98e23e6cb5 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 a6be5e3a5f..714ae00355 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 b4c2e26635..c65adda4ce 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 febd276ced..a41adde251 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 7563c4c764..333ea8bdc1 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 1004750886..76803062b3 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 dd15cde8cc..190e02d48a 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 1f1ed7b866..eab1aa67a8 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 88b903b326..e8498fd0c9 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 0d88bb73e6..1c539cf143 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 94d782c02b..9c04b81c12 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 87d78f2202..894ad10d69 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 bfcf83f343..02eb558f7f 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 5c6a2859f3..42f8e9f586 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 4c72905450..c787dcf4d3 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 8a48e30b99..5ff6a46655 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 0c26f5d4f4..df23e7cc6e 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 10345733a8..107d9fbf37 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 da1e73ba4e..7c579ba232 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 8318f1e446..48f09faa36 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 b85c2b7fa3..a58c21a9ad 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 c53897f49d..d3796f80d4 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 7cc13ff6f4..5db6fa1bc5 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 8112e259d5..ec9562c324 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 c88191d554..3918474e44 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 176900ff93..fb4238fb07 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 f9778c64ac..9f0da81acb 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 cb076ff4e2..b74f23977e 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 ad3ee83c30..4ebdfce5c4 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 4aca447332..688179fe46 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 f536f3a786..9765f77955 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 7024b5c5a7..afbb478f3f 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 0ee929c42b..5234c09b40 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 a25fff2e54..2e10601596 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 bfd9f61543..e4145bea24 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 9a0be97318..d4a8e8e109 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 f5713e5672..eeeaf010ab 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 824572eca8..0816817871 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 fb19c026eb..6f57b94fef 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 55d509f0f8..5739ca4a4f 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 51bc331f70..3be1c89cbc 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 ca21bf4f78..c6ed12cce9 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 30021bd07a..5788d0873e 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 c71d58dbc5..a1397fb92b 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 5a97920ee6..d2e57fe995 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 95a795bbe9..41530eb4a7 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 026fd420cb..1487c20dbf 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 ff65133e43..89260e2b2d 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 70949b8179..9eaa4ab785 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 64c468b970..3351c36c54 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 dbc5c412b9..88dc5df298 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 77326211b8..80e4af8bcd 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 68b1911515..a8c4a2fe2d 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 b76a0b4e01..b632f94ec8 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 6500064651..ab8c43ee58 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 ee0b437308..f475136328 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 806b6053c2..9de74d093f 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 4a61e89122..66bdb8a959 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 137eae43b3..57c2fbd5d1 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 d1f258f67c..f144fdbaab 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 4b07882c5d..53e02888ec 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 ca5d5836cc..ac84cda4ba 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 7cda01913f..c5b9917dab 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 aedaf53b8e..d207d34c2f 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 ae37c0d0ef..3f632bcd2a 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 644ba8a652..928f9f0e51 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 498cabbff3..60a84bf77b 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 8a7e1bc47c..5cbc162739 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 4e3095847b..6feb2644d8 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 85bb156b5f..c934227476 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 279791de7d..b4bc6c9881 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 8635b00d65..7545483e5c 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 dfa8e789c3..867af0a779 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 4abb345b8d..c066f5d904 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 f14958b303..2c2d8d91b0 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 7b49e0c3c0..c4da86c681 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 8f6928d0de..db6c0dcca4 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 22aee973f6..f8e3c53f44 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 6db85d75f3..e124e78626 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 c7a1300a0a..971e0436f9 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 adc6c5b3b8..1415469f75 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 fb9c923a8d..c898ccebb5 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 105a826280..7c06b5bb24 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 615333d9b0..88ee430561 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 8adeabfe47..06de52a3f3 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 dc864dfa6d..1dba5813fb 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 dffce7d209..59c6748426 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 057b9895e0..093f614cae 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 ac4ca91a62..73cc5bcd44 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 270e71572b..39f5f54bcd 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 83b5dec414..75552969d9 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 cbd4dcbb76..e07a0af4a1 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 76d6f316b6..ab9f09cba6 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 20b4f53d88..c6c4c16265 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 66b4f33b94..7aebf96e79 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 16a4791ba7..2915a7249a 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 fd08f40f4a..04d6c3d0c3 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 9fbf5c7f86..40073b7b56 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 3a72dd5729..2458433b08 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 eabc008e02..74e3a2e13b 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 77b9659d8a..3b4c293983 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 cf8cf2b43d..e16bccbee2 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 acf17df14e..ee9553d2b0 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 900d9ca5cb..a6151f6785 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 15270340c7..1a1ce959ab 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 9a500aea96..2255ec283a 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 337da83841..90130a6818 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 944b85ef4e..b1e985b97f 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 15ac07bcdd..9ac7b3afd1 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 8559ad2b5e..a4f06b19e9 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 46231ac951..2983377272 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 0862b67286..18ad7e351a 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 86a930dbd1..46b3626365 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 ea5ef83be4..1ed4926e35 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 60fc6f2b62..0d63785e6a 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 a5900915fa..504b28c77a 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 f7aeea9965..3583aaf8f0 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 96168a3b1c..d855bd5261 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 0c6c80d511..79f02b79aa 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 03e79412ac..3f29154a7d 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 33a6458229..cf9702b036 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 29416d75f5..97d8ef2763 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 ec8b76ad48..59429902f8 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 0ee1d13a3d..2451b080ad 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 dbaba7eba4..6583fbfaa3 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 0c20cc5bed..988a3e5b11 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 38f2115c22..c0068f0e32 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 0552303df3..aee9615e95 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 d2c791d6da..aeafe075f4 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 075dda7bce..e029614723 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 f12153350f..8ab7ab1b43 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 ddf98a9e02..19a6a5debd 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 811d14e8fa..fa8910fdcc 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 2af02ba4b7..4e343fc963 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 b179674cf3..028c46ab8e 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 cf543eafc6..02f8a23005 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 2009dbc8fa..31517f4bbe 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 64ee4ff48f..df99c4979f 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 09e4fa7967..0af665394b 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 8cc1c20db4..c9a896537e 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 0865363464..63112445a7 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 6aaa4d5e0d..d6d08dddb3 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 5f869fa795..84ea1ceee6 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 416c005596..370a0384a2 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 561d01d6f5..511f219c2b 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 83589769d6..e61ae24116 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 02491ccdb2..c397eba14e 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 cc23d0d43f..02448bc2aa 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 d62cf7f682..431c9b7cf4 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 cbc08d43d3..9010d7db27 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 c8579c8c8d..134cbe974b 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 ddf4fd3ba8..f49c4ef8a0 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 1ea9bd5f50..f4842f0d0f 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 ec17b60ad1..901e41a568 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 d515417278..579c16d999 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 42295a0b96..0bf29163ce 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 838c11321d..6a9aa40b56 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 a21cc3e976..0026f829f3 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 b40d17ac29..6e40202da9 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 cdfdb09cee..06a40b25f3 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 284be55bb1..65b44b163a 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 b1502acada..3866a549b4 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 f193445db1..fe918f5865 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 37cce74d8c..9ae62f88e1 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 f031614805..72d3caf02d 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 64537ef949..54faab6f56 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 36018f54ca..becc1d390e 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 0577ef7c53..859c124371 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 13c237888a..b399c92b77 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 c1469c2d22..5201c34cca 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 0537973180..b6706bbe4e 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 a840c5d534..c2eb3ffbb2 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 8c30f2536b..c52e658d07 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 1c92c19bfc..a327a6bcaa 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 4b216c62ac..0f4862f8a3 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 070962b377..79bfe9c030 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 7233d261a4..b56db8e7c9 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 c3650ab232..8197ec2e66 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 d9ff8a9978..d0c779983c 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 e8225ed4a7..3679dd4446 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 40929195b4..900df35a42 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 e6424e46b2..1c205000ba 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 054b7705d6..0b99e1edbd 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 b80e0d1563..dcec3d60ac 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 90ce20420c..9a6331b18a 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 110ef27f73..ea5d1367d5 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 a7cba5eddb..4a62f6fd29 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 4e0bb89348..246ea4e5e1 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 80caff2797..06178f8be9 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 5b75e7e560..746deb73f2 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 a42227743d..658a8cffa8 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 912c789fd1..bb878ab949 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 de54e3da36..454b11df33 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 c11290c673..ab3e1d3811 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 2c83d7926a..9f513fbf19 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 c3b064fc66..3f6cfbaf02 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 328b647060..7c950734ec 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 c6b9c273d7..2dd917adb4 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 8715963f00..0f8fad7126 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 c89bb1bf21..e3aed3ade9 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 481f7e2f3b..9525b667dc 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 25d04fca23..7341aadfc7 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 ffb9138ba3..26422e340c 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 37be0ff50a..b8cf7b4782 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 3ed0c0fce0..4ce398a881 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 af361ce257..c2ac2a812a 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 a4e8de1564..64ac35e8cf 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 d0acce8c32..e8b18f4eb5 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 2e98aac1a6..841117429a 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 66c842e64f..c985e4447f 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 2adca67562..e0e1e61542 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 840c1e34da..dd37ff9d79 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 70e20d4b20..8b1f93d245 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 e0e596ff1e..c9b5d1bd81 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 4b9a679b87..fdb2713907 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 8834e20892..cb1a41967b 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 e6d2606649..18a45eb160 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 1cef32081c..4bbb5f79fc 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 a401172e63..997c730463 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 39fb925aa1..9c80e7ffd1 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 2498502849..487224a17e 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 11c024b0bb..e6e7179b41 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 56b1cf41bd..1411a0b5c7 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 e5a27e9c90..5d4cbf8081 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 5135b4726f..ebf63c6cf3 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 ae6ed49023..9ba384f7f0 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 87bb75afb1..0979d2dab9 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 2fc3c8533f..10a02a21ee 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 749475f9ff..d9fcbddb93 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 aa4ca431ac..7bb954ef92 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 02eea1d24e..f8bd0adb2a 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 918bcea4ca..369d46cd04 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 b89474f484..83c831fae5 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 940c18594a..08e8e2b3ac 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 1ddd313c76..20be5dfd66 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 79379de0e3..904786e17b 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 64861ab2ba..f450547489 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 7af4fc2176..5fb086314d 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 609d4a02f4..dec07b272e 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 e7a46244a7..52d5eb9f6f 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 62a1025d0c..670203f4dc 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 c3b4e45991..bdeb1565ea 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 8765edc7be..f54a400d5c 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 45958c1171..69b9a335d7 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 c4ea22ac9f..cb8f74a17f 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 382a241c03..9c26ba8358 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 234aed4913..e1b1b19ff8 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 0bb14e0eeb..568007a1da 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 fc17eb1650..f8dd25a0f7 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 401df329ef..74f760bfaf 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 1f11cb38e9..366c866d80 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 06cf8765e0..53a38c2c11 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 5bea2c9304..7d632d99d4 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 6614b43e97..55faa32a1e 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 004f20e71f..f5aa814348 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 84aa6763d0..a402cb52b1 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 70a47f868a..0bab24269f 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 a982cba35d..11aff0d012 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 e9dade6a22..26ac0e5470 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 afe0ad0080..900da39d18 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 84b2d6294d..f6c401b75e 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 2b5c20925d..0877fbb161 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 13bc49e53e..1081c263d9 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 1e0336f6b1..2ffb1b9a22 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 0e65277a0f..3ad4b0b79e 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 f673f55043..f1747c595c 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 f62f9cd8c8..227b46a90d 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 e9bbb07770..1df4e8c8a2 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 f08f5a718d..55bb5c9ecd 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 f2dadb8f30..c3d4f81404 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 f1a35884e7..43b3320ce7 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 4f4c16e1df..390487cf7c 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 91f25f2390..5d31c330b7 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 61a858b5fa..53c62b6339 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 eb242de77d..e1d6743c6f 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 e65d3483aa..98c7bba8ed 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 90ae35058a..517200ccf9 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 9d3deb6532..0cb9483181 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 c0a44cf9e4..2b5c5a7f4d 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 fc9c68aff8..22aa459ee8 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 60f65ea7b7..b5da047809 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 dba86c80fe..bc85e4bb91 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 db8b553353..bc3e7649db 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 3af4cde46b..85b27ade41 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 9a1df1fb8c..27a1739567 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 ada8a8a529..5fc17804dc 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 258da098e8..ba70c78426 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 b9f39eefd9..3c1883b96f 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 25a1ad01e6..d512a1ec01 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 7dd1b0af1a..07a44f6b40 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 5dde1e0a0b..4b2eef2a09 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 61adee35e4..e64b0df172 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 2314dfc481..8c3abe5afe 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 4affd6fe55..4b9841f7ba 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 abb54f0959..d022c8aded 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 1467438365..247f61cad5 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 f8097875d0..5adfb206ab 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 f9f4082090..1d6ca66b0e 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 ed5744ba7a..f7a4e50b98 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 027e9ed47e..0489909517 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 1b0bdd339f..7da549cefc 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 020f70c160..471bee5567 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 ab8cbe7c70..a555e1a289 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 2af4096ded..0fe63b0ef0 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 52322fe3a0..2060c4d16b 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 1150f37bd4..50807c5e20 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 410ce9b659..763d261f97 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 6b3b86f3c7..fe472ce73d 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 b9f06de840..85814359a4 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 19bd205a21..5c404ab864 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 01b1603336..1618567830 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 3ddeab0659..9286ff30d9 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 6b3cf804ab..ada874f485 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 86120553ff..0d6eaf3427 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 825bbfdf19..5ba1e63b74 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 a7295241d0..95906d2d56 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 295d77b73b..bfde757314 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 8359dea142..1454aa1485 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 e91d35d0c2..2dbf358832 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 c22d8dc492..985be709d6 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 c2db6c0fb8..607c4b15a2 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 27a3cfafcf..b08f73682c 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 d847f7a73f..9a2923f7e2 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 4f8c9291d7..86449478a6 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 e1d1aedbf5..fe92eb66f0 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 b962a2f88a..727d97e41e 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 46c2b7fc24..5c8826008e 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 86ef331bca..37dab623ae 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 7fbf91601d..d1540a62ef 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 a5f4813484..b29faf1f82 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 de4082d2d1..739c19e553 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 a4bb028075..2aea72e42b 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 a2cf810141..95f560aea3 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 ebfb30c2fd..07d90ba700 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 fafb2f004c..4a900d93ca 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 b7f733987f..027ef05668 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 4025e842e5..f10cbb579a 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 82bc07eecf..0c63765be7 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 ecf1f61b96..e4d8c022c8 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 b7bcfda232..7e2939767e 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 19afabecac..ad99254b88 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 d6a35f9fc8..e467edd33d 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 64135dd2a5..a9e508c914 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 862835581d..b24acd48ec 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 da06d2afe2..274e470780 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 8e333d8c0d..cca2604395 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 55f8624235..324ac52ee4 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 e06ab505a3..c9bf64923d 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 205572a833..bcd6549588 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 a1ff2a4614..4f505878d0 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 21fa7b11f0..0e900decd7 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 02a1347971..68b477bffd 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 100d462128..ae8a87bb2d 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 b7b6c7ecc8..1f51a4d287 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 34710f1391..0742709e72 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 6f5ed4b77e..c512f90682 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 e197a486a3..c3598d3259 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 517f20f1f7..c07570b9d4 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 ffb6c35276..76449b94c4 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 6277bf7782..1c16dffe0b 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 33da504bba..987aaceb8b 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 43b8d4a9a8..a792e7d889 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 c5de57ad92..fd28876504 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 be97e6630a..5084c6cce4 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 cca29e95b4..30622c494b 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 5c63808a27..b983ba896b 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 ea1962ca39..7848366214 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 3a2cff76b8..7afad9841e 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 4bb4b68014..c8542ca44a 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 d955990054..117eefef8a 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 58a1fd99bc..86f59e68c5 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 6e2fd7c83c..1577ce8e1a 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 4645da85e1..8c931bb2f8 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 11645da0ff..1bb707cc41 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 39081934a6..07248e693f 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 d6ff1a0c09..a9d30c807d 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 80fef64d54..c214d733c4 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 fe54656918..74c678e4b1 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 ffbd07877c..7c259a63d6 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 bfa1cd6af3..c3fecc7a66 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 ece0a06d9c..bd979a2e80 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 9b52627cde..4c55fb8756 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 6debb11464..920bd2f0d1 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 c6eb3f6ee2..18e72127ae 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 d5f9858333..356c71c21b 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 702144f506..1bceb81d1d 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 688d61904f..ffe5ca9a1f 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 09445e4ec7..96e72fe51f 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 80bf5d790d..131506a949 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 e884fc3bfe..94dbc212d4 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 fbb07c7250..da45096f17 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 9cc88ca972..a259920125 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 fa3133d1f3..d7cdaff633 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 f52dce3030..c0bef43758 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 03fbfa8cbb..7e0c8b61da 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 8a3d38074c..baf02bd4ee 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 bf94aa5601..f7ae24d3da 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 8792db3680..3571167e59 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 5e223d90f1..9855c4fedf 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 c8c82268fa..3b4f1c7b5b 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 759cb9f8a7..018c7b0f0d 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 d62860dcda..13765469c7 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 bc5a4de724..4bd9e0a53e 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 a660b7ce66..bbed681ee1 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 6488931648..5996544103 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 b1081cfee3..4383998365 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 1716fc1e81..6f2ee04797 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 27f8e18c62..62f509c617 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 11c9dbc1d6..8ad46f235b 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 f98b8344c4..8b9c2548f8 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 31e3400459..7363877c0d 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 522ecff29e..8d712a606f 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 0ee8c38b6a..59d6a4133d 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 5b174e4f13..4078c40954 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 8c2cc72d4a..ced63061d3 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 27aa33e9ea..15125c3be1 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 90751fc391..92b68ddbd4 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 b68efc7e2b..c838058bf6 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 5068aba305..cf74161fb4 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 211134e430..ebf001b70f 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 a13ef4897b..c53659ccb8 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 d2d00fb6b8..73187fe122 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 7e5e369d69..b4bb28fb5a 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 7d30cc8816..c9cdbf3e42 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 7e809d5bae..7ef8d62381 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 69b1006bdf..dc9271f260 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 0c7a5f8234..d3836bc393 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 47ad561fde..b4845fbcc8 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 387b40f1fb..7f7c6ed32d 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 819ad04161..aa56e892a9 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 e3ea9284f1..203c31b36f 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 3e6554644a..84457d064b 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 143823e87e..598fcc3f8b 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 46132d2421..ed84fedfd3 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 12410b4197..427303d96f 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 bf92111582..2c38108580 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 d6b4b9b36a..de71002560 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 38aa9dba6c..1c68d7bf17 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 8403a73119..7c3c11c362 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 ed1f0b38d5..2fdec1e669 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 178a1609fd..5146fa01ed 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 0ccfac6d65..206f04b84a 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 ade43f63ac..fc166c1006 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 3c468d77fb..6937b06d51 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 62ef674433..3471edfebd 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 8e2f00bb84..b8b95d5c28 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 4c4a239354..bec0f914d7 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 7dd030c2f6..cbf767e791 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 a186a364f1..604335743b 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 8ad4fef5b3..a1830d5cbc 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 63fb2c94d1..8fca36556d 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 dd4536b931..ec8f232625 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 edf854a12e..64a8b3be46 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 27407fc2ea..f576df6b73 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 c6fdc3a847..108da52247 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 a7d082f737..10878ea50f 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 2f10ff4e29..c14e9d8ddc 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 3432846888..8723fca4f2 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 c3695ec1b5..d07a9d7ddc 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 4a0f95f831..e24ca281d3 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 f359d60507..fbd9f3a95b 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 a94684f1c0..284b620338 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 e1be74de96..78e06ce7d2 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 9a8db5c856..7a68fa6476 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 58bebabd4c..a81df3e339 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 d149b69e31..7bc01e4abb 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 e9bab0d506..7205dc75b7 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 aea26802cc..3232e4d9c5 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 06c0b9b870..d2f3b1f450 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 008ba063b3..111d470af6 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 e80988bd16..3db9aec74f 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 8f8ff2c4eb..00276472de 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 47870321ab..94219310f6 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 77d61dbe6c..0c9dba7c8e 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 013ebc8c84..3a9d13b2dd 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 36783c6ac5..ed26781f16 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 cb51672499..b289706f3d 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 69fae9daa9..dd58492d46 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 c72ca73491..9af23edab8 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 6504e29c23..c7f6bb6db0 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 8412da5360..0e68eb52ac 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 6fde8f66c7..6fa702f200 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 341b944344..f679cf212a 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 c60087e7c4..197f7b536e 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 080d95236b..55c06dba46 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 b9b93dc5dd..86232de21a 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 e8c2fa777e..21b88af547 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 307f562755..4c41bcd68a 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 3eda6adff6..a175bbd488 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 e97adb9943..0c738baffa 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 3194172d94..8f7799c71d 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 911963f806..6b86a2ada6 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 c4ffafcecd..e1578db9ca 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 d35fbb05d7..b5d7690740 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 a5e75f811f..7b91712135 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 2ef6a649eb..38ef31760e 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 7bb7493b08..e176bd0a34 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 39404ec251..eb3fb5625c 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 fe22bea260..ade79be226 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 c4bfd5b9aa..b7d99e51d9 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 b5c84311dd..5ba16f14ca 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 9e1ff30545..0ebecc6f7f 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 7b6b8db94b..cecf668da2 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 3c233a6a3e..0006fc7d7b 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 5ff5da669f..0cda308201 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 ca3be17cbd..5d2bebd0fd 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 4e5f2925ce..e5d390f332 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 ecddb2758e..dbf99dd2ab 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 80dc830cd3..7be265274e 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 c43894de36..4235a1b490 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 c2446cded8..7cd094b864 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 8e0006fda2..f109b672aa 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 a3555bee57..f111d9d7c0 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 3ecfb4fd84..8f0d916b61 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 bd9039bb05..bb1340e33f 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 028c6e5979..10c57e1efb 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 e82d2c067e..3b3cc61f46 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 d676d412c5..e92eecb111 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 39ed8a9990..9f7994cb4d 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 4797aa4086..2a42a0815c 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 d20c37df04..65b44f5dfa 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 e2dd5ed6e6..0a61f9e95a 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 36d40e0ddb..68e2d53cbc 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 9d039d6f1e..dbf7660fae 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 fbc94f095f..9ace913146 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 adcfae8bdb..f0d7ad4a72 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 1a02e28a38..06e454d9ad 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 4cd89ccb57..7957930122 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 810ccd5aeb..8b62d643be 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 69b5961517..8ca617bdb5 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 10292571cb..5870366819 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 f6b1764bb8..1bb82df741 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 aa6dcfe2a5..28997f1ab1 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 c7bca94785..a288520e30 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 116f2e3851..26121b7d89 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 51a6852d60..5f7a597463 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 7cbfe51a12..7c47357ee1 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 2697442be7..af68323c92 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 a872a11bb4..99409bb1f7 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 e859ef26ea..a519b288a2 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 79a67d2c72..feb0c1b8e8 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 4be6bf9683..2f5fe34b8a 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 840d6aada3..11c789136c 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 ee93c15421..9d615c8d94 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 8937ec7218..67a642e0ed 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 c175890a58..10e1410f23 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 a4dd999ab0..22aecbbad5 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 38882427c9..8250dd5299 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 79821ca7b9..47be340fc5 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 abf06c9297..541afff72d 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 d06b31a065..db02de332b 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 7b3cd411ca..1212e9ae68 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 c412061a3b..9ff7c1a608 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 df2423fe33..05984c7e7e 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 877fcfd6a2..1116fc7f88 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 e99df350e9..5fe703e2c2 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 c8534f14fc..91801a97be 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 2533653b16..7c1ad1ac39 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 306f0ae2db..1bc5444ab1 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 1c7ba1cab4..0e6eb212e1 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 5c0ffa8555..52d1475b06 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 3a6693fbf6..6364f5d2cd 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 ba74d3ad3d..aad26a9cc1 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 57c29595a6..ce663bdbd2 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 28ed8d982b..20b390b499 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 11be17e334..27166a40f9 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 177d9bfa33..bfaaff863b 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 8133c01134..0758ae05b8 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 ea9092fd00..3cf1ae1152 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 27ab5f5e41..cffd375942 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 d5368eb022..2733f05614 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 1d88c90d43..ded18110e7 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 7be354b035..e01c3f6880 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 eb16895890..705032abad 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 fc12dd6917..f0929ab9d3 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 71fcfe7892..f0e4d379be 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 369bd15241..7486c606c6 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 fac1fb4c36..cbdc4282d4 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 2ef42b875f..8f987463b0 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 ee5c3e5b30..52a7a77a6a 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 de236523b5..e7df1f96df 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 300824aca8..5ef63392f5 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 31b484c938..81cecc3ca7 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 afbea243e1..c5dd9798e3 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 04e2d6725c..fad2a985c4 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 1fac68b9ff..2fe6858d81 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 51fb3eaaf0..6ea65f6a6a 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 e2f751bab5..59e1cf42a5 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 16e654a4fa..25d849d136 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 1c19ffeb99..c800c722e6 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 e6997772e2..7bb90449cb 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 7c8431d027..bc93b444d8 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 f6923037a6..051b3433bb 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 d2a7d0f0a7..ea5fa36275 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 226beb0b79..529ee40973 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 83dead84ba..7273aaf7a7 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 c53bd730d7..606403ddad 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 02def3f79d..87a85bd0ec 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 c32538979f..2ad1a455d2 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 b57752c985..f86d63c0d5 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 5b1ae21987..575ef344c0 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 6f538901e4..242439ddbc 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 0ab714e846..8643a00dfb 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 ad1e5520c5..170d25c0c3 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 41bf745cf6..9efce6f18f 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 c21776ff09..e3fc46d40e 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 f2feecc04e..d9004f4aa8 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 6cd7a06488..997c3d4f0b 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 9861eedbac..c591ae3e99 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 7c8553b220..4e7727b944 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 485ac31110..0a262e79a0 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 4ab5e77fea..a8e7ad8fc5 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 ef309bd338..bea98a7862 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 74ac0d1767..75c60591b6 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 92855b5078..776463cfba 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 7ddba0a65f..3f7015a6ec 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 65f778a736..37072f6f38 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 1f61e789b1..c5b1c01329 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 8f332d1b66..9e3e9a2f26 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 44e2476e86..f26a729e16 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 c1827a1e18..755d8856d6 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 75076fd937..5dcf88b29f 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 d18ba565d7..5c289b8209 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 fb6dfaa881..5b394fd959 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 7359825da0..7057b20169 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 6f219ce8fc..03c8a2b924 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 be955e737e..fb2395bf90 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 1220846477..c7290c5974 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 a532359e8a..835d2c83dc 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 d4bfba606d..41b4e93458 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 c482d1add6..d29e0a923d 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 623ddd1ea4..7f210c9ce4 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 a401198286..fc75eb56da 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 c2f0ccc8c8..b82fd77bf5 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 345d084c4a..8764c95be0 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 1e4b63ac31..15c29e8fc0 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 296f92994c..fe8b16dd9e 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 92c6581ef6..7bcf55ab9f 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 b8cf55eef4..c83db8aa56 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 a65b9d2b5b..0c899f10f1 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 535e63947c..2c7f05b0fa 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 7bfcad4d7e..8771421fd5 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 a623ab3357..4a658542bf 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 b95a8c2224..f8ee6e658e 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 5fd9b0f0ad..9c83a78636 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 ad03a42d46..407aa35f29 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 f6b7a14252..ed1699d204 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 4a3b09c689..5cff129f7f 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 f5d8fb5e14..14eccd1f25 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 59ee6d7f20..6500d54621 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 079401aa4e..9051bef4d3 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 4f3ef2ce7a..c5573a114e 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 bc6ef2f57f..a7b2750f1e 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 61a0df2533..0a13ef1469 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 bb3739ed10..1992608db8 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 db2e65f28a..9c2f295418 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 cc3fb56695..cb86b1e866 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 b70ca1c8cb..4c0e2fe9ce 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 f6ee85967a..be5f9dc215 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 738d4bc4d9..71df9b3830 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 5a38da9d3a..7f9aac71f2 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 ae2d1ca2b0..b50fa171e0 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 b2edd31736..08d1de8cf8 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 e233a32484..5117a3af48 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 e960bd4744..31bacce374 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 33cc62dc9c..a8dc212a7c 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 3d829ed97e..671caeef1c 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 afee4912ce..c06d25dc47 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 9506ecbc0e..c9bdcfd0eb 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 ecef2a7b6c..e03311025f 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 a425af8c25..d7f17907df 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 990adda83d..d4fc760291 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 13fd1fc0ba..07cd91aeaa 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 1a17121804..f9d07e8c2e 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 f0f625458e..101eee7f74 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 6aa793537e..5bcf47e04c 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 e5fb027d8f..be529fbffb 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 047ffa7744..8544c663f6 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 4ac54aa56f..0ea7bca6dd 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 d3ed3e2394..089644b810 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 c39a069ec1..24a2d2a674 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 d9dacc4f7c..7b61a075ae 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 16eed555ad..2209410cb7 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 6baca2a5f2..7b4f82648c 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 cb9371a5c0..544c0b254e 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 54a8292be7..801704cfe9 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 22088232ac..4fa580365b 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 21b9a0b47e..9ba8cbb34a 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 d94465a61b..5bd8760d85 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 962a919478..5fd3612e4d 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 43239c8811..e5319923c9 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 a818ddf181..f71d8eb078 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 20e5061068..55bef403be 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 d1f82d627b..b7af9098fb 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 4882806491..6961220b05 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 2db28d0a3c..499c0f1420 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 8f6033d795..c36ab2191c 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 7c2a599220..092f34c538 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 56f817da97..e0216aee1c 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 81fc26a9fd..caebce80a4 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 5835f49457..79a5d7af16 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 e7021e6a65..85d8e9436b 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 070425c1d8..a013918d65 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 085a5c9297..7410d9d06e 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 7f0624c76a..01c7b82d47 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 be870bcd19..908dfd173c 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 f4a5bd2459..ac1435d5ed 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 0ffa73fd68..d04cbbc4aa 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 059d8997df..3eac3bbc0d 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 e42d7d6447..98f65e846d 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 c785ba3177..067e5e219e 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 6b82ee8dc7..ba5a440e79 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 f1ee531fdc..6295574caa 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
-- 
GitLab