diff --git a/Code/UtilitiesAdapters/boost/otbBoostDox.h b/Modules/Adapters/BoostAdapters/include/otbBoostDox.h
similarity index 100%
rename from Code/UtilitiesAdapters/boost/otbBoostDox.h
rename to Modules/Adapters/BoostAdapters/include/otbBoostDox.h
diff --git a/Code/Common/otbJoinContainer.h b/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h
similarity index 100%
rename from Code/Common/otbJoinContainer.h
rename to Modules/Adapters/BoostAdapters/include/otbJoinContainer.h
diff --git a/Code/UtilitiesAdapters/CurlAdapters/otbCurlHelper.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelper.h
similarity index 100%
rename from Code/UtilitiesAdapters/CurlAdapters/otbCurlHelper.h
rename to Modules/Adapters/CurlAdapters/include/otbCurlHelper.h
diff --git a/Code/UtilitiesAdapters/CurlAdapters/otbCurlHelperInterface.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
similarity index 100%
rename from Code/UtilitiesAdapters/CurlAdapters/otbCurlHelperInterface.h
rename to Modules/Adapters/CurlAdapters/include/otbCurlHelperInterface.h
diff --git a/Code/Testing/otbCurlHelperStub.h b/Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h
similarity index 100%
rename from Code/Testing/otbCurlHelperStub.h
rename to Modules/Adapters/CurlAdapters/include/otbCurlHelperStub.h
diff --git a/Code/UtilitiesAdapters/CurlAdapters/otbCurlHelper.cxx b/Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/CurlAdapters/otbCurlHelper.cxx
rename to Modules/Adapters/CurlAdapters/src/otbCurlHelper.cxx
diff --git a/Code/UtilitiesAdapters/CurlAdapters/otbCurlHelperInterface.cxx b/Modules/Adapters/CurlAdapters/src/otbCurlHelperInterface.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/CurlAdapters/otbCurlHelperInterface.cxx
rename to Modules/Adapters/CurlAdapters/src/otbCurlHelperInterface.cxx
diff --git a/Code/Testing/otbCurlHelperStub.cxx b/Modules/Adapters/CurlAdapters/src/otbCurlHelperStub.cxx
similarity index 100%
rename from Code/Testing/otbCurlHelperStub.cxx
rename to Modules/Adapters/CurlAdapters/src/otbCurlHelperStub.cxx
diff --git a/Testing/Code/TestSystem/otbIsNightlyRevision.cxx b/Modules/Adapters/CurlAdapters/test/otbIsNightlyRevision.cxx
similarity index 100%
rename from Testing/Code/TestSystem/otbIsNightlyRevision.cxx
rename to Modules/Adapters/CurlAdapters/test/otbIsNightlyRevision.cxx
diff --git a/Code/Common/otbGdalDataTypeBridge.h b/Modules/Adapters/GdalAdapters/include/otbGdalDataTypeBridge.h
similarity index 100%
rename from Code/Common/otbGdalDataTypeBridge.h
rename to Modules/Adapters/GdalAdapters/include/otbGdalDataTypeBridge.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.h
rename to Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSource.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSource.h
rename to Modules/Adapters/GdalAdapters/include/otbGeometriesSource.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.h
rename to Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.txx b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.txx
rename to Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.txx
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbImageReference.h b/Modules/Adapters/GdalAdapters/include/otbImageReference.h
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbImageReference.h
rename to Modules/Adapters/GdalAdapters/include/otbImageReference.h
diff --git a/Code/UtilitiesAdapters/otbOGR.h b/Modules/Adapters/GdalAdapters/include/otbOGR.h
similarity index 100%
rename from Code/UtilitiesAdapters/otbOGR.h
rename to Modules/Adapters/GdalAdapters/include/otbOGR.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
rename to Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.txx b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.txx
rename to Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.txx
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDriversInit.h b/Modules/Adapters/GdalAdapters/include/otbOGRDriversInit.h
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRDriversInit.h
rename to Modules/Adapters/GdalAdapters/include/otbOGRDriversInit.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.h
rename to Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx
rename to Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.h
rename to Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.txx b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.txx
rename to Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRGeometriesVisitor.h b/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRGeometriesVisitor.h
rename to Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRGeometryWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRGeometryWrapper.h
rename to Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRHelpers.h b/Modules/Adapters/GdalAdapters/include/otbOGRHelpers.h
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRHelpers.h
rename to Modules/Adapters/GdalAdapters/include/otbOGRHelpers.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.h
rename to Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.cxx b/Modules/Adapters/GdalAdapters/src/otbGeometriesSet.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.cxx
rename to Modules/Adapters/GdalAdapters/src/otbGeometriesSet.cxx
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSource.cxx b/Modules/Adapters/GdalAdapters/src/otbGeometriesSource.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSource.cxx
rename to Modules/Adapters/GdalAdapters/src/otbGeometriesSource.cxx
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx b/Modules/Adapters/GdalAdapters/src/otbGeometriesToGeometriesFilter.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx
rename to Modules/Adapters/GdalAdapters/src/otbGeometriesToGeometriesFilter.cxx
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.cxx
rename to Modules/Adapters/GdalAdapters/src/otbOGRDataSourceWrapper.cxx
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDriversInit.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRDriversInit.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRDriversInit.cxx
rename to Modules/Adapters/GdalAdapters/src/otbOGRDriversInit.cxx
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRFeatureWrapper.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.cxx
rename to Modules/Adapters/GdalAdapters/src/otbOGRFeatureWrapper.cxx
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRFieldWrapper.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.cxx
rename to Modules/Adapters/GdalAdapters/src/otbOGRFieldWrapper.cxx
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRGeometryWrapper.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRGeometryWrapper.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRGeometryWrapper.cxx
rename to Modules/Adapters/GdalAdapters/src/otbOGRGeometryWrapper.cxx
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRLayerWrapper.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
rename to Modules/Adapters/GdalAdapters/src/otbOGRLayerWrapper.cxx
diff --git a/Testing/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapperIO.cxx b/Modules/Adapters/GdalAdapters/test/otbOGRDataSourceWrapperIO.cxx
similarity index 100%
rename from Testing/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapperIO.cxx
rename to Modules/Adapters/GdalAdapters/test/otbOGRDataSourceWrapperIO.cxx
diff --git a/Testing/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapperNew.cxx b/Modules/Adapters/GdalAdapters/test/otbOGRDataSourceWrapperNew.cxx
similarity index 100%
rename from Testing/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapperNew.cxx
rename to Modules/Adapters/GdalAdapters/test/otbOGRDataSourceWrapperNew.cxx
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkFFTComplexToComplexImageFilter.h b/Modules/Adapters/ITKPendingPatches/include/itkFFTComplexToComplexImageFilter.h
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/itkFFTComplexToComplexImageFilter.h
rename to Modules/Adapters/ITKPendingPatches/include/itkFFTComplexToComplexImageFilter.h
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkFFTComplexToComplexImageFilter.hxx b/Modules/Adapters/ITKPendingPatches/include/itkFFTComplexToComplexImageFilter.hxx
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/itkFFTComplexToComplexImageFilter.hxx
rename to Modules/Adapters/ITKPendingPatches/include/itkFFTComplexToComplexImageFilter.hxx
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkFFTWComplexToComplexImageFilter.h b/Modules/Adapters/ITKPendingPatches/include/itkFFTWComplexToComplexImageFilter.h
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/itkFFTWComplexToComplexImageFilter.h
rename to Modules/Adapters/ITKPendingPatches/include/itkFFTWComplexToComplexImageFilter.h
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkFFTWComplexToComplexImageFilter.hxx b/Modules/Adapters/ITKPendingPatches/include/itkFFTWComplexToComplexImageFilter.hxx
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/itkFFTWComplexToComplexImageFilter.hxx
rename to Modules/Adapters/ITKPendingPatches/include/itkFFTWComplexToComplexImageFilter.hxx
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkImageRegionMultidimensionalSplitter.h b/Modules/Adapters/ITKPendingPatches/include/itkImageRegionMultidimensionalSplitter.h
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/itkImageRegionMultidimensionalSplitter.h
rename to Modules/Adapters/ITKPendingPatches/include/itkImageRegionMultidimensionalSplitter.h
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkImageRegionMultidimensionalSplitter.hxx b/Modules/Adapters/ITKPendingPatches/include/itkImageRegionMultidimensionalSplitter.hxx
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/itkImageRegionMultidimensionalSplitter.hxx
rename to Modules/Adapters/ITKPendingPatches/include/itkImageRegionMultidimensionalSplitter.hxx
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkImageRegionSplitter.h b/Modules/Adapters/ITKPendingPatches/include/itkImageRegionSplitter.h
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/itkImageRegionSplitter.h
rename to Modules/Adapters/ITKPendingPatches/include/itkImageRegionSplitter.h
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkImageRegionSplitter.hxx b/Modules/Adapters/ITKPendingPatches/include/itkImageRegionSplitter.hxx
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/itkImageRegionSplitter.hxx
rename to Modules/Adapters/ITKPendingPatches/include/itkImageRegionSplitter.hxx
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkTransformToDisplacementFieldSource.h b/Modules/Adapters/ITKPendingPatches/include/itkTransformToDisplacementFieldSource.h
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/itkTransformToDisplacementFieldSource.h
rename to Modules/Adapters/ITKPendingPatches/include/itkTransformToDisplacementFieldSource.h
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkTransformToDisplacementFieldSource.hxx b/Modules/Adapters/ITKPendingPatches/include/itkTransformToDisplacementFieldSource.hxx
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/itkTransformToDisplacementFieldSource.hxx
rename to Modules/Adapters/ITKPendingPatches/include/itkTransformToDisplacementFieldSource.hxx
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkUnaryFunctorImageFilter.h b/Modules/Adapters/ITKPendingPatches/include/itkUnaryFunctorImageFilter.h
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/itkUnaryFunctorImageFilter.h
rename to Modules/Adapters/ITKPendingPatches/include/itkUnaryFunctorImageFilter.h
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkUnaryFunctorImageFilter.hxx b/Modules/Adapters/ITKPendingPatches/include/itkUnaryFunctorImageFilter.hxx
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/itkUnaryFunctorImageFilter.hxx
rename to Modules/Adapters/ITKPendingPatches/include/itkUnaryFunctorImageFilter.hxx
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/otbWarpImageFilter.h b/Modules/Adapters/ITKPendingPatches/include/otbWarpImageFilter.h
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/otbWarpImageFilter.h
rename to Modules/Adapters/ITKPendingPatches/include/otbWarpImageFilter.h
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/otbWarpImageFilter.txx b/Modules/Adapters/ITKPendingPatches/include/otbWarpImageFilter.txx
similarity index 100%
rename from Code/UtilitiesAdapters/ITKPendingPatches/otbWarpImageFilter.txx
rename to Modules/Adapters/ITKPendingPatches/include/otbWarpImageFilter.txx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbDEMConvertAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbDEMConvertAdapter.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbDEMConvertAdapter.h
rename to Modules/Adapters/OSSIMAdapters/include/otbDEMConvertAdapter.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.h b/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.h
rename to Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbDateTimeAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbDateTimeAdapter.h
rename to Modules/Adapters/OSSIMAdapters/include/otbDateTimeAdapter.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbEllipsoidAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbEllipsoidAdapter.h
rename to Modules/Adapters/OSSIMAdapters/include/otbEllipsoidAdapter.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbFilterFunctionValues.h b/Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbFilterFunctionValues.h
rename to Modules/Adapters/OSSIMAdapters/include/otbFilterFunctionValues.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbGeometricSarSensorModelAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbGeometricSarSensorModelAdapter.h
rename to Modules/Adapters/OSSIMAdapters/include/otbGeometricSarSensorModelAdapter.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbImageKeywordlist.h b/Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbImageKeywordlist.h
rename to Modules/Adapters/OSSIMAdapters/include/otbImageKeywordlist.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbMapProjectionAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbMapProjectionAdapter.h
rename to Modules/Adapters/OSSIMAdapters/include/otbMapProjectionAdapter.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbMetaDataKey.h b/Modules/Adapters/OSSIMAdapters/include/otbMetaDataKey.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbMetaDataKey.h
rename to Modules/Adapters/OSSIMAdapters/include/otbMetaDataKey.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbPlatformPositionAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbPlatformPositionAdapter.h
rename to Modules/Adapters/OSSIMAdapters/include/otbPlatformPositionAdapter.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbRPCProjectionAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbRPCProjectionAdapter.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbRPCProjectionAdapter.h
rename to Modules/Adapters/OSSIMAdapters/include/otbRPCProjectionAdapter.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbRPCSolverAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbRPCSolverAdapter.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbRPCSolverAdapter.h
rename to Modules/Adapters/OSSIMAdapters/include/otbRPCSolverAdapter.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.h b/Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.h
rename to Modules/Adapters/OSSIMAdapters/include/otbSensorModelAdapter.h
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbDEMConvertAdapter.cxx b/Modules/Adapters/OSSIMAdapters/src/otbDEMConvertAdapter.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbDEMConvertAdapter.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbDEMConvertAdapter.cxx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.cxx b/Modules/Adapters/OSSIMAdapters/src/otbDEMHandler.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbDEMHandler.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbDEMHandler.cxx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbDateTimeAdapter.cxx b/Modules/Adapters/OSSIMAdapters/src/otbDateTimeAdapter.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbDateTimeAdapter.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbDateTimeAdapter.cxx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbEllipsoidAdapter.cxx b/Modules/Adapters/OSSIMAdapters/src/otbEllipsoidAdapter.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbEllipsoidAdapter.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbEllipsoidAdapter.cxx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbFilterFunctionValues.cxx b/Modules/Adapters/OSSIMAdapters/src/otbFilterFunctionValues.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbFilterFunctionValues.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbFilterFunctionValues.cxx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbGeometricSarSensorModelAdapter.cxx b/Modules/Adapters/OSSIMAdapters/src/otbGeometricSarSensorModelAdapter.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbGeometricSarSensorModelAdapter.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbGeometricSarSensorModelAdapter.cxx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbImageKeywordlist.cxx b/Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbImageKeywordlist.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbImageKeywordlist.cxx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbMapProjectionAdapter.cxx b/Modules/Adapters/OSSIMAdapters/src/otbMapProjectionAdapter.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbMapProjectionAdapter.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbMapProjectionAdapter.cxx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbMetaDataKey.cxx b/Modules/Adapters/OSSIMAdapters/src/otbMetaDataKey.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbMetaDataKey.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbMetaDataKey.cxx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbPlatformPositionAdapter.cxx b/Modules/Adapters/OSSIMAdapters/src/otbPlatformPositionAdapter.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbPlatformPositionAdapter.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbPlatformPositionAdapter.cxx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbRPCProjectionAdapter.cxx b/Modules/Adapters/OSSIMAdapters/src/otbRPCProjectionAdapter.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbRPCProjectionAdapter.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbRPCProjectionAdapter.cxx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbRPCSolverAdapter.cxx b/Modules/Adapters/OSSIMAdapters/src/otbRPCSolverAdapter.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbRPCSolverAdapter.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbRPCSolverAdapter.cxx
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.cxx b/Modules/Adapters/OSSIMAdapters/src/otbSensorModelAdapter.cxx
similarity index 100%
rename from Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.cxx
rename to Modules/Adapters/OSSIMAdapters/src/otbSensorModelAdapter.cxx
diff --git a/Testing/Code/UtilitiesAdapters/otbDEMHandlerTest.cxx b/Modules/Adapters/OSSIMAdapters/test/otbDEMHandlerTest.cxx
similarity index 100%
rename from Testing/Code/UtilitiesAdapters/otbDEMHandlerTest.cxx
rename to Modules/Adapters/OSSIMAdapters/test/otbDEMHandlerTest.cxx
diff --git a/Testing/Code/Radiometry/otbFilterFunctionValues.cxx b/Modules/Adapters/OSSIMAdapters/test/otbFilterFunctionValues.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbFilterFunctionValues.cxx
rename to Modules/Adapters/OSSIMAdapters/test/otbFilterFunctionValues.cxx
diff --git a/Testing/Code/UtilitiesAdapters/otbGeometricSarSensorModelAdapter.cxx b/Modules/Adapters/OSSIMAdapters/test/otbGeometricSarSensorModelAdapter.cxx
similarity index 100%
rename from Testing/Code/UtilitiesAdapters/otbGeometricSarSensorModelAdapter.cxx
rename to Modules/Adapters/OSSIMAdapters/test/otbGeometricSarSensorModelAdapter.cxx
diff --git a/Testing/Code/IO/otbImageKeywordlist.cxx b/Modules/Adapters/OSSIMAdapters/test/otbImageKeywordlist.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageKeywordlist.cxx
rename to Modules/Adapters/OSSIMAdapters/test/otbImageKeywordlist.cxx
diff --git a/Testing/Code/IO/otbMapProjectionAdapterTest.cxx b/Modules/Adapters/OSSIMAdapters/test/otbMapProjectionAdapterTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbMapProjectionAdapterTest.cxx
rename to Modules/Adapters/OSSIMAdapters/test/otbMapProjectionAdapterTest.cxx
diff --git a/Testing/Code/Projections/otbOssimElevManagerTest2.cxx b/Modules/Adapters/OSSIMAdapters/test/otbOssimElevManagerTest2.cxx
similarity index 100%
rename from Testing/Code/Projections/otbOssimElevManagerTest2.cxx
rename to Modules/Adapters/OSSIMAdapters/test/otbOssimElevManagerTest2.cxx
diff --git a/Testing/Code/Projections/otbOssimElevManagerTest4.cxx b/Modules/Adapters/OSSIMAdapters/test/otbOssimElevManagerTest4.cxx
similarity index 100%
rename from Testing/Code/Projections/otbOssimElevManagerTest4.cxx
rename to Modules/Adapters/OSSIMAdapters/test/otbOssimElevManagerTest4.cxx
diff --git a/Testing/Code/IO/otbOssimJpegFileRessourceLeakTest.cxx b/Modules/Adapters/OSSIMAdapters/test/otbOssimJpegFileRessourceLeakTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbOssimJpegFileRessourceLeakTest.cxx
rename to Modules/Adapters/OSSIMAdapters/test/otbOssimJpegFileRessourceLeakTest.cxx
diff --git a/Testing/Code/UtilitiesAdapters/otbPlatformPositionAdapter.cxx b/Modules/Adapters/OSSIMAdapters/test/otbPlatformPositionAdapter.cxx
similarity index 100%
rename from Testing/Code/UtilitiesAdapters/otbPlatformPositionAdapter.cxx
rename to Modules/Adapters/OSSIMAdapters/test/otbPlatformPositionAdapter.cxx
diff --git a/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx b/Modules/Adapters/OSSIMAdapters/test/otbRPCSolverAdapterTest.cxx
similarity index 100%
rename from Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx
rename to Modules/Adapters/OSSIMAdapters/test/otbRPCSolverAdapterTest.cxx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbBoostMachineLearningModel.h b/Modules/Adapters/OpenCVAdapters/include/otbBoostMachineLearningModel.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbBoostMachineLearningModel.h
rename to Modules/Adapters/OpenCVAdapters/include/otbBoostMachineLearningModel.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbBoostMachineLearningModel.txx b/Modules/Adapters/OpenCVAdapters/include/otbBoostMachineLearningModel.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbBoostMachineLearningModel.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbBoostMachineLearningModel.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbBoostMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbBoostMachineLearningModelFactory.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbBoostMachineLearningModelFactory.h
rename to Modules/Adapters/OpenCVAdapters/include/otbBoostMachineLearningModelFactory.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbBoostMachineLearningModelFactory.txx b/Modules/Adapters/OpenCVAdapters/include/otbBoostMachineLearningModelFactory.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbBoostMachineLearningModelFactory.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbBoostMachineLearningModelFactory.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbDecisionTreeMachineLearningModel.h b/Modules/Adapters/OpenCVAdapters/include/otbDecisionTreeMachineLearningModel.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbDecisionTreeMachineLearningModel.h
rename to Modules/Adapters/OpenCVAdapters/include/otbDecisionTreeMachineLearningModel.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbDecisionTreeMachineLearningModel.txx b/Modules/Adapters/OpenCVAdapters/include/otbDecisionTreeMachineLearningModel.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbDecisionTreeMachineLearningModel.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbDecisionTreeMachineLearningModel.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbDecisionTreeMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbDecisionTreeMachineLearningModelFactory.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbDecisionTreeMachineLearningModelFactory.h
rename to Modules/Adapters/OpenCVAdapters/include/otbDecisionTreeMachineLearningModelFactory.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbDecisionTreeMachineLearningModelFactory.txx b/Modules/Adapters/OpenCVAdapters/include/otbDecisionTreeMachineLearningModelFactory.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbDecisionTreeMachineLearningModelFactory.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbDecisionTreeMachineLearningModelFactory.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbGradientBoostedTreeMachineLearningModel.h b/Modules/Adapters/OpenCVAdapters/include/otbGradientBoostedTreeMachineLearningModel.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbGradientBoostedTreeMachineLearningModel.h
rename to Modules/Adapters/OpenCVAdapters/include/otbGradientBoostedTreeMachineLearningModel.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbGradientBoostedTreeMachineLearningModel.txx b/Modules/Adapters/OpenCVAdapters/include/otbGradientBoostedTreeMachineLearningModel.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbGradientBoostedTreeMachineLearningModel.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbGradientBoostedTreeMachineLearningModel.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbGradientBoostedTreeMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbGradientBoostedTreeMachineLearningModelFactory.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbGradientBoostedTreeMachineLearningModelFactory.h
rename to Modules/Adapters/OpenCVAdapters/include/otbGradientBoostedTreeMachineLearningModelFactory.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbGradientBoostedTreeMachineLearningModelFactory.txx b/Modules/Adapters/OpenCVAdapters/include/otbGradientBoostedTreeMachineLearningModelFactory.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbGradientBoostedTreeMachineLearningModelFactory.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbGradientBoostedTreeMachineLearningModelFactory.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbKNearestNeighborsMachineLearningModel.h b/Modules/Adapters/OpenCVAdapters/include/otbKNearestNeighborsMachineLearningModel.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbKNearestNeighborsMachineLearningModel.h
rename to Modules/Adapters/OpenCVAdapters/include/otbKNearestNeighborsMachineLearningModel.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbKNearestNeighborsMachineLearningModel.txx b/Modules/Adapters/OpenCVAdapters/include/otbKNearestNeighborsMachineLearningModel.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbKNearestNeighborsMachineLearningModel.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbKNearestNeighborsMachineLearningModel.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbKNearestNeighborsMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbKNearestNeighborsMachineLearningModelFactory.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbKNearestNeighborsMachineLearningModelFactory.h
rename to Modules/Adapters/OpenCVAdapters/include/otbKNearestNeighborsMachineLearningModelFactory.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbKNearestNeighborsMachineLearningModelFactory.txx b/Modules/Adapters/OpenCVAdapters/include/otbKNearestNeighborsMachineLearningModelFactory.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbKNearestNeighborsMachineLearningModelFactory.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbKNearestNeighborsMachineLearningModelFactory.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbNeuralNetworkMachineLearningModel.h b/Modules/Adapters/OpenCVAdapters/include/otbNeuralNetworkMachineLearningModel.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbNeuralNetworkMachineLearningModel.h
rename to Modules/Adapters/OpenCVAdapters/include/otbNeuralNetworkMachineLearningModel.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbNeuralNetworkMachineLearningModel.txx b/Modules/Adapters/OpenCVAdapters/include/otbNeuralNetworkMachineLearningModel.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbNeuralNetworkMachineLearningModel.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbNeuralNetworkMachineLearningModel.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbNeuralNetworkMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbNeuralNetworkMachineLearningModelFactory.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbNeuralNetworkMachineLearningModelFactory.h
rename to Modules/Adapters/OpenCVAdapters/include/otbNeuralNetworkMachineLearningModelFactory.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbNeuralNetworkMachineLearningModelFactory.txx b/Modules/Adapters/OpenCVAdapters/include/otbNeuralNetworkMachineLearningModelFactory.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbNeuralNetworkMachineLearningModelFactory.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbNeuralNetworkMachineLearningModelFactory.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbNormalBayesMachineLearningModel.h b/Modules/Adapters/OpenCVAdapters/include/otbNormalBayesMachineLearningModel.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbNormalBayesMachineLearningModel.h
rename to Modules/Adapters/OpenCVAdapters/include/otbNormalBayesMachineLearningModel.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbNormalBayesMachineLearningModel.txx b/Modules/Adapters/OpenCVAdapters/include/otbNormalBayesMachineLearningModel.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbNormalBayesMachineLearningModel.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbNormalBayesMachineLearningModel.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbNormalBayesMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbNormalBayesMachineLearningModelFactory.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbNormalBayesMachineLearningModelFactory.h
rename to Modules/Adapters/OpenCVAdapters/include/otbNormalBayesMachineLearningModelFactory.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbNormalBayesMachineLearningModelFactory.txx b/Modules/Adapters/OpenCVAdapters/include/otbNormalBayesMachineLearningModelFactory.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbNormalBayesMachineLearningModelFactory.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbNormalBayesMachineLearningModelFactory.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbOpenCVUtils.h b/Modules/Adapters/OpenCVAdapters/include/otbOpenCVUtils.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbOpenCVUtils.h
rename to Modules/Adapters/OpenCVAdapters/include/otbOpenCVUtils.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbRandomForestsMachineLearningModel.h b/Modules/Adapters/OpenCVAdapters/include/otbRandomForestsMachineLearningModel.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbRandomForestsMachineLearningModel.h
rename to Modules/Adapters/OpenCVAdapters/include/otbRandomForestsMachineLearningModel.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbRandomForestsMachineLearningModel.txx b/Modules/Adapters/OpenCVAdapters/include/otbRandomForestsMachineLearningModel.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbRandomForestsMachineLearningModel.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbRandomForestsMachineLearningModel.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbRandomForestsMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbRandomForestsMachineLearningModelFactory.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbRandomForestsMachineLearningModelFactory.h
rename to Modules/Adapters/OpenCVAdapters/include/otbRandomForestsMachineLearningModelFactory.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbRandomForestsMachineLearningModelFactory.txx b/Modules/Adapters/OpenCVAdapters/include/otbRandomForestsMachineLearningModelFactory.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbRandomForestsMachineLearningModelFactory.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbRandomForestsMachineLearningModelFactory.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbSVMMachineLearningModel.h b/Modules/Adapters/OpenCVAdapters/include/otbSVMMachineLearningModel.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbSVMMachineLearningModel.h
rename to Modules/Adapters/OpenCVAdapters/include/otbSVMMachineLearningModel.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbSVMMachineLearningModel.txx b/Modules/Adapters/OpenCVAdapters/include/otbSVMMachineLearningModel.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbSVMMachineLearningModel.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbSVMMachineLearningModel.txx
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbSVMMachineLearningModelFactory.h b/Modules/Adapters/OpenCVAdapters/include/otbSVMMachineLearningModelFactory.h
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbSVMMachineLearningModelFactory.h
rename to Modules/Adapters/OpenCVAdapters/include/otbSVMMachineLearningModelFactory.h
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbSVMMachineLearningModelFactory.txx b/Modules/Adapters/OpenCVAdapters/include/otbSVMMachineLearningModelFactory.txx
similarity index 100%
rename from Code/UtilitiesAdapters/OpenCVAdapters/otbSVMMachineLearningModelFactory.txx
rename to Modules/Adapters/OpenCVAdapters/include/otbSVMMachineLearningModelFactory.txx
diff --git a/Code/IO/otbThreads.h b/Modules/Adapters/OpenThreadsAdapters/include/otbThreads.h
similarity index 100%
rename from Code/IO/otbThreads.h
rename to Modules/Adapters/OpenThreadsAdapters/include/otbThreads.h
diff --git a/Code/IO/otbThreads.cxx b/Modules/Adapters/OpenThreadsAdapters/src/otbThreads.cxx
similarity index 100%
rename from Code/IO/otbThreads.cxx
rename to Modules/Adapters/OpenThreadsAdapters/src/otbThreads.cxx
diff --git a/Testing/Code/IO/otbThreadsTest.cxx b/Modules/Adapters/OpenThreadsAdapters/test/otbThreadsTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbThreadsTest.cxx
rename to Modules/Adapters/OpenThreadsAdapters/test/otbThreadsTest.cxx
diff --git a/Applications/ChangeDetection/otbMultivariateAlterationDetector.cxx b/Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx
similarity index 100%
rename from Applications/ChangeDetection/otbMultivariateAlterationDetector.cxx
rename to Modules/Applications/AppChangeDetection/app/otbMultivariateAlterationDetector.cxx
diff --git a/Applications/Classification/otbClassificationMapRegularization.cxx b/Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx
similarity index 100%
rename from Applications/Classification/otbClassificationMapRegularization.cxx
rename to Modules/Applications/AppClassification/app/otbClassificationMapRegularization.cxx
diff --git a/Applications/Classification/otbComputeConfusionMatrix.cxx b/Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx
similarity index 100%
rename from Applications/Classification/otbComputeConfusionMatrix.cxx
rename to Modules/Applications/AppClassification/app/otbComputeConfusionMatrix.cxx
diff --git a/Applications/Classification/otbComputeImagesStatistics.cxx b/Modules/Applications/AppClassification/app/otbComputeImagesStatistics.cxx
similarity index 100%
rename from Applications/Classification/otbComputeImagesStatistics.cxx
rename to Modules/Applications/AppClassification/app/otbComputeImagesStatistics.cxx
diff --git a/Applications/Classification/otbComputeOGRLayersFeaturesStatistics.cxx b/Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx
similarity index 100%
rename from Applications/Classification/otbComputeOGRLayersFeaturesStatistics.cxx
rename to Modules/Applications/AppClassification/app/otbComputeOGRLayersFeaturesStatistics.cxx
diff --git a/Applications/CartographicDBValidation/otbComputePolylineFeatureFromImage.cxx b/Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx
similarity index 100%
rename from Applications/CartographicDBValidation/otbComputePolylineFeatureFromImage.cxx
rename to Modules/Applications/AppClassification/app/otbComputePolylineFeatureFromImage.cxx
diff --git a/Applications/CartographicDBValidation/otbDSFuzzyModelEstimation.cxx b/Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx
similarity index 100%
rename from Applications/CartographicDBValidation/otbDSFuzzyModelEstimation.cxx
rename to Modules/Applications/AppClassification/app/otbDSFuzzyModelEstimation.cxx
diff --git a/Applications/Classification/otbFusionOfClassifications.cxx b/Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx
similarity index 100%
rename from Applications/Classification/otbFusionOfClassifications.cxx
rename to Modules/Applications/AppClassification/app/otbFusionOfClassifications.cxx
diff --git a/Applications/Classification/otbImageClassifier.cxx b/Modules/Applications/AppClassification/app/otbImageClassifier.cxx
similarity index 100%
rename from Applications/Classification/otbImageClassifier.cxx
rename to Modules/Applications/AppClassification/app/otbImageClassifier.cxx
diff --git a/Applications/Classification/otbKMeansClassification.cxx b/Modules/Applications/AppClassification/app/otbKMeansClassification.cxx
similarity index 100%
rename from Applications/Classification/otbKMeansClassification.cxx
rename to Modules/Applications/AppClassification/app/otbKMeansClassification.cxx
diff --git a/Applications/Classification/otbOGRLayerClassifier.cxx b/Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx
similarity index 100%
rename from Applications/Classification/otbOGRLayerClassifier.cxx
rename to Modules/Applications/AppClassification/app/otbOGRLayerClassifier.cxx
diff --git a/Applications/Classification/otbSOMClassification.cxx b/Modules/Applications/AppClassification/app/otbSOMClassification.cxx
similarity index 100%
rename from Applications/Classification/otbSOMClassification.cxx
rename to Modules/Applications/AppClassification/app/otbSOMClassification.cxx
diff --git a/Applications/Classification/otbTrainBoost.cxx b/Modules/Applications/AppClassification/app/otbTrainBoost.cxx
similarity index 100%
rename from Applications/Classification/otbTrainBoost.cxx
rename to Modules/Applications/AppClassification/app/otbTrainBoost.cxx
diff --git a/Applications/Classification/otbTrainDecisionTree.cxx b/Modules/Applications/AppClassification/app/otbTrainDecisionTree.cxx
similarity index 100%
rename from Applications/Classification/otbTrainDecisionTree.cxx
rename to Modules/Applications/AppClassification/app/otbTrainDecisionTree.cxx
diff --git a/Applications/Classification/otbTrainGradientBoostedTree.cxx b/Modules/Applications/AppClassification/app/otbTrainGradientBoostedTree.cxx
similarity index 100%
rename from Applications/Classification/otbTrainGradientBoostedTree.cxx
rename to Modules/Applications/AppClassification/app/otbTrainGradientBoostedTree.cxx
diff --git a/Applications/Classification/otbTrainImagesClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
similarity index 100%
rename from Applications/Classification/otbTrainImagesClassifier.cxx
rename to Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
diff --git a/Applications/Classification/otbTrainImagesClassifier.h b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.h
similarity index 100%
rename from Applications/Classification/otbTrainImagesClassifier.h
rename to Modules/Applications/AppClassification/app/otbTrainImagesClassifier.h
diff --git a/Applications/Classification/otbTrainKNN.cxx b/Modules/Applications/AppClassification/app/otbTrainKNN.cxx
similarity index 100%
rename from Applications/Classification/otbTrainKNN.cxx
rename to Modules/Applications/AppClassification/app/otbTrainKNN.cxx
diff --git a/Applications/Classification/otbTrainLibSVM.cxx b/Modules/Applications/AppClassification/app/otbTrainLibSVM.cxx
similarity index 100%
rename from Applications/Classification/otbTrainLibSVM.cxx
rename to Modules/Applications/AppClassification/app/otbTrainLibSVM.cxx
diff --git a/Applications/Classification/otbTrainNeuralNetwork.cxx b/Modules/Applications/AppClassification/app/otbTrainNeuralNetwork.cxx
similarity index 100%
rename from Applications/Classification/otbTrainNeuralNetwork.cxx
rename to Modules/Applications/AppClassification/app/otbTrainNeuralNetwork.cxx
diff --git a/Applications/Classification/otbTrainNormalBayes.cxx b/Modules/Applications/AppClassification/app/otbTrainNormalBayes.cxx
similarity index 100%
rename from Applications/Classification/otbTrainNormalBayes.cxx
rename to Modules/Applications/AppClassification/app/otbTrainNormalBayes.cxx
diff --git a/Applications/Classification/otbTrainOGRLayersClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainOGRLayersClassifier.cxx
similarity index 100%
rename from Applications/Classification/otbTrainOGRLayersClassifier.cxx
rename to Modules/Applications/AppClassification/app/otbTrainOGRLayersClassifier.cxx
diff --git a/Applications/Classification/otbTrainRandomForests.cxx b/Modules/Applications/AppClassification/app/otbTrainRandomForests.cxx
similarity index 100%
rename from Applications/Classification/otbTrainRandomForests.cxx
rename to Modules/Applications/AppClassification/app/otbTrainRandomForests.cxx
diff --git a/Applications/Classification/otbTrainSVM.cxx b/Modules/Applications/AppClassification/app/otbTrainSVM.cxx
similarity index 100%
rename from Applications/Classification/otbTrainSVM.cxx
rename to Modules/Applications/AppClassification/app/otbTrainSVM.cxx
diff --git a/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx b/Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx
similarity index 100%
rename from Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx
rename to Modules/Applications/AppClassification/app/otbVectorDataDSValidation.cxx
diff --git a/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx b/Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
similarity index 100%
rename from Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx
rename to Modules/Applications/AppDescriptors/app/otbHomologousPointsExtraction.cxx
diff --git a/Applications/FeatureExtraction/otbDimensionalityReduction.cxx b/Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx
similarity index 100%
rename from Applications/FeatureExtraction/otbDimensionalityReduction.cxx
rename to Modules/Applications/AppDimensionalityReduction/app/otbDimensionalityReduction.cxx
diff --git a/Applications/FeatureExtraction/otbEdgeExtraction.cxx b/Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx
similarity index 100%
rename from Applications/FeatureExtraction/otbEdgeExtraction.cxx
rename to Modules/Applications/AppEdge/app/otbEdgeExtraction.cxx
diff --git a/Applications/FeatureExtraction/otbLineSegmentDetection.cxx b/Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx
similarity index 100%
rename from Applications/FeatureExtraction/otbLineSegmentDetection.cxx
rename to Modules/Applications/AppEdge/app/otbLineSegmentDetection.cxx
diff --git a/Applications/Filtering/otbDespeckle.cxx b/Modules/Applications/AppFiltering/app/otbDespeckle.cxx
similarity index 100%
rename from Applications/Filtering/otbDespeckle.cxx
rename to Modules/Applications/AppFiltering/app/otbDespeckle.cxx
diff --git a/Applications/Filtering/otbSmoothing.cxx b/Modules/Applications/AppFiltering/app/otbSmoothing.cxx
similarity index 100%
rename from Applications/Filtering/otbSmoothing.cxx
rename to Modules/Applications/AppFiltering/app/otbSmoothing.cxx
diff --git a/Applications/Projections/otbBundleToPerfectSensor.cxx b/Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx
similarity index 100%
rename from Applications/Projections/otbBundleToPerfectSensor.cxx
rename to Modules/Applications/AppFusion/app/otbBundleToPerfectSensor.cxx
diff --git a/Applications/Fusion/otbPansharpening.cxx b/Modules/Applications/AppFusion/app/otbPansharpening.cxx
similarity index 100%
rename from Applications/Fusion/otbPansharpening.cxx
rename to Modules/Applications/AppFusion/app/otbPansharpening.cxx
diff --git a/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx b/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx
similarity index 100%
rename from Applications/Hyperspectral/otbHyperspectralUnmixing.cxx
rename to Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx
diff --git a/Applications/Hyperspectral/otbVertexComponentAnalysis.cxx b/Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx
similarity index 100%
rename from Applications/Hyperspectral/otbVertexComponentAnalysis.cxx
rename to Modules/Applications/AppHyperspectral/app/otbVertexComponentAnalysis.cxx
diff --git a/Applications/Utils/otbBandMath.cxx b/Modules/Applications/AppImageUtils/app/otbBandMath.cxx
similarity index 100%
rename from Applications/Utils/otbBandMath.cxx
rename to Modules/Applications/AppImageUtils/app/otbBandMath.cxx
diff --git a/Applications/Utils/otbBandMathX.cxx b/Modules/Applications/AppImageUtils/app/otbBandMathX.cxx
similarity index 100%
rename from Applications/Utils/otbBandMathX.cxx
rename to Modules/Applications/AppImageUtils/app/otbBandMathX.cxx
diff --git a/Applications/Utils/otbColorMapping.cxx b/Modules/Applications/AppImageUtils/app/otbColorMapping.cxx
similarity index 100%
rename from Applications/Utils/otbColorMapping.cxx
rename to Modules/Applications/AppImageUtils/app/otbColorMapping.cxx
diff --git a/Applications/Utils/otbCompareImages.cxx b/Modules/Applications/AppImageUtils/app/otbCompareImages.cxx
similarity index 100%
rename from Applications/Utils/otbCompareImages.cxx
rename to Modules/Applications/AppImageUtils/app/otbCompareImages.cxx
diff --git a/Applications/Utils/otbConcatenateImages.cxx b/Modules/Applications/AppImageUtils/app/otbConcatenateImages.cxx
similarity index 100%
rename from Applications/Utils/otbConcatenateImages.cxx
rename to Modules/Applications/AppImageUtils/app/otbConcatenateImages.cxx
diff --git a/Applications/Utils/otbConvert.cxx b/Modules/Applications/AppImageUtils/app/otbConvert.cxx
similarity index 100%
rename from Applications/Utils/otbConvert.cxx
rename to Modules/Applications/AppImageUtils/app/otbConvert.cxx
diff --git a/Applications/Utils/otbDEMConvert.cxx b/Modules/Applications/AppImageUtils/app/otbDEMConvert.cxx
similarity index 100%
rename from Applications/Utils/otbDEMConvert.cxx
rename to Modules/Applications/AppImageUtils/app/otbDEMConvert.cxx
diff --git a/Applications/Utils/otbDownloadSRTMTiles.cxx b/Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx
similarity index 100%
rename from Applications/Utils/otbDownloadSRTMTiles.cxx
rename to Modules/Applications/AppImageUtils/app/otbDownloadSRTMTiles.cxx
diff --git a/Applications/Utils/otbExtractROI.cxx b/Modules/Applications/AppImageUtils/app/otbExtractROI.cxx
similarity index 100%
rename from Applications/Utils/otbExtractROI.cxx
rename to Modules/Applications/AppImageUtils/app/otbExtractROI.cxx
diff --git a/Applications/Utils/otbKmzExport.cxx b/Modules/Applications/AppImageUtils/app/otbKmzExport.cxx
similarity index 100%
rename from Applications/Utils/otbKmzExport.cxx
rename to Modules/Applications/AppImageUtils/app/otbKmzExport.cxx
diff --git a/Applications/Utils/otbMultiResolutionPyramid.cxx b/Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx
similarity index 100%
rename from Applications/Utils/otbMultiResolutionPyramid.cxx
rename to Modules/Applications/AppImageUtils/app/otbMultiResolutionPyramid.cxx
diff --git a/Applications/Utils/otbPixelValue.cxx b/Modules/Applications/AppImageUtils/app/otbPixelValue.cxx
similarity index 100%
rename from Applications/Utils/otbPixelValue.cxx
rename to Modules/Applications/AppImageUtils/app/otbPixelValue.cxx
diff --git a/Applications/Utils/otbQuicklook.cxx b/Modules/Applications/AppImageUtils/app/otbQuicklook.cxx
similarity index 100%
rename from Applications/Utils/otbQuicklook.cxx
rename to Modules/Applications/AppImageUtils/app/otbQuicklook.cxx
diff --git a/Applications/Utils/otbReadImageInfo.cxx b/Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx
similarity index 100%
rename from Applications/Utils/otbReadImageInfo.cxx
rename to Modules/Applications/AppImageUtils/app/otbReadImageInfo.cxx
diff --git a/Applications/Utils/otbRescale.cxx b/Modules/Applications/AppImageUtils/app/otbRescale.cxx
similarity index 100%
rename from Applications/Utils/otbRescale.cxx
rename to Modules/Applications/AppImageUtils/app/otbRescale.cxx
diff --git a/Applications/Utils/otbSplitImage.cxx b/Modules/Applications/AppImageUtils/app/otbSplitImage.cxx
similarity index 100%
rename from Applications/Utils/otbSplitImage.cxx
rename to Modules/Applications/AppImageUtils/app/otbSplitImage.cxx
diff --git a/Applications/Utils/otbTileFusion.cxx b/Modules/Applications/AppImageUtils/app/otbTileFusion.cxx
similarity index 100%
rename from Applications/Utils/otbTileFusion.cxx
rename to Modules/Applications/AppImageUtils/app/otbTileFusion.cxx
diff --git a/Applications/FeatureExtraction/otbRadiometricIndices.cxx b/Modules/Applications/AppIndices/app/otbRadiometricIndices.cxx
similarity index 100%
rename from Applications/FeatureExtraction/otbRadiometricIndices.cxx
rename to Modules/Applications/AppIndices/app/otbRadiometricIndices.cxx
diff --git a/Applications/FeatureExtraction/otbLocalStatisticExtraction.cxx b/Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx
similarity index 100%
rename from Applications/FeatureExtraction/otbLocalStatisticExtraction.cxx
rename to Modules/Applications/AppMoments/app/otbLocalStatisticExtraction.cxx
diff --git a/Applications/FeatureExtraction/otbBinaryMorphologicalOperation.cxx b/Modules/Applications/AppMorphology/app/otbBinaryMorphologicalOperation.cxx
similarity index 100%
rename from Applications/FeatureExtraction/otbBinaryMorphologicalOperation.cxx
rename to Modules/Applications/AppMorphology/app/otbBinaryMorphologicalOperation.cxx
diff --git a/Applications/FeatureExtraction/otbGrayScaleMorphologicalOperation.cxx b/Modules/Applications/AppMorphology/app/otbGrayScaleMorphologicalOperation.cxx
similarity index 100%
rename from Applications/FeatureExtraction/otbGrayScaleMorphologicalOperation.cxx
rename to Modules/Applications/AppMorphology/app/otbGrayScaleMorphologicalOperation.cxx
diff --git a/Applications/Radiometry/otbOpticalCalibration.cxx b/Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
similarity index 100%
rename from Applications/Radiometry/otbOpticalCalibration.cxx
rename to Modules/Applications/AppOpticalCalibration/app/otbOpticalCalibration.cxx
diff --git a/Applications/Projections/otbConvertCartoToGeoPoint.cxx b/Modules/Applications/AppProjection/app/otbConvertCartoToGeoPoint.cxx
similarity index 100%
rename from Applications/Projections/otbConvertCartoToGeoPoint.cxx
rename to Modules/Applications/AppProjection/app/otbConvertCartoToGeoPoint.cxx
diff --git a/Applications/Projections/otbConvertSensorToGeoPoint.cxx b/Modules/Applications/AppProjection/app/otbConvertSensorToGeoPoint.cxx
similarity index 100%
rename from Applications/Projections/otbConvertSensorToGeoPoint.cxx
rename to Modules/Applications/AppProjection/app/otbConvertSensorToGeoPoint.cxx
diff --git a/Applications/Projections/otbGenerateRPCSensorModel.cxx b/Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx
similarity index 100%
rename from Applications/Projections/otbGenerateRPCSensorModel.cxx
rename to Modules/Applications/AppProjection/app/otbGenerateRPCSensorModel.cxx
diff --git a/Applications/Projections/otbGridBasedImageResampling.cxx b/Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
similarity index 100%
rename from Applications/Projections/otbGridBasedImageResampling.cxx
rename to Modules/Applications/AppProjection/app/otbGridBasedImageResampling.cxx
diff --git a/Applications/Projections/otbImageEnvelope.cxx b/Modules/Applications/AppProjection/app/otbImageEnvelope.cxx
similarity index 100%
rename from Applications/Projections/otbImageEnvelope.cxx
rename to Modules/Applications/AppProjection/app/otbImageEnvelope.cxx
diff --git a/Applications/Projections/otbObtainUTMZoneFromGeoPoint.cxx b/Modules/Applications/AppProjection/app/otbObtainUTMZoneFromGeoPoint.cxx
similarity index 100%
rename from Applications/Projections/otbObtainUTMZoneFromGeoPoint.cxx
rename to Modules/Applications/AppProjection/app/otbObtainUTMZoneFromGeoPoint.cxx
diff --git a/Applications/Projections/otbOrthoRectification.cxx b/Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
similarity index 100%
rename from Applications/Projections/otbOrthoRectification.cxx
rename to Modules/Applications/AppProjection/app/otbOrthoRectification.cxx
diff --git a/Applications/Projections/otbRefineSensorModel.cxx b/Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx
similarity index 100%
rename from Applications/Projections/otbRefineSensorModel.cxx
rename to Modules/Applications/AppProjection/app/otbRefineSensorModel.cxx
diff --git a/Applications/Projections/otbRigidTransformResample.cxx b/Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx
similarity index 100%
rename from Applications/Projections/otbRigidTransformResample.cxx
rename to Modules/Applications/AppProjection/app/otbRigidTransformResample.cxx
diff --git a/Applications/Projections/otbSuperimpose.cxx b/Modules/Applications/AppProjection/app/otbSuperimpose.cxx
similarity index 100%
rename from Applications/Projections/otbSuperimpose.cxx
rename to Modules/Applications/AppProjection/app/otbSuperimpose.cxx
diff --git a/Applications/Projections/otbVectorDataReprojection.cxx b/Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx
similarity index 100%
rename from Applications/Projections/otbVectorDataReprojection.cxx
rename to Modules/Applications/AppProjection/app/otbVectorDataReprojection.cxx
diff --git a/Applications/Radiometry/otbSarRadiometricCalibration.cxx b/Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx
similarity index 100%
rename from Applications/Radiometry/otbSarRadiometricCalibration.cxx
rename to Modules/Applications/AppSARCalibration/app/otbSarRadiometricCalibration.cxx
diff --git a/Applications/Segmentation/otbConnectedComponentSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx
similarity index 100%
rename from Applications/Segmentation/otbConnectedComponentSegmentation.cxx
rename to Modules/Applications/AppSegmentation/app/otbConnectedComponentSegmentation.cxx
diff --git a/Applications/Segmentation/otbHooverCompareSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbHooverCompareSegmentation.cxx
similarity index 100%
rename from Applications/Segmentation/otbHooverCompareSegmentation.cxx
rename to Modules/Applications/AppSegmentation/app/otbHooverCompareSegmentation.cxx
diff --git a/Applications/Segmentation/otbLSMSSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
similarity index 100%
rename from Applications/Segmentation/otbLSMSSegmentation.cxx
rename to Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
diff --git a/Applications/Segmentation/otbLSMSSmallRegionsMerging.cxx b/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx
similarity index 100%
rename from Applications/Segmentation/otbLSMSSmallRegionsMerging.cxx
rename to Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx
diff --git a/Applications/Segmentation/otbLSMSVectorization.cxx b/Modules/Applications/AppSegmentation/app/otbLSMSVectorization.cxx
similarity index 100%
rename from Applications/Segmentation/otbLSMSVectorization.cxx
rename to Modules/Applications/AppSegmentation/app/otbLSMSVectorization.cxx
diff --git a/Applications/Segmentation/otbMeanShiftSmoothing.cxx b/Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx
similarity index 100%
rename from Applications/Segmentation/otbMeanShiftSmoothing.cxx
rename to Modules/Applications/AppSegmentation/app/otbMeanShiftSmoothing.cxx
diff --git a/Applications/Segmentation/otbSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbSegmentation.cxx
similarity index 100%
rename from Applications/Segmentation/otbSegmentation.cxx
rename to Modules/Applications/AppSegmentation/app/otbSegmentation.cxx
diff --git a/Applications/DisparityMap/otbBlockMatching.cxx b/Modules/Applications/AppStereo/app/otbBlockMatching.cxx
similarity index 100%
rename from Applications/DisparityMap/otbBlockMatching.cxx
rename to Modules/Applications/AppStereo/app/otbBlockMatching.cxx
diff --git a/Applications/DisparityMap/otbDisparityMapToElevationMap.cxx b/Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx
similarity index 100%
rename from Applications/DisparityMap/otbDisparityMapToElevationMap.cxx
rename to Modules/Applications/AppStereo/app/otbDisparityMapToElevationMap.cxx
diff --git a/Applications/DisparityMap/otbFineRegistration.cxx b/Modules/Applications/AppStereo/app/otbFineRegistration.cxx
similarity index 100%
rename from Applications/DisparityMap/otbFineRegistration.cxx
rename to Modules/Applications/AppStereo/app/otbFineRegistration.cxx
diff --git a/Applications/DisparityMap/otbGeneratePlyFile.cxx b/Modules/Applications/AppStereo/app/otbGeneratePlyFile.cxx
similarity index 100%
rename from Applications/DisparityMap/otbGeneratePlyFile.cxx
rename to Modules/Applications/AppStereo/app/otbGeneratePlyFile.cxx
diff --git a/Applications/DisparityMap/otbStereoFramework.cxx b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
similarity index 100%
rename from Applications/DisparityMap/otbStereoFramework.cxx
rename to Modules/Applications/AppStereo/app/otbStereoFramework.cxx
diff --git a/Applications/DisparityMap/otbStereoRectificationGridGenerator.cxx b/Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx
similarity index 100%
rename from Applications/DisparityMap/otbStereoRectificationGridGenerator.cxx
rename to Modules/Applications/AppStereo/app/otbStereoRectificationGridGenerator.cxx
diff --git a/Applications/Test/otbTestApplication.cxx b/Modules/Applications/AppTest/app/otbTestApplication.cxx
similarity index 100%
rename from Applications/Test/otbTestApplication.cxx
rename to Modules/Applications/AppTest/app/otbTestApplication.cxx
diff --git a/Applications/FeatureExtraction/otbHaralickTextureExtraction.cxx b/Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx
similarity index 100%
rename from Applications/FeatureExtraction/otbHaralickTextureExtraction.cxx
rename to Modules/Applications/AppTextures/app/otbHaralickTextureExtraction.cxx
diff --git a/Applications/FeatureExtraction/otbSFSTextureExtraction.cxx b/Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx
similarity index 100%
rename from Applications/FeatureExtraction/otbSFSTextureExtraction.cxx
rename to Modules/Applications/AppTextures/app/otbSFSTextureExtraction.cxx
diff --git a/Applications/Rasterization/otbRasterization.cxx b/Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
similarity index 100%
rename from Applications/Rasterization/otbRasterization.cxx
rename to Modules/Applications/AppVectorDataTranslation/app/otbRasterization.cxx
diff --git a/Applications/Utils/otbConcatenateVectorData.cxx b/Modules/Applications/AppVectorUtils/app/otbConcatenateVectorData.cxx
similarity index 100%
rename from Applications/Utils/otbConcatenateVectorData.cxx
rename to Modules/Applications/AppVectorUtils/app/otbConcatenateVectorData.cxx
diff --git a/Applications/Utils/otbOSMDownloader.cxx b/Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx
similarity index 100%
rename from Applications/Utils/otbOSMDownloader.cxx
rename to Modules/Applications/AppVectorUtils/app/otbOSMDownloader.cxx
diff --git a/Applications/Utils/otbVectorDataExtractROI.cxx b/Modules/Applications/AppVectorUtils/app/otbVectorDataExtractROI.cxx
similarity index 100%
rename from Applications/Utils/otbVectorDataExtractROI.cxx
rename to Modules/Applications/AppVectorUtils/app/otbVectorDataExtractROI.cxx
diff --git a/Applications/Utils/otbVectorDataSetField.cxx b/Modules/Applications/AppVectorUtils/app/otbVectorDataSetField.cxx
similarity index 100%
rename from Applications/Utils/otbVectorDataSetField.cxx
rename to Modules/Applications/AppVectorUtils/app/otbVectorDataSetField.cxx
diff --git a/Applications/Utils/otbVectorDataTransform.cxx b/Modules/Applications/AppVectorUtils/app/otbVectorDataTransform.cxx
similarity index 100%
rename from Applications/Utils/otbVectorDataTransform.cxx
rename to Modules/Applications/AppVectorUtils/app/otbVectorDataTransform.cxx
diff --git a/Code/BasicFilters/otbChannelSelectorFunctor.h b/Modules/Core/Common/include/otbChannelSelectorFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbChannelSelectorFunctor.h
rename to Modules/Core/Common/include/otbChannelSelectorFunctor.h
diff --git a/Code/Common/otbCommandLineArgumentParser.h b/Modules/Core/Common/include/otbCommandLineArgumentParser.h
similarity index 100%
rename from Code/Common/otbCommandLineArgumentParser.h
rename to Modules/Core/Common/include/otbCommandLineArgumentParser.h
diff --git a/Code/ChangeDetection/otbCommandProgressUpdate.h b/Modules/Core/Common/include/otbCommandProgressUpdate.h
similarity index 100%
rename from Code/ChangeDetection/otbCommandProgressUpdate.h
rename to Modules/Core/Common/include/otbCommandProgressUpdate.h
diff --git a/Code/ChangeDetection/otbCommandProgressUpdate.txx b/Modules/Core/Common/include/otbCommandProgressUpdate.txx
similarity index 100%
rename from Code/ChangeDetection/otbCommandProgressUpdate.txx
rename to Modules/Core/Common/include/otbCommandProgressUpdate.txx
diff --git a/Code/BasicFilters/otbComplexToIntensityImageFilter.h b/Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbComplexToIntensityImageFilter.h
rename to Modules/Core/Common/include/otbComplexToIntensityImageFilter.h
diff --git a/Code/BasicFilters/otbComplexToVectorImageCastFilter.h b/Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h
similarity index 100%
rename from Code/BasicFilters/otbComplexToVectorImageCastFilter.h
rename to Modules/Core/Common/include/otbComplexToVectorImageCastFilter.h
diff --git a/Code/Common/otbConfigurationFile.h b/Modules/Core/Common/include/otbConfigurationFile.h
similarity index 100%
rename from Code/Common/otbConfigurationFile.h
rename to Modules/Core/Common/include/otbConfigurationFile.h
diff --git a/Code/BasicFilters/otbDecimateImageFilter.h b/Modules/Core/Common/include/otbDecimateImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbDecimateImageFilter.h
rename to Modules/Core/Common/include/otbDecimateImageFilter.h
diff --git a/Code/BasicFilters/otbDecimateImageFilter.txx b/Modules/Core/Common/include/otbDecimateImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbDecimateImageFilter.txx
rename to Modules/Core/Common/include/otbDecimateImageFilter.txx
diff --git a/Code/BasicFilters/otbDotProductImageFilter.h b/Modules/Core/Common/include/otbDotProductImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbDotProductImageFilter.h
rename to Modules/Core/Common/include/otbDotProductImageFilter.h
diff --git a/Code/BasicFilters/otbDotProductImageFilter.txx b/Modules/Core/Common/include/otbDotProductImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbDotProductImageFilter.txx
rename to Modules/Core/Common/include/otbDotProductImageFilter.txx
diff --git a/Code/Common/otbFilterWatcherBase.h b/Modules/Core/Common/include/otbFilterWatcherBase.h
similarity index 100%
rename from Code/Common/otbFilterWatcherBase.h
rename to Modules/Core/Common/include/otbFilterWatcherBase.h
diff --git a/Code/BasicFilters/otbFunctionToImageFilter.h b/Modules/Core/Common/include/otbFunctionToImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbFunctionToImageFilter.h
rename to Modules/Core/Common/include/otbFunctionToImageFilter.h
diff --git a/Code/BasicFilters/otbFunctionToImageFilter.txx b/Modules/Core/Common/include/otbFunctionToImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbFunctionToImageFilter.txx
rename to Modules/Core/Common/include/otbFunctionToImageFilter.txx
diff --git a/Code/BasicFilters/otbImageAndVectorImageOperationFilter.h b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
similarity index 100%
rename from Code/BasicFilters/otbImageAndVectorImageOperationFilter.h
rename to Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
diff --git a/Code/BasicFilters/otbImageAndVectorImageOperationFilter.txx b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbImageAndVectorImageOperationFilter.txx
rename to Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.txx
diff --git a/Code/Common/otbImageRegionAdaptativeSplitter.h b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
similarity index 100%
rename from Code/Common/otbImageRegionAdaptativeSplitter.h
rename to Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
diff --git a/Code/Common/otbImageRegionAdaptativeSplitter.txx b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.txx
similarity index 100%
rename from Code/Common/otbImageRegionAdaptativeSplitter.txx
rename to Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.txx
diff --git a/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.h b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
similarity index 100%
rename from Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.h
rename to Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
diff --git a/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.txx b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.txx
similarity index 100%
rename from Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.txx
rename to Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.txx
diff --git a/Code/Common/otbImageRegionSquareTileSplitter.h b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
similarity index 100%
rename from Code/Common/otbImageRegionSquareTileSplitter.h
rename to Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
diff --git a/Code/Common/otbImageRegionSquareTileSplitter.txx b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.txx
similarity index 100%
rename from Code/Common/otbImageRegionSquareTileSplitter.txx
rename to Modules/Core/Common/include/otbImageRegionSquareTileSplitter.txx
diff --git a/Code/Common/otbImageRegionTileMapSplitter.h b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
similarity index 100%
rename from Code/Common/otbImageRegionTileMapSplitter.h
rename to Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
diff --git a/Code/Common/otbImageRegionTileMapSplitter.txx b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.txx
similarity index 100%
rename from Code/Common/otbImageRegionTileMapSplitter.txx
rename to Modules/Core/Common/include/otbImageRegionTileMapSplitter.txx
diff --git a/Code/FeatureExtraction/otbImageToModulusAndDirectionImageFilter.h b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbImageToModulusAndDirectionImageFilter.h
rename to Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
diff --git a/Code/FeatureExtraction/otbImageToModulusAndDirectionImageFilter.txx b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbImageToModulusAndDirectionImageFilter.txx
rename to Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.txx
diff --git a/Code/BasicFilters/otbImaginaryImageToComplexImageFilter.h b/Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbImaginaryImageToComplexImageFilter.h
rename to Modules/Core/Common/include/otbImaginaryImageToComplexImageFilter.h
diff --git a/Code/BasicFilters/otbImportImageFilter.h b/Modules/Core/Common/include/otbImportImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbImportImageFilter.h
rename to Modules/Core/Common/include/otbImportImageFilter.h
diff --git a/Code/BasicFilters/otbImportImageFilter.txx b/Modules/Core/Common/include/otbImportImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbImportImageFilter.txx
rename to Modules/Core/Common/include/otbImportImageFilter.txx
diff --git a/Code/BasicFilters/otbImportVectorImageFilter.h b/Modules/Core/Common/include/otbImportVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbImportVectorImageFilter.h
rename to Modules/Core/Common/include/otbImportVectorImageFilter.h
diff --git a/Code/BasicFilters/otbImportVectorImageFilter.txx b/Modules/Core/Common/include/otbImportVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbImportVectorImageFilter.txx
rename to Modules/Core/Common/include/otbImportVectorImageFilter.txx
diff --git a/Code/Learning/otbMachineLearningModel.h b/Modules/Core/Common/include/otbMachineLearningModel.h
similarity index 100%
rename from Code/Learning/otbMachineLearningModel.h
rename to Modules/Core/Common/include/otbMachineLearningModel.h
diff --git a/Code/Learning/otbMachineLearningModel.txx b/Modules/Core/Common/include/otbMachineLearningModel.txx
similarity index 100%
rename from Code/Learning/otbMachineLearningModel.txx
rename to Modules/Core/Common/include/otbMachineLearningModel.txx
diff --git a/Code/Learning/otbMachineLearningUtils.h b/Modules/Core/Common/include/otbMachineLearningUtils.h
similarity index 100%
rename from Code/Learning/otbMachineLearningUtils.h
rename to Modules/Core/Common/include/otbMachineLearningUtils.h
diff --git a/Code/Common/otbMacro.h b/Modules/Core/Common/include/otbMacro.h
similarity index 100%
rename from Code/Common/otbMacro.h
rename to Modules/Core/Common/include/otbMacro.h
diff --git a/Code/Common/otbMath.h b/Modules/Core/Common/include/otbMath.h
similarity index 100%
rename from Code/Common/otbMath.h
rename to Modules/Core/Common/include/otbMath.h
diff --git a/Code/Learning/otbModelComponentBase.h b/Modules/Core/Common/include/otbModelComponentBase.h
similarity index 100%
rename from Code/Learning/otbModelComponentBase.h
rename to Modules/Core/Common/include/otbModelComponentBase.h
diff --git a/Code/Learning/otbModelComponentBase.txx b/Modules/Core/Common/include/otbModelComponentBase.txx
similarity index 100%
rename from Code/Learning/otbModelComponentBase.txx
rename to Modules/Core/Common/include/otbModelComponentBase.txx
diff --git a/Code/BasicFilters/otbQuaternaryFunctorImageFilter.h b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbQuaternaryFunctorImageFilter.h
rename to Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
diff --git a/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx
rename to Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.txx
diff --git a/Code/Common/otbRGBAPixelConverter.h b/Modules/Core/Common/include/otbRGBAPixelConverter.h
similarity index 100%
rename from Code/Common/otbRGBAPixelConverter.h
rename to Modules/Core/Common/include/otbRGBAPixelConverter.h
diff --git a/Code/Common/otbRGBAPixelConverter.txx b/Modules/Core/Common/include/otbRGBAPixelConverter.txx
similarity index 100%
rename from Code/Common/otbRGBAPixelConverter.txx
rename to Modules/Core/Common/include/otbRGBAPixelConverter.txx
diff --git a/Code/Common/otbRectangle.h b/Modules/Core/Common/include/otbRectangle.h
similarity index 100%
rename from Code/Common/otbRectangle.h
rename to Modules/Core/Common/include/otbRectangle.h
diff --git a/Code/Common/otbRectangle.txx b/Modules/Core/Common/include/otbRectangle.txx
similarity index 100%
rename from Code/Common/otbRectangle.txx
rename to Modules/Core/Common/include/otbRectangle.txx
diff --git a/Code/Common/otbStandardFilterWatcher.h b/Modules/Core/Common/include/otbStandardFilterWatcher.h
similarity index 100%
rename from Code/Common/otbStandardFilterWatcher.h
rename to Modules/Core/Common/include/otbStandardFilterWatcher.h
diff --git a/Code/Common/otbStandardOneLineFilterWatcher.h b/Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
similarity index 100%
rename from Code/Common/otbStandardOneLineFilterWatcher.h
rename to Modules/Core/Common/include/otbStandardOneLineFilterWatcher.h
diff --git a/Code/Common/otbStandardWriterWatcher.h b/Modules/Core/Common/include/otbStandardWriterWatcher.h
similarity index 100%
rename from Code/Common/otbStandardWriterWatcher.h
rename to Modules/Core/Common/include/otbStandardWriterWatcher.h
diff --git a/Code/Common/otbSubsampledImageRegionConstIterator.h b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
similarity index 100%
rename from Code/Common/otbSubsampledImageRegionConstIterator.h
rename to Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
diff --git a/Code/Common/otbSubsampledImageRegionConstIterator.txx b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.txx
similarity index 100%
rename from Code/Common/otbSubsampledImageRegionConstIterator.txx
rename to Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.txx
diff --git a/Code/Common/otbSubsampledImageRegionIterator.h b/Modules/Core/Common/include/otbSubsampledImageRegionIterator.h
similarity index 100%
rename from Code/Common/otbSubsampledImageRegionIterator.h
rename to Modules/Core/Common/include/otbSubsampledImageRegionIterator.h
diff --git a/Code/Common/otbSystem.h b/Modules/Core/Common/include/otbSystem.h
similarity index 100%
rename from Code/Common/otbSystem.h
rename to Modules/Core/Common/include/otbSystem.h
diff --git a/Code/BasicFilters/otbUnaryFunctorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbUnaryFunctorImageFilter.h
rename to Modules/Core/Common/include/otbUnaryFunctorImageFilter.h
diff --git a/Code/BasicFilters/otbUnaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbUnaryFunctorNeighborhoodVectorImageFilter.h
rename to Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
diff --git a/Code/BasicFilters/otbUnaryFunctorNeighborhoodVectorImageFilter.txx b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbUnaryFunctorNeighborhoodVectorImageFilter.txx
rename to Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbUnaryFunctorVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbUnaryFunctorVectorImageFilter.h
rename to Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
diff --git a/Code/BasicFilters/otbUnaryFunctorVectorImageFilter.txx b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbUnaryFunctorVectorImageFilter.txx
rename to Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
rename to Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
diff --git a/Code/BasicFilters/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.txx b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.txx
rename to Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.txx
diff --git a/Code/BasicFilters/otbUniformAlphaBlendingFunctor.h b/Modules/Core/Common/include/otbUniformAlphaBlendingFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbUniformAlphaBlendingFunctor.h
rename to Modules/Core/Common/include/otbUniformAlphaBlendingFunctor.h
diff --git a/Code/Common/otbUtils.h b/Modules/Core/Common/include/otbUtils.h
similarity index 100%
rename from Code/Common/otbUtils.h
rename to Modules/Core/Common/include/otbUtils.h
diff --git a/Code/Common/otbVariableLengthVectorConverter.h b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
similarity index 100%
rename from Code/Common/otbVariableLengthVectorConverter.h
rename to Modules/Core/Common/include/otbVariableLengthVectorConverter.h
diff --git a/Code/Common/otbVariableLengthVectorConverter.txx b/Modules/Core/Common/include/otbVariableLengthVectorConverter.txx
similarity index 100%
rename from Code/Common/otbVariableLengthVectorConverter.txx
rename to Modules/Core/Common/include/otbVariableLengthVectorConverter.txx
diff --git a/Code/Common/otbVectorImageToASImageAdaptor.h b/Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h
similarity index 100%
rename from Code/Common/otbVectorImageToASImageAdaptor.h
rename to Modules/Core/Common/include/otbVectorImageToASImageAdaptor.h
diff --git a/Code/Common/otbVectorImageToASPixelAccessor.h b/Modules/Core/Common/include/otbVectorImageToASPixelAccessor.h
similarity index 100%
rename from Code/Common/otbVectorImageToASPixelAccessor.h
rename to Modules/Core/Common/include/otbVectorImageToASPixelAccessor.h
diff --git a/Code/Common/otbWriterWatcherBase.h b/Modules/Core/Common/include/otbWriterWatcherBase.h
similarity index 100%
rename from Code/Common/otbWriterWatcherBase.h
rename to Modules/Core/Common/include/otbWriterWatcherBase.h
diff --git a/Code/Common/otbCommandLineArgumentParser.cxx b/Modules/Core/Common/src/otbCommandLineArgumentParser.cxx
similarity index 100%
rename from Code/Common/otbCommandLineArgumentParser.cxx
rename to Modules/Core/Common/src/otbCommandLineArgumentParser.cxx
diff --git a/Code/Common/otbConfigurationFile.cxx b/Modules/Core/Common/src/otbConfigurationFile.cxx
similarity index 100%
rename from Code/Common/otbConfigurationFile.cxx
rename to Modules/Core/Common/src/otbConfigurationFile.cxx
diff --git a/Code/Common/otbFilterWatcherBase.cxx b/Modules/Core/Common/src/otbFilterWatcherBase.cxx
similarity index 100%
rename from Code/Common/otbFilterWatcherBase.cxx
rename to Modules/Core/Common/src/otbFilterWatcherBase.cxx
diff --git a/Code/Learning/otbMachineLearningUtils.cxx b/Modules/Core/Common/src/otbMachineLearningUtils.cxx
similarity index 100%
rename from Code/Learning/otbMachineLearningUtils.cxx
rename to Modules/Core/Common/src/otbMachineLearningUtils.cxx
diff --git a/Code/Common/otbStandardFilterWatcher.cxx b/Modules/Core/Common/src/otbStandardFilterWatcher.cxx
similarity index 100%
rename from Code/Common/otbStandardFilterWatcher.cxx
rename to Modules/Core/Common/src/otbStandardFilterWatcher.cxx
diff --git a/Code/Common/otbStandardOneLineFilterWatcher.cxx b/Modules/Core/Common/src/otbStandardOneLineFilterWatcher.cxx
similarity index 100%
rename from Code/Common/otbStandardOneLineFilterWatcher.cxx
rename to Modules/Core/Common/src/otbStandardOneLineFilterWatcher.cxx
diff --git a/Code/Common/otbStandardWriterWatcher.cxx b/Modules/Core/Common/src/otbStandardWriterWatcher.cxx
similarity index 100%
rename from Code/Common/otbStandardWriterWatcher.cxx
rename to Modules/Core/Common/src/otbStandardWriterWatcher.cxx
diff --git a/Code/Common/otbSystem.cxx b/Modules/Core/Common/src/otbSystem.cxx
similarity index 100%
rename from Code/Common/otbSystem.cxx
rename to Modules/Core/Common/src/otbSystem.cxx
diff --git a/Code/Common/otbUtils.cxx b/Modules/Core/Common/src/otbUtils.cxx
similarity index 100%
rename from Code/Common/otbUtils.cxx
rename to Modules/Core/Common/src/otbUtils.cxx
diff --git a/Code/Common/otbWriterWatcherBase.cxx b/Modules/Core/Common/src/otbWriterWatcherBase.cxx
similarity index 100%
rename from Code/Common/otbWriterWatcherBase.cxx
rename to Modules/Core/Common/src/otbWriterWatcherBase.cxx
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTestScientificNotation.cxx b/Modules/Core/Common/test/otbCompareAsciiTestScientificNotation.cxx
similarity index 100%
rename from Testing/Code/TestSystem/otbCompareAsciiTestScientificNotation.cxx
rename to Modules/Core/Common/test/otbCompareAsciiTestScientificNotation.cxx
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTests.cxx b/Modules/Core/Common/test/otbCompareAsciiTests.cxx
similarity index 100%
rename from Testing/Code/TestSystem/otbCompareAsciiTests.cxx
rename to Modules/Core/Common/test/otbCompareAsciiTests.cxx
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTests2.cxx b/Modules/Core/Common/test/otbCompareAsciiTests2.cxx
similarity index 100%
rename from Testing/Code/TestSystem/otbCompareAsciiTests2.cxx
rename to Modules/Core/Common/test/otbCompareAsciiTests2.cxx
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTests3.cxx b/Modules/Core/Common/test/otbCompareAsciiTests3.cxx
similarity index 100%
rename from Testing/Code/TestSystem/otbCompareAsciiTests3.cxx
rename to Modules/Core/Common/test/otbCompareAsciiTests3.cxx
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTests4.cxx b/Modules/Core/Common/test/otbCompareAsciiTests4.cxx
similarity index 100%
rename from Testing/Code/TestSystem/otbCompareAsciiTests4.cxx
rename to Modules/Core/Common/test/otbCompareAsciiTests4.cxx
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTests5.cxx b/Modules/Core/Common/test/otbCompareAsciiTests5.cxx
similarity index 100%
rename from Testing/Code/TestSystem/otbCompareAsciiTests5.cxx
rename to Modules/Core/Common/test/otbCompareAsciiTests5.cxx
diff --git a/Testing/Code/TestSystem/otbCompareAsciiTestsEpsilon3_WhiteSpace.cxx b/Modules/Core/Common/test/otbCompareAsciiTestsEpsilon3_WhiteSpace.cxx
similarity index 100%
rename from Testing/Code/TestSystem/otbCompareAsciiTestsEpsilon3_WhiteSpace.cxx
rename to Modules/Core/Common/test/otbCompareAsciiTestsEpsilon3_WhiteSpace.cxx
diff --git a/Testing/Code/Common/otbConfigurationTest.cxx b/Modules/Core/Common/test/otbConfigurationTest.cxx
similarity index 100%
rename from Testing/Code/Common/otbConfigurationTest.cxx
rename to Modules/Core/Common/test/otbConfigurationTest.cxx
diff --git a/Testing/Code/Common/otbImageRegionAdaptativeSplitter.cxx b/Modules/Core/Common/test/otbImageRegionAdaptativeSplitter.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageRegionAdaptativeSplitter.cxx
rename to Modules/Core/Common/test/otbImageRegionAdaptativeSplitter.cxx
diff --git a/Testing/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.cxx b/Modules/Core/Common/test/otbImageRegionNonUniformMultidimensionalSplitter.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.cxx
rename to Modules/Core/Common/test/otbImageRegionNonUniformMultidimensionalSplitter.cxx
diff --git a/Testing/Code/Common/otbImageRegionNonUniformMultidimensionalSplitterNew.cxx b/Modules/Core/Common/test/otbImageRegionNonUniformMultidimensionalSplitterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageRegionNonUniformMultidimensionalSplitterNew.cxx
rename to Modules/Core/Common/test/otbImageRegionNonUniformMultidimensionalSplitterNew.cxx
diff --git a/Testing/Code/Common/otbImageRegionSquareTileSplitter.cxx b/Modules/Core/Common/test/otbImageRegionSquareTileSplitter.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageRegionSquareTileSplitter.cxx
rename to Modules/Core/Common/test/otbImageRegionSquareTileSplitter.cxx
diff --git a/Testing/Code/Common/otbImageRegionTileMapSplitter.cxx b/Modules/Core/Common/test/otbImageRegionTileMapSplitter.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageRegionTileMapSplitter.cxx
rename to Modules/Core/Common/test/otbImageRegionTileMapSplitter.cxx
diff --git a/Testing/Code/Common/otbImageRegionTileMapSplitterNew.cxx b/Modules/Core/Common/test/otbImageRegionTileMapSplitterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageRegionTileMapSplitterNew.cxx
rename to Modules/Core/Common/test/otbImageRegionTileMapSplitterNew.cxx
diff --git a/Testing/Code/Common/otbRGBAPixelConverter.cxx b/Modules/Core/Common/test/otbRGBAPixelConverter.cxx
similarity index 100%
rename from Testing/Code/Common/otbRGBAPixelConverter.cxx
rename to Modules/Core/Common/test/otbRGBAPixelConverter.cxx
diff --git a/Testing/Code/Common/otbRectangle.cxx b/Modules/Core/Common/test/otbRectangle.cxx
similarity index 100%
rename from Testing/Code/Common/otbRectangle.cxx
rename to Modules/Core/Common/test/otbRectangle.cxx
diff --git a/Testing/Code/Common/otbRectangleNew.cxx b/Modules/Core/Common/test/otbRectangleNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbRectangleNew.cxx
rename to Modules/Core/Common/test/otbRectangleNew.cxx
diff --git a/Testing/Code/Common/otbSystemTest.cxx b/Modules/Core/Common/test/otbSystemTest.cxx
similarity index 100%
rename from Testing/Code/Common/otbSystemTest.cxx
rename to Modules/Core/Common/test/otbSystemTest.cxx
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx b/Modules/Core/Common/test/otbTestCommandLineArgumentParser.cxx
similarity index 100%
rename from Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
rename to Modules/Core/Common/test/otbTestCommandLineArgumentParser.cxx
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx b/Modules/Core/Common/test/otbTestCommandLineArgumentParserHelp.cxx
similarity index 100%
rename from Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
rename to Modules/Core/Common/test/otbTestCommandLineArgumentParserHelp.cxx
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx b/Modules/Core/Common/test/otbTestCommandLineArgumentParserList.cxx
similarity index 100%
rename from Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
rename to Modules/Core/Common/test/otbTestCommandLineArgumentParserList.cxx
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx b/Modules/Core/Common/test/otbTestCommandLineArgumentParserWithError.cxx
similarity index 100%
rename from Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
rename to Modules/Core/Common/test/otbTestCommandLineArgumentParserWithError.cxx
diff --git a/Testing/Code/Common/otbVariableLengthVectorConverter.cxx b/Modules/Core/Common/test/otbVariableLengthVectorConverter.cxx
similarity index 100%
rename from Testing/Code/Common/otbVariableLengthVectorConverter.cxx
rename to Modules/Core/Common/test/otbVariableLengthVectorConverter.cxx
diff --git a/Code/IO/otbConvertPixelBuffer.h b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
similarity index 100%
rename from Code/IO/otbConvertPixelBuffer.h
rename to Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
diff --git a/Code/IO/otbConvertPixelBuffer.txx b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.txx
similarity index 100%
rename from Code/IO/otbConvertPixelBuffer.txx
rename to Modules/Core/ImageBase/include/otbConvertPixelBuffer.txx
diff --git a/Code/IO/otbDefaultConvertPixelTraits.h b/Modules/Core/ImageBase/include/otbDefaultConvertPixelTraits.h
similarity index 100%
rename from Code/IO/otbDefaultConvertPixelTraits.h
rename to Modules/Core/ImageBase/include/otbDefaultConvertPixelTraits.h
diff --git a/Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValue.h b/Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValue.h
similarity index 100%
rename from Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValue.h
rename to Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValue.h
diff --git a/Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValuePow2.h b/Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
similarity index 100%
rename from Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValuePow2.h
rename to Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
diff --git a/Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValuePow2.txx b/Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValuePow2.txx
similarity index 100%
rename from Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValuePow2.txx
rename to Modules/Core/ImageBase/include/otbEuclideanDistanceMetricWithMissingValuePow2.txx
diff --git a/Code/Common/otbExtractROI.h b/Modules/Core/ImageBase/include/otbExtractROI.h
similarity index 100%
rename from Code/Common/otbExtractROI.h
rename to Modules/Core/ImageBase/include/otbExtractROI.h
diff --git a/Code/Common/otbExtractROI.txx b/Modules/Core/ImageBase/include/otbExtractROI.txx
similarity index 100%
rename from Code/Common/otbExtractROI.txx
rename to Modules/Core/ImageBase/include/otbExtractROI.txx
diff --git a/Code/Common/otbExtractROIBase.h b/Modules/Core/ImageBase/include/otbExtractROIBase.h
similarity index 100%
rename from Code/Common/otbExtractROIBase.h
rename to Modules/Core/ImageBase/include/otbExtractROIBase.h
diff --git a/Code/Common/otbExtractROIBase.txx b/Modules/Core/ImageBase/include/otbExtractROIBase.txx
similarity index 100%
rename from Code/Common/otbExtractROIBase.txx
rename to Modules/Core/ImageBase/include/otbExtractROIBase.txx
diff --git a/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.h b/Modules/Core/ImageBase/include/otbFlexibleDistanceWithMissingValue.h
similarity index 100%
rename from Code/BasicFilters/otbFlexibleDistanceWithMissingValue.h
rename to Modules/Core/ImageBase/include/otbFlexibleDistanceWithMissingValue.h
diff --git a/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.txx b/Modules/Core/ImageBase/include/otbFlexibleDistanceWithMissingValue.txx
similarity index 100%
rename from Code/BasicFilters/otbFlexibleDistanceWithMissingValue.txx
rename to Modules/Core/ImageBase/include/otbFlexibleDistanceWithMissingValue.txx
diff --git a/Code/IO/otbImage.h b/Modules/Core/ImageBase/include/otbImage.h
similarity index 100%
rename from Code/IO/otbImage.h
rename to Modules/Core/ImageBase/include/otbImage.h
diff --git a/Code/IO/otbImage.txx b/Modules/Core/ImageBase/include/otbImage.txx
similarity index 100%
rename from Code/IO/otbImage.txx
rename to Modules/Core/ImageBase/include/otbImage.txx
diff --git a/Code/FeatureExtraction/otbImageFunctionAdaptor.h b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
similarity index 100%
rename from Code/FeatureExtraction/otbImageFunctionAdaptor.h
rename to Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
diff --git a/Code/FeatureExtraction/otbImageFunctionAdaptor.txx b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.txx
similarity index 100%
rename from Code/FeatureExtraction/otbImageFunctionAdaptor.txx
rename to Modules/Core/ImageBase/include/otbImageFunctionAdaptor.txx
diff --git a/Code/IO/otbImageIOBase.h b/Modules/Core/ImageBase/include/otbImageIOBase.h
similarity index 100%
rename from Code/IO/otbImageIOBase.h
rename to Modules/Core/ImageBase/include/otbImageIOBase.h
diff --git a/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
similarity index 100%
rename from Code/Common/otbImageOfVectorsToMonoChannelExtractROI.h
rename to Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
diff --git a/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.txx b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.txx
similarity index 100%
rename from Code/Common/otbImageOfVectorsToMonoChannelExtractROI.txx
rename to Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.txx
diff --git a/Code/FeatureExtraction/otbMetaImageFunction.h b/Modules/Core/ImageBase/include/otbMetaImageFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbMetaImageFunction.h
rename to Modules/Core/ImageBase/include/otbMetaImageFunction.h
diff --git a/Code/FeatureExtraction/otbMetaImageFunction.txx b/Modules/Core/ImageBase/include/otbMetaImageFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbMetaImageFunction.txx
rename to Modules/Core/ImageBase/include/otbMetaImageFunction.txx
diff --git a/Code/Common/otbMultiChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
similarity index 100%
rename from Code/Common/otbMultiChannelExtractROI.h
rename to Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
diff --git a/Code/Common/otbMultiChannelExtractROI.txx b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.txx
similarity index 100%
rename from Code/Common/otbMultiChannelExtractROI.txx
rename to Modules/Core/ImageBase/include/otbMultiChannelExtractROI.txx
diff --git a/Code/Common/otbMultiToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
similarity index 100%
rename from Code/Common/otbMultiToMonoChannelExtractROI.h
rename to Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
diff --git a/Code/Common/otbMultiToMonoChannelExtractROI.txx b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.txx
similarity index 100%
rename from Code/Common/otbMultiToMonoChannelExtractROI.txx
rename to Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.txx
diff --git a/Code/IO/otbVectorImage.h b/Modules/Core/ImageBase/include/otbVectorImage.h
similarity index 100%
rename from Code/IO/otbVectorImage.h
rename to Modules/Core/ImageBase/include/otbVectorImage.h
diff --git a/Code/IO/otbVectorImage.txx b/Modules/Core/ImageBase/include/otbVectorImage.txx
similarity index 100%
rename from Code/IO/otbVectorImage.txx
rename to Modules/Core/ImageBase/include/otbVectorImage.txx
diff --git a/Code/IO/otbImageIOBase.cxx b/Modules/Core/ImageBase/src/otbImageIOBase.cxx
similarity index 100%
rename from Code/IO/otbImageIOBase.cxx
rename to Modules/Core/ImageBase/src/otbImageIOBase.cxx
diff --git a/Testing/Fa/0000169-fftcomplextocomplex.cxx b/Modules/Core/ImageBase/test/0000169-fftcomplextocomplex.cxx
similarity index 100%
rename from Testing/Fa/0000169-fftcomplextocomplex.cxx
rename to Modules/Core/ImageBase/test/0000169-fftcomplextocomplex.cxx
diff --git a/Testing/Fa/0000307-ExtractROICompareRegionsImplementations.cxx b/Modules/Core/ImageBase/test/0000307-ExtractROICompareRegionsImplementations.cxx
similarity index 100%
rename from Testing/Fa/0000307-ExtractROICompareRegionsImplementations.cxx
rename to Modules/Core/ImageBase/test/0000307-ExtractROICompareRegionsImplementations.cxx
diff --git a/Testing/Fa/0000428-CastImageFilterStreaming.cxx b/Modules/Core/ImageBase/test/0000428-CastImageFilterStreaming.cxx
similarity index 100%
rename from Testing/Fa/0000428-CastImageFilterStreaming.cxx
rename to Modules/Core/ImageBase/test/0000428-CastImageFilterStreaming.cxx
diff --git a/Testing/Code/BasicFilters/otbComplexToIntensityFilterTest.cxx b/Modules/Core/ImageBase/test/otbComplexToIntensityFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbComplexToIntensityFilterTest.cxx
rename to Modules/Core/ImageBase/test/otbComplexToIntensityFilterTest.cxx
diff --git a/Testing/Code/BasicFilters/otbComplexToVectorImageCastFilter.cxx b/Modules/Core/ImageBase/test/otbComplexToVectorImageCastFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbComplexToVectorImageCastFilter.cxx
rename to Modules/Core/ImageBase/test/otbComplexToVectorImageCastFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValue.cxx b/Modules/Core/ImageBase/test/otbEuclideanDistanceMetricWithMissingValue.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValue.cxx
rename to Modules/Core/ImageBase/test/otbEuclideanDistanceMetricWithMissingValue.cxx
diff --git a/Testing/Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValueNew.cxx b/Modules/Core/ImageBase/test/otbEuclideanDistanceMetricWithMissingValueNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValueNew.cxx
rename to Modules/Core/ImageBase/test/otbEuclideanDistanceMetricWithMissingValueNew.cxx
diff --git a/Testing/Code/Common/otbExtractROI.cxx b/Modules/Core/ImageBase/test/otbExtractROI.cxx
similarity index 100%
rename from Testing/Code/Common/otbExtractROI.cxx
rename to Modules/Core/ImageBase/test/otbExtractROI.cxx
diff --git a/Testing/Code/Common/otbExtractROI2.cxx b/Modules/Core/ImageBase/test/otbExtractROI2.cxx
similarity index 100%
rename from Testing/Code/Common/otbExtractROI2.cxx
rename to Modules/Core/ImageBase/test/otbExtractROI2.cxx
diff --git a/Testing/Code/Common/otbExtractROINew.cxx b/Modules/Core/ImageBase/test/otbExtractROINew.cxx
similarity index 100%
rename from Testing/Code/Common/otbExtractROINew.cxx
rename to Modules/Core/ImageBase/test/otbExtractROINew.cxx
diff --git a/Testing/Code/Common/otbExtractROITestMetaData.cxx b/Modules/Core/ImageBase/test/otbExtractROITestMetaData.cxx
similarity index 100%
rename from Testing/Code/Common/otbExtractROITestMetaData.cxx
rename to Modules/Core/ImageBase/test/otbExtractROITestMetaData.cxx
diff --git a/Testing/Code/Common/otbExtractROI_RGB.cxx b/Modules/Core/ImageBase/test/otbExtractROI_RGB.cxx
similarity index 100%
rename from Testing/Code/Common/otbExtractROI_RGB.cxx
rename to Modules/Core/ImageBase/test/otbExtractROI_RGB.cxx
diff --git a/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.cxx b/Modules/Core/ImageBase/test/otbFlexibleDistanceWithMissingValue.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValue.cxx
rename to Modules/Core/ImageBase/test/otbFlexibleDistanceWithMissingValue.cxx
diff --git a/Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValueNew.cxx b/Modules/Core/ImageBase/test/otbFlexibleDistanceWithMissingValueNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbFlexibleDistanceWithMissingValueNew.cxx
rename to Modules/Core/ImageBase/test/otbFlexibleDistanceWithMissingValueNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbFourierMellinImageFilterTestFFT.cxx b/Modules/Core/ImageBase/test/otbFourierMellinImageFilterTestFFT.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbFourierMellinImageFilterTestFFT.cxx
rename to Modules/Core/ImageBase/test/otbFourierMellinImageFilterTestFFT.cxx
diff --git a/Testing/Code/BasicFilters/otbFunctionToImageFilter.cxx b/Modules/Core/ImageBase/test/otbFunctionToImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbFunctionToImageFilter.cxx
rename to Modules/Core/ImageBase/test/otbFunctionToImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbFunctionToImageFilterNew.cxx b/Modules/Core/ImageBase/test/otbFunctionToImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbFunctionToImageFilterNew.cxx
rename to Modules/Core/ImageBase/test/otbFunctionToImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterNew.cxx b/Modules/Core/ImageBase/test/otbImageAndVectorImageOperationFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterNew.cxx
rename to Modules/Core/ImageBase/test/otbImageAndVectorImageOperationFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterTest.cxx b/Modules/Core/ImageBase/test/otbImageAndVectorImageOperationFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbImageAndVectorImageOperationFilterTest.cxx
rename to Modules/Core/ImageBase/test/otbImageAndVectorImageOperationFilterTest.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageFunctionAdaptor.cxx b/Modules/Core/ImageBase/test/otbImageFunctionAdaptor.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageFunctionAdaptor.cxx
rename to Modules/Core/ImageBase/test/otbImageFunctionAdaptor.cxx
diff --git a/Testing/Code/Common/otbImageList.cxx b/Modules/Core/ImageBase/test/otbImageList.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageList.cxx
rename to Modules/Core/ImageBase/test/otbImageList.cxx
diff --git a/Testing/Code/Common/otbImageListNew.cxx b/Modules/Core/ImageBase/test/otbImageListNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageListNew.cxx
rename to Modules/Core/ImageBase/test/otbImageListNew.cxx
diff --git a/Testing/Code/Common/otbImageListSourceNew.cxx b/Modules/Core/ImageBase/test/otbImageListSourceNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageListSourceNew.cxx
rename to Modules/Core/ImageBase/test/otbImageListSourceNew.cxx
diff --git a/Testing/Code/Common/otbImageListToImageFilterNew.cxx b/Modules/Core/ImageBase/test/otbImageListToImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageListToImageFilterNew.cxx
rename to Modules/Core/ImageBase/test/otbImageListToImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbImageListToImageListApplyFilter.cxx b/Modules/Core/ImageBase/test/otbImageListToImageListApplyFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbImageListToImageListApplyFilter.cxx
rename to Modules/Core/ImageBase/test/otbImageListToImageListApplyFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbImageListToImageListApplyFilterNew.cxx b/Modules/Core/ImageBase/test/otbImageListToImageListApplyFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbImageListToImageListApplyFilterNew.cxx
rename to Modules/Core/ImageBase/test/otbImageListToImageListApplyFilterNew.cxx
diff --git a/Testing/Code/Common/otbImageListToImageListFilterNew.cxx b/Modules/Core/ImageBase/test/otbImageListToImageListFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageListToImageListFilterNew.cxx
rename to Modules/Core/ImageBase/test/otbImageListToImageListFilterNew.cxx
diff --git a/Testing/Code/Common/otbImageListToVectorImageFilter.cxx b/Modules/Core/ImageBase/test/otbImageListToVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageListToVectorImageFilter.cxx
rename to Modules/Core/ImageBase/test/otbImageListToVectorImageFilter.cxx
diff --git a/Testing/Code/Common/otbImageListToVectorImageFilter2.cxx b/Modules/Core/ImageBase/test/otbImageListToVectorImageFilter2.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageListToVectorImageFilter2.cxx
rename to Modules/Core/ImageBase/test/otbImageListToVectorImageFilter2.cxx
diff --git a/Testing/Code/Common/otbImageListToVectorImageFilterNew.cxx b/Modules/Core/ImageBase/test/otbImageListToVectorImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageListToVectorImageFilterNew.cxx
rename to Modules/Core/ImageBase/test/otbImageListToVectorImageFilterNew.cxx
diff --git a/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.cxx b/Modules/Core/ImageBase/test/otbImageOfVectorsToMonoChannelExtractROI.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.cxx
rename to Modules/Core/ImageBase/test/otbImageOfVectorsToMonoChannelExtractROI.cxx
diff --git a/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROINew.cxx b/Modules/Core/ImageBase/test/otbImageOfVectorsToMonoChannelExtractROINew.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROINew.cxx
rename to Modules/Core/ImageBase/test/otbImageOfVectorsToMonoChannelExtractROINew.cxx
diff --git a/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx b/Modules/Core/ImageBase/test/otbImagePCAShapeModelEstimatorTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx
rename to Modules/Core/ImageBase/test/otbImagePCAShapeModelEstimatorTest.cxx
diff --git a/Testing/Code/IO/otbImageTest.cxx b/Modules/Core/ImageBase/test/otbImageTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageTest.cxx
rename to Modules/Core/ImageBase/test/otbImageTest.cxx
diff --git a/Testing/Code/Common/otbMultiChannelExtractROI.cxx b/Modules/Core/ImageBase/test/otbMultiChannelExtractROI.cxx
similarity index 100%
rename from Testing/Code/Common/otbMultiChannelExtractROI.cxx
rename to Modules/Core/ImageBase/test/otbMultiChannelExtractROI.cxx
diff --git a/Testing/Code/Common/otbMultiChannelExtractROINew.cxx b/Modules/Core/ImageBase/test/otbMultiChannelExtractROINew.cxx
similarity index 100%
rename from Testing/Code/Common/otbMultiChannelExtractROINew.cxx
rename to Modules/Core/ImageBase/test/otbMultiChannelExtractROINew.cxx
diff --git a/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx b/Modules/Core/ImageBase/test/otbMultiToMonoChannelExtractROI.cxx
similarity index 100%
rename from Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx
rename to Modules/Core/ImageBase/test/otbMultiToMonoChannelExtractROI.cxx
diff --git a/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx b/Modules/Core/ImageBase/test/otbMultiToMonoChannelExtractROINew.cxx
similarity index 100%
rename from Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx
rename to Modules/Core/ImageBase/test/otbMultiToMonoChannelExtractROINew.cxx
diff --git a/Testing/Code/Common/otbObjectList.cxx b/Modules/Core/ImageBase/test/otbObjectList.cxx
similarity index 100%
rename from Testing/Code/Common/otbObjectList.cxx
rename to Modules/Core/ImageBase/test/otbObjectList.cxx
diff --git a/Testing/Code/Common/otbObjectListNew.cxx b/Modules/Core/ImageBase/test/otbObjectListNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbObjectListNew.cxx
rename to Modules/Core/ImageBase/test/otbObjectListNew.cxx
diff --git a/Testing/Code/Projections/otbOssimElevManagerTest.cxx b/Modules/Core/ImageBase/test/otbOssimElevManagerTest.cxx
similarity index 100%
rename from Testing/Code/Projections/otbOssimElevManagerTest.cxx
rename to Modules/Core/ImageBase/test/otbOssimElevManagerTest.cxx
diff --git a/Testing/Code/Common/otbStandardFilterWatcherNew.cxx b/Modules/Core/ImageBase/test/otbStandardFilterWatcherNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbStandardFilterWatcherNew.cxx
rename to Modules/Core/ImageBase/test/otbStandardFilterWatcherNew.cxx
diff --git a/Testing/Code/Common/otbStandardOneLineFilterWatcherTest.cxx b/Modules/Core/ImageBase/test/otbStandardOneLineFilterWatcherTest.cxx
similarity index 100%
rename from Testing/Code/Common/otbStandardOneLineFilterWatcherTest.cxx
rename to Modules/Core/ImageBase/test/otbStandardOneLineFilterWatcherTest.cxx
diff --git a/Testing/Code/Common/otbStandardWriterWatcher.cxx b/Modules/Core/ImageBase/test/otbStandardWriterWatcher.cxx
similarity index 100%
rename from Testing/Code/Common/otbStandardWriterWatcher.cxx
rename to Modules/Core/ImageBase/test/otbStandardWriterWatcher.cxx
diff --git a/Testing/Code/Common/otbTestMultiExtractMultiUpdate.cxx b/Modules/Core/ImageBase/test/otbTestMultiExtractMultiUpdate.cxx
similarity index 100%
rename from Testing/Code/Common/otbTestMultiExtractMultiUpdate.cxx
rename to Modules/Core/ImageBase/test/otbTestMultiExtractMultiUpdate.cxx
diff --git a/Testing/Code/IO/otbVectorImageTest.cxx b/Modules/Core/ImageBase/test/otbVectorImageTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorImageTest.cxx
rename to Modules/Core/ImageBase/test/otbVectorImageTest.cxx
diff --git a/Testing/Code/Common/otbVectorImageToASImageAdaptorNew.cxx b/Modules/Core/ImageBase/test/otbVectorImageToASImageAdaptorNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorImageToASImageAdaptorNew.cxx
rename to Modules/Core/ImageBase/test/otbVectorImageToASImageAdaptorNew.cxx
diff --git a/Code/BasicFilters/otbBCOInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
similarity index 100%
rename from Code/BasicFilters/otbBCOInterpolateImageFunction.h
rename to Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
diff --git a/Code/BasicFilters/otbBCOInterpolateImageFunction.txx b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbBCOInterpolateImageFunction.txx
rename to Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.txx
diff --git a/Code/BasicFilters/otbBSplineDecompositionImageFilter.h b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbBSplineDecompositionImageFilter.h
rename to Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
diff --git a/Code/BasicFilters/otbBSplineDecompositionImageFilter.txx b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbBSplineDecompositionImageFilter.txx
rename to Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.txx
diff --git a/Code/BasicFilters/otbBSplineInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
similarity index 100%
rename from Code/BasicFilters/otbBSplineInterpolateImageFunction.h
rename to Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
diff --git a/Code/BasicFilters/otbBSplineInterpolateImageFunction.txx b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbBSplineInterpolateImageFunction.txx
rename to Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.txx
diff --git a/Code/Common/otbGenericInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
similarity index 100%
rename from Code/Common/otbGenericInterpolateImageFunction.h
rename to Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
diff --git a/Code/Common/otbGenericInterpolateImageFunction.txx b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.txx
similarity index 100%
rename from Code/Common/otbGenericInterpolateImageFunction.txx
rename to Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.txx
diff --git a/Code/BasicFilters/otbProlateInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
similarity index 100%
rename from Code/BasicFilters/otbProlateInterpolateImageFunction.h
rename to Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
diff --git a/Code/BasicFilters/otbProlateInterpolateImageFunction.txx b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbProlateInterpolateImageFunction.txx
rename to Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.txx
diff --git a/Code/Common/otbStreamingTraits.h b/Modules/Core/Interpolation/include/otbStreamingTraits.h
similarity index 100%
rename from Code/Common/otbStreamingTraits.h
rename to Modules/Core/Interpolation/include/otbStreamingTraits.h
diff --git a/Code/Common/otbStreamingTraits.txx b/Modules/Core/Interpolation/include/otbStreamingTraits.txx
similarity index 100%
rename from Code/Common/otbStreamingTraits.txx
rename to Modules/Core/Interpolation/include/otbStreamingTraits.txx
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h
similarity index 100%
rename from Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
rename to Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageBlackmanFunction.h
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h
similarity index 100%
rename from Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
rename to Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageCosineFunction.h
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
similarity index 100%
rename from Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h
rename to Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.txx
similarity index 100%
rename from Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx
rename to Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.txx
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h
similarity index 100%
rename from Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
rename to Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageGaussianFunction.h
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h
similarity index 100%
rename from Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
rename to Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageHammingFunction.h
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h
similarity index 100%
rename from Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
rename to Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageLanczosFunction.h
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h
similarity index 100%
rename from Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
rename to Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageWelchFunction.h
diff --git a/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilter.cxx b/Modules/Core/Interpolation/test/otbBSplineDecompositionImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBSplineDecompositionImageFilter.cxx
rename to Modules/Core/Interpolation/test/otbBSplineDecompositionImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbBSplineDecompositionImageFilterNew.cxx b/Modules/Core/Interpolation/test/otbBSplineDecompositionImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBSplineDecompositionImageFilterNew.cxx
rename to Modules/Core/Interpolation/test/otbBSplineDecompositionImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunction.cxx b/Modules/Core/Interpolation/test/otbBSplineInterpolateImageFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBSplineInterpolateImageFunction.cxx
rename to Modules/Core/Interpolation/test/otbBSplineInterpolateImageFunction.cxx
diff --git a/Testing/Code/BasicFilters/otbBSplineInterpolateImageFunctionNew.cxx b/Modules/Core/Interpolation/test/otbBSplineInterpolateImageFunctionNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBSplineInterpolateImageFunctionNew.cxx
rename to Modules/Core/Interpolation/test/otbBSplineInterpolateImageFunctionNew.cxx
diff --git a/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx b/Modules/Core/Interpolation/test/otbGenericInterpolateImageFunctionNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx
rename to Modules/Core/Interpolation/test/otbGenericInterpolateImageFunctionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbProlateInterpolateImageFunctionNew.cxx b/Modules/Core/Interpolation/test/otbProlateInterpolateImageFunctionNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbProlateInterpolateImageFunctionNew.cxx
rename to Modules/Core/Interpolation/test/otbProlateInterpolateImageFunctionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingTraits.cxx b/Modules/Core/Interpolation/test/otbStreamingTraits.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingTraits.cxx
rename to Modules/Core/Interpolation/test/otbStreamingTraits.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageBlackmanFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageBlackmanFunction.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageBlackmanFunctionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageCosineFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageCosineFunction.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunctionNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageCosineFunctionNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunctionNew.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageCosineFunctionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBaseNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageFunctionBaseNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBaseNew.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageFunctionBaseNew.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageGaussianFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageGaussianFunction.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageGaussianFunctionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageHammingFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageHammingFunction.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunctionNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageHammingFunctionNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunctionNew.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageHammingFunctionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageLanczosFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageLanczosFunction.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageLanczosFunctionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageWelchFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageWelchFunction.cxx
diff --git a/Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunctionNew.cxx b/Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageWelchFunctionNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunctionNew.cxx
rename to Modules/Core/Interpolation/test/otbWindowedSincInterpolateImageWelchFunctionNew.cxx
diff --git a/Code/OBIA/otbAttributesMapLabelObject.h b/Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
similarity index 100%
rename from Code/OBIA/otbAttributesMapLabelObject.h
rename to Modules/Core/LabelMap/include/otbAttributesMapLabelObject.h
diff --git a/Code/OBIA/otbAttributesMapLabelObjectWithClassLabel.h b/Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h
similarity index 100%
rename from Code/OBIA/otbAttributesMapLabelObjectWithClassLabel.h
rename to Modules/Core/LabelMap/include/otbAttributesMapLabelObjectWithClassLabel.h
diff --git a/Code/OBIA/otbAttributesMapOpeningLabelMapFilter.h b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
similarity index 100%
rename from Code/OBIA/otbAttributesMapOpeningLabelMapFilter.h
rename to Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
diff --git a/Code/OBIA/otbAttributesMapOpeningLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.txx
similarity index 100%
rename from Code/OBIA/otbAttributesMapOpeningLabelMapFilter.txx
rename to Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.txx
diff --git a/Code/OBIA/otbKMeansAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
similarity index 100%
rename from Code/OBIA/otbKMeansAttributesLabelMapFilter.h
rename to Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
diff --git a/Code/OBIA/otbKMeansAttributesLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.txx
similarity index 100%
rename from Code/OBIA/otbKMeansAttributesLabelMapFilter.txx
rename to Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.txx
diff --git a/Code/OBIA/otbLabelImageToLabelMapWithAdjacencyFilter.h b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
similarity index 100%
rename from Code/OBIA/otbLabelImageToLabelMapWithAdjacencyFilter.h
rename to Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
diff --git a/Code/OBIA/otbLabelImageToLabelMapWithAdjacencyFilter.txx b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.txx
similarity index 100%
rename from Code/OBIA/otbLabelImageToLabelMapWithAdjacencyFilter.txx
rename to Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.txx
diff --git a/Code/OBIA/otbLabelMapFeaturesFunctorImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h
similarity index 100%
rename from Code/OBIA/otbLabelMapFeaturesFunctorImageFilter.h
rename to Modules/Core/LabelMap/include/otbLabelMapFeaturesFunctorImageFilter.h
diff --git a/Code/OBIA/otbLabelMapSource.h b/Modules/Core/LabelMap/include/otbLabelMapSource.h
similarity index 100%
rename from Code/OBIA/otbLabelMapSource.h
rename to Modules/Core/LabelMap/include/otbLabelMapSource.h
diff --git a/Code/OBIA/otbLabelMapSource.txx b/Modules/Core/LabelMap/include/otbLabelMapSource.txx
similarity index 100%
rename from Code/OBIA/otbLabelMapSource.txx
rename to Modules/Core/LabelMap/include/otbLabelMapSource.txx
diff --git a/Code/OBIA/otbLabelMapToAttributeImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
similarity index 100%
rename from Code/OBIA/otbLabelMapToAttributeImageFilter.h
rename to Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
diff --git a/Code/OBIA/otbLabelMapToAttributeImageFilter.txx b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.txx
similarity index 100%
rename from Code/OBIA/otbLabelMapToAttributeImageFilter.txx
rename to Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.txx
diff --git a/Code/OBIA/otbLabelMapToLabelImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
similarity index 100%
rename from Code/OBIA/otbLabelMapToLabelImageFilter.h
rename to Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
diff --git a/Code/OBIA/otbLabelMapToLabelImageFilter.txx b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.txx
similarity index 100%
rename from Code/OBIA/otbLabelMapToLabelImageFilter.txx
rename to Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.txx
diff --git a/Code/OBIA/otbLabelMapToSampleListFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
similarity index 100%
rename from Code/OBIA/otbLabelMapToSampleListFilter.h
rename to Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
diff --git a/Code/OBIA/otbLabelMapToSampleListFilter.txx b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.txx
similarity index 100%
rename from Code/OBIA/otbLabelMapToSampleListFilter.txx
rename to Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.txx
diff --git a/Code/OBIA/otbLabelMapWithAdjacency.h b/Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h
similarity index 100%
rename from Code/OBIA/otbLabelMapWithAdjacency.h
rename to Modules/Core/LabelMap/include/otbLabelMapWithAdjacency.h
diff --git a/Code/OBIA/otbLabelMapWithClassLabelToClassLabelImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
similarity index 100%
rename from Code/OBIA/otbLabelMapWithClassLabelToClassLabelImageFilter.h
rename to Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
diff --git a/Code/OBIA/otbLabelMapWithClassLabelToClassLabelImageFilter.txx b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.txx
similarity index 100%
rename from Code/OBIA/otbLabelMapWithClassLabelToClassLabelImageFilter.txx
rename to Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.txx
diff --git a/Code/OBIA/otbLabelMapWithClassLabelToLabeledSampleListFilter.h b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
similarity index 100%
rename from Code/OBIA/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
rename to Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
diff --git a/Code/OBIA/otbLabelMapWithClassLabelToLabeledSampleListFilter.txx b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.txx
similarity index 100%
rename from Code/OBIA/otbLabelMapWithClassLabelToLabeledSampleListFilter.txx
rename to Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.txx
diff --git a/Code/OBIA/otbLabelObjectFieldsFunctor.h b/Modules/Core/LabelMap/include/otbLabelObjectFieldsFunctor.h
similarity index 100%
rename from Code/OBIA/otbLabelObjectFieldsFunctor.h
rename to Modules/Core/LabelMap/include/otbLabelObjectFieldsFunctor.h
diff --git a/Code/OBIA/otbLabelObjectToPolygonFunctor.h b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
similarity index 100%
rename from Code/OBIA/otbLabelObjectToPolygonFunctor.h
rename to Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
diff --git a/Code/OBIA/otbLabelObjectToPolygonFunctor.txx b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.txx
similarity index 100%
rename from Code/OBIA/otbLabelObjectToPolygonFunctor.txx
rename to Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.txx
diff --git a/Code/OBIA/otbLabelObjectWithClassLabelFieldsFunctor.h b/Modules/Core/LabelMap/include/otbLabelObjectWithClassLabelFieldsFunctor.h
similarity index 100%
rename from Code/OBIA/otbLabelObjectWithClassLabelFieldsFunctor.h
rename to Modules/Core/LabelMap/include/otbLabelObjectWithClassLabelFieldsFunctor.h
diff --git a/Code/OBIA/otbMergeLabelObjectFunctor.h b/Modules/Core/LabelMap/include/otbMergeLabelObjectFunctor.h
similarity index 100%
rename from Code/OBIA/otbMergeLabelObjectFunctor.h
rename to Modules/Core/LabelMap/include/otbMergeLabelObjectFunctor.h
diff --git a/Code/OBIA/otbMinMaxAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
similarity index 100%
rename from Code/OBIA/otbMinMaxAttributesLabelMapFilter.h
rename to Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
diff --git a/Code/OBIA/otbMinMaxAttributesLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.txx
similarity index 100%
rename from Code/OBIA/otbMinMaxAttributesLabelMapFilter.txx
rename to Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.txx
diff --git a/Code/OBIA/otbNormalizeAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
similarity index 100%
rename from Code/OBIA/otbNormalizeAttributesLabelMapFilter.h
rename to Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
diff --git a/Code/OBIA/otbNormalizeAttributesLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.txx
similarity index 100%
rename from Code/OBIA/otbNormalizeAttributesLabelMapFilter.txx
rename to Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.txx
diff --git a/Code/OBIA/otbStatisticsAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
similarity index 100%
rename from Code/OBIA/otbStatisticsAttributesLabelMapFilter.h
rename to Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
diff --git a/Code/OBIA/otbStatisticsAttributesLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.txx
similarity index 100%
rename from Code/OBIA/otbStatisticsAttributesLabelMapFilter.txx
rename to Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.txx
diff --git a/Testing/Code/OBIA/otbAttributesMapLabelObjectNew.cxx b/Modules/Core/LabelMap/test/otbAttributesMapLabelObjectNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbAttributesMapLabelObjectNew.cxx
rename to Modules/Core/LabelMap/test/otbAttributesMapLabelObjectNew.cxx
diff --git a/Testing/Code/OBIA/otbAttributesMapLabelObjectWithClassLabelNew.cxx b/Modules/Core/LabelMap/test/otbAttributesMapLabelObjectWithClassLabelNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbAttributesMapLabelObjectWithClassLabelNew.cxx
rename to Modules/Core/LabelMap/test/otbAttributesMapLabelObjectWithClassLabelNew.cxx
diff --git a/Testing/Code/OBIA/otbAttributesMapOpeningLabelMapFilterNew.cxx b/Modules/Core/LabelMap/test/otbAttributesMapOpeningLabelMapFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbAttributesMapOpeningLabelMapFilterNew.cxx
rename to Modules/Core/LabelMap/test/otbAttributesMapOpeningLabelMapFilterNew.cxx
diff --git a/Testing/Code/OBIA/otbLabelImageToLabelMapWithAdjacencyFilter.cxx b/Modules/Core/LabelMap/test/otbLabelImageToLabelMapWithAdjacencyFilter.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbLabelImageToLabelMapWithAdjacencyFilter.cxx
rename to Modules/Core/LabelMap/test/otbLabelImageToLabelMapWithAdjacencyFilter.cxx
diff --git a/Testing/Code/OBIA/otbLabelMapSourceNew.cxx b/Modules/Core/LabelMap/test/otbLabelMapSourceNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbLabelMapSourceNew.cxx
rename to Modules/Core/LabelMap/test/otbLabelMapSourceNew.cxx
diff --git a/Testing/Code/OBIA/otbLabelMapToAttributeImageFilterNew.cxx b/Modules/Core/LabelMap/test/otbLabelMapToAttributeImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbLabelMapToAttributeImageFilterNew.cxx
rename to Modules/Core/LabelMap/test/otbLabelMapToAttributeImageFilterNew.cxx
diff --git a/Testing/Code/OBIA/otbLabelMapToSampleListFilterNew.cxx b/Modules/Core/LabelMap/test/otbLabelMapToSampleListFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbLabelMapToSampleListFilterNew.cxx
rename to Modules/Core/LabelMap/test/otbLabelMapToSampleListFilterNew.cxx
diff --git a/Testing/Code/OBIA/otbLabelMapWithClassLabelToLabeledSampleListFilterNew.cxx b/Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbLabelMapWithClassLabelToLabeledSampleListFilterNew.cxx
rename to Modules/Core/LabelMap/test/otbLabelMapWithClassLabelToLabeledSampleListFilterNew.cxx
diff --git a/Testing/Code/OBIA/otbLabelObjectMapVectorizer.cxx b/Modules/Core/LabelMap/test/otbLabelObjectMapVectorizer.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbLabelObjectMapVectorizer.cxx
rename to Modules/Core/LabelMap/test/otbLabelObjectMapVectorizer.cxx
diff --git a/Testing/Code/OBIA/otbLabelObjectToPolygonFunctorNew.cxx b/Modules/Core/LabelMap/test/otbLabelObjectToPolygonFunctorNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbLabelObjectToPolygonFunctorNew.cxx
rename to Modules/Core/LabelMap/test/otbLabelObjectToPolygonFunctorNew.cxx
diff --git a/Testing/Code/OBIA/otbStatisticsAttributesLabelMapFilterNew.cxx b/Modules/Core/LabelMap/test/otbStatisticsAttributesLabelMapFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbStatisticsAttributesLabelMapFilterNew.cxx
rename to Modules/Core/LabelMap/test/otbStatisticsAttributesLabelMapFilterNew.cxx
diff --git a/Code/Radiometry/otbBandName.h b/Modules/Core/Metadata/include/otbBandName.h
similarity index 100%
rename from Code/Radiometry/otbBandName.h
rename to Modules/Core/Metadata/include/otbBandName.h
diff --git a/Code/IO/otbDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbDefaultImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbDefaultImageMetadataInterface.h
diff --git a/Code/IO/otbDefaultImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbDefaultImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbDefaultImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbFormosatImageMetadataInterface.h b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbFormosatImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbFormosatImageMetadataInterface.h
diff --git a/Code/IO/otbFormosatImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbFormosatImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbFormosatImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbIkonosImageMetadataInterface.h b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbIkonosImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbIkonosImageMetadataInterface.h
diff --git a/Code/IO/otbIkonosImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbIkonosImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbIkonosImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbImageMetadataInterfaceBase.h b/Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
similarity index 100%
rename from Code/IO/otbImageMetadataInterfaceBase.h
rename to Modules/Core/Metadata/include/otbImageMetadataInterfaceBase.h
diff --git a/Code/IO/otbImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbOpticalDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbOpticalDefaultImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterface.h
diff --git a/Code/IO/otbOpticalDefaultImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbOpticalDefaultImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbOpticalDefaultImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbOpticalImageMetadataInterface.h b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbOpticalImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbOpticalImageMetadataInterface.h
diff --git a/Code/IO/otbOpticalImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbOpticalImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbOpticalImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbPleiadesImageMetadataInterface.h b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbPleiadesImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbPleiadesImageMetadataInterface.h
diff --git a/Code/IO/otbPleiadesImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbPleiadesImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbPleiadesImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbQuickBirdImageMetadataInterface.h b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbQuickBirdImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterface.h
diff --git a/Code/IO/otbQuickBirdImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbQuickBirdImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbQuickBirdImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbSarDefaultImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbSarDefaultImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterface.h
diff --git a/Code/IO/otbSarDefaultImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbSarDefaultImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbSarDefaultImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbSarImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSarImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbSarImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbSarImageMetadataInterface.h
diff --git a/Code/IO/otbSarImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbSarImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbSarImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbSpot6ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbSpot6ImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbSpot6ImageMetadataInterface.h
diff --git a/Code/IO/otbSpot6ImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbSpot6ImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbSpot6ImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbSpotImageMetadataInterface.h b/Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbSpotImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbSpotImageMetadataInterface.h
diff --git a/Code/IO/otbSpotImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbSpotImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbSpotImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbTerraSarImageMetadataInterface.h b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbTerraSarImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbTerraSarImageMetadataInterface.h
diff --git a/Code/IO/otbTerraSarImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbTerraSarImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbTerraSarImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbWorldView2ImageMetadataInterface.h b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
similarity index 100%
rename from Code/IO/otbWorldView2ImageMetadataInterface.h
rename to Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterface.h
diff --git a/Code/IO/otbWorldView2ImageMetadataInterfaceFactory.h b/Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h
similarity index 100%
rename from Code/IO/otbWorldView2ImageMetadataInterfaceFactory.h
rename to Modules/Core/Metadata/include/otbWorldView2ImageMetadataInterfaceFactory.h
diff --git a/Code/IO/otbDefaultImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbDefaultImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbDefaultImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbDefaultImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbFormosatImageMetadataInterface.cxx b/Modules/Core/Metadata/src/otbFormosatImageMetadataInterface.cxx
similarity index 100%
rename from Code/IO/otbFormosatImageMetadataInterface.cxx
rename to Modules/Core/Metadata/src/otbFormosatImageMetadataInterface.cxx
diff --git a/Code/IO/otbFormosatImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbFormosatImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbFormosatImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbFormosatImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbIkonosImageMetadataInterface.cxx b/Modules/Core/Metadata/src/otbIkonosImageMetadataInterface.cxx
similarity index 100%
rename from Code/IO/otbIkonosImageMetadataInterface.cxx
rename to Modules/Core/Metadata/src/otbIkonosImageMetadataInterface.cxx
diff --git a/Code/IO/otbIkonosImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbIkonosImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbIkonosImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbIkonosImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbImageMetadataInterfaceBase.cxx b/Modules/Core/Metadata/src/otbImageMetadataInterfaceBase.cxx
similarity index 100%
rename from Code/IO/otbImageMetadataInterfaceBase.cxx
rename to Modules/Core/Metadata/src/otbImageMetadataInterfaceBase.cxx
diff --git a/Code/IO/otbImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbOpticalDefaultImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbOpticalDefaultImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbOpticalDefaultImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbOpticalDefaultImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbOpticalImageMetadataInterface.cxx b/Modules/Core/Metadata/src/otbOpticalImageMetadataInterface.cxx
similarity index 100%
rename from Code/IO/otbOpticalImageMetadataInterface.cxx
rename to Modules/Core/Metadata/src/otbOpticalImageMetadataInterface.cxx
diff --git a/Code/IO/otbOpticalImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbOpticalImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbOpticalImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbOpticalImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbPleiadesImageMetadataInterface.cxx b/Modules/Core/Metadata/src/otbPleiadesImageMetadataInterface.cxx
similarity index 100%
rename from Code/IO/otbPleiadesImageMetadataInterface.cxx
rename to Modules/Core/Metadata/src/otbPleiadesImageMetadataInterface.cxx
diff --git a/Code/IO/otbPleiadesImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbPleiadesImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbPleiadesImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbPleiadesImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbQuickBirdImageMetadataInterface.cxx b/Modules/Core/Metadata/src/otbQuickBirdImageMetadataInterface.cxx
similarity index 100%
rename from Code/IO/otbQuickBirdImageMetadataInterface.cxx
rename to Modules/Core/Metadata/src/otbQuickBirdImageMetadataInterface.cxx
diff --git a/Code/IO/otbQuickBirdImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbQuickBirdImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbQuickBirdImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbQuickBirdImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbSarDefaultImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbSarDefaultImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbSarDefaultImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbSarDefaultImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbSarImageMetadataInterface.cxx b/Modules/Core/Metadata/src/otbSarImageMetadataInterface.cxx
similarity index 100%
rename from Code/IO/otbSarImageMetadataInterface.cxx
rename to Modules/Core/Metadata/src/otbSarImageMetadataInterface.cxx
diff --git a/Code/IO/otbSarImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbSarImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbSarImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbSarImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbSpot6ImageMetadataInterface.cxx b/Modules/Core/Metadata/src/otbSpot6ImageMetadataInterface.cxx
similarity index 100%
rename from Code/IO/otbSpot6ImageMetadataInterface.cxx
rename to Modules/Core/Metadata/src/otbSpot6ImageMetadataInterface.cxx
diff --git a/Code/IO/otbSpot6ImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbSpot6ImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbSpot6ImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbSpot6ImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbSpotImageMetadataInterface.cxx b/Modules/Core/Metadata/src/otbSpotImageMetadataInterface.cxx
similarity index 100%
rename from Code/IO/otbSpotImageMetadataInterface.cxx
rename to Modules/Core/Metadata/src/otbSpotImageMetadataInterface.cxx
diff --git a/Code/IO/otbSpotImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbSpotImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbSpotImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbSpotImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbTerraSarImageMetadataInterface.cxx b/Modules/Core/Metadata/src/otbTerraSarImageMetadataInterface.cxx
similarity index 100%
rename from Code/IO/otbTerraSarImageMetadataInterface.cxx
rename to Modules/Core/Metadata/src/otbTerraSarImageMetadataInterface.cxx
diff --git a/Code/IO/otbTerraSarImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbTerraSarImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbTerraSarImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbTerraSarImageMetadataInterfaceFactory.cxx
diff --git a/Code/IO/otbWorldView2ImageMetadataInterface.cxx b/Modules/Core/Metadata/src/otbWorldView2ImageMetadataInterface.cxx
similarity index 100%
rename from Code/IO/otbWorldView2ImageMetadataInterface.cxx
rename to Modules/Core/Metadata/src/otbWorldView2ImageMetadataInterface.cxx
diff --git a/Code/IO/otbWorldView2ImageMetadataInterfaceFactory.cxx b/Modules/Core/Metadata/src/otbWorldView2ImageMetadataInterfaceFactory.cxx
similarity index 100%
rename from Code/IO/otbWorldView2ImageMetadataInterfaceFactory.cxx
rename to Modules/Core/Metadata/src/otbWorldView2ImageMetadataInterfaceFactory.cxx
diff --git a/Testing/Code/IO/otbDefaultImageMetadataInterface.cxx b/Modules/Core/Metadata/test/otbDefaultImageMetadataInterface.cxx
similarity index 100%
rename from Testing/Code/IO/otbDefaultImageMetadataInterface.cxx
rename to Modules/Core/Metadata/test/otbDefaultImageMetadataInterface.cxx
diff --git a/Testing/Code/IO/otbDefaultImageMetadataInterfaceFactoryNew.cxx b/Modules/Core/Metadata/test/otbDefaultImageMetadataInterfaceFactoryNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbDefaultImageMetadataInterfaceFactoryNew.cxx
rename to Modules/Core/Metadata/test/otbDefaultImageMetadataInterfaceFactoryNew.cxx
diff --git a/Testing/Code/IO/otbFormosatImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbFormosatImageMetadataInterfaceNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbFormosatImageMetadataInterfaceNew.cxx
rename to Modules/Core/Metadata/test/otbFormosatImageMetadataInterfaceNew.cxx
diff --git a/Testing/Code/IO/otbIkonosImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbIkonosImageMetadataInterfaceNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbIkonosImageMetadataInterfaceNew.cxx
rename to Modules/Core/Metadata/test/otbIkonosImageMetadataInterfaceNew.cxx
diff --git a/Testing/Code/IO/otbImageMetadataInterfaceBaseTest.cxx b/Modules/Core/Metadata/test/otbImageMetadataInterfaceBaseTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageMetadataInterfaceBaseTest.cxx
rename to Modules/Core/Metadata/test/otbImageMetadataInterfaceBaseTest.cxx
diff --git a/Testing/Code/IO/otbImageMetadataInterfaceTest2.cxx b/Modules/Core/Metadata/test/otbImageMetadataInterfaceTest2.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageMetadataInterfaceTest2.cxx
rename to Modules/Core/Metadata/test/otbImageMetadataInterfaceTest2.cxx
diff --git a/Testing/Code/IO/otbOpticalDefaultImageMetadataInterface.cxx b/Modules/Core/Metadata/test/otbOpticalDefaultImageMetadataInterface.cxx
similarity index 100%
rename from Testing/Code/IO/otbOpticalDefaultImageMetadataInterface.cxx
rename to Modules/Core/Metadata/test/otbOpticalDefaultImageMetadataInterface.cxx
diff --git a/Testing/Code/IO/otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx b/Modules/Core/Metadata/test/otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx
rename to Modules/Core/Metadata/test/otbOpticalDefaultImageMetadataInterfaceFactoryNew.cxx
diff --git a/Testing/Code/IO/otbOpticalDefaultImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbOpticalDefaultImageMetadataInterfaceNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbOpticalDefaultImageMetadataInterfaceNew.cxx
rename to Modules/Core/Metadata/test/otbOpticalDefaultImageMetadataInterfaceNew.cxx
diff --git a/Testing/Code/IO/otbOpticalImageMetadataInterfaceTest.cxx b/Modules/Core/Metadata/test/otbOpticalImageMetadataInterfaceTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbOpticalImageMetadataInterfaceTest.cxx
rename to Modules/Core/Metadata/test/otbOpticalImageMetadataInterfaceTest.cxx
diff --git a/Testing/Code/IO/otbPleiadesImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbPleiadesImageMetadataInterfaceNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbPleiadesImageMetadataInterfaceNew.cxx
rename to Modules/Core/Metadata/test/otbPleiadesImageMetadataInterfaceNew.cxx
diff --git a/Testing/Code/IO/otbQuickBirdImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbQuickBirdImageMetadataInterfaceNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbQuickBirdImageMetadataInterfaceNew.cxx
rename to Modules/Core/Metadata/test/otbQuickBirdImageMetadataInterfaceNew.cxx
diff --git a/Testing/Code/IO/otbSarDefaultImageMetadataInterface.cxx b/Modules/Core/Metadata/test/otbSarDefaultImageMetadataInterface.cxx
similarity index 100%
rename from Testing/Code/IO/otbSarDefaultImageMetadataInterface.cxx
rename to Modules/Core/Metadata/test/otbSarDefaultImageMetadataInterface.cxx
diff --git a/Testing/Code/IO/otbSarDefaultImageMetadataInterfaceFactoryNew.cxx b/Modules/Core/Metadata/test/otbSarDefaultImageMetadataInterfaceFactoryNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbSarDefaultImageMetadataInterfaceFactoryNew.cxx
rename to Modules/Core/Metadata/test/otbSarDefaultImageMetadataInterfaceFactoryNew.cxx
diff --git a/Testing/Code/IO/otbSarDefaultImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbSarDefaultImageMetadataInterfaceNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbSarDefaultImageMetadataInterfaceNew.cxx
rename to Modules/Core/Metadata/test/otbSarDefaultImageMetadataInterfaceNew.cxx
diff --git a/Testing/Code/IO/otbSarImageMetadataInterfaceTest.cxx b/Modules/Core/Metadata/test/otbSarImageMetadataInterfaceTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbSarImageMetadataInterfaceTest.cxx
rename to Modules/Core/Metadata/test/otbSarImageMetadataInterfaceTest.cxx
diff --git a/Testing/Code/IO/otbSpot6ImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbSpot6ImageMetadataInterfaceNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbSpot6ImageMetadataInterfaceNew.cxx
rename to Modules/Core/Metadata/test/otbSpot6ImageMetadataInterfaceNew.cxx
diff --git a/Testing/Code/IO/otbSpotImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbSpotImageMetadataInterfaceNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbSpotImageMetadataInterfaceNew.cxx
rename to Modules/Core/Metadata/test/otbSpotImageMetadataInterfaceNew.cxx
diff --git a/Testing/Code/IO/otbTerraSarImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbTerraSarImageMetadataInterfaceNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbTerraSarImageMetadataInterfaceNew.cxx
rename to Modules/Core/Metadata/test/otbTerraSarImageMetadataInterfaceNew.cxx
diff --git a/Testing/Code/IO/otbWorldView2ImageMetadataInterfaceNew.cxx b/Modules/Core/Metadata/test/otbWorldView2ImageMetadataInterfaceNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbWorldView2ImageMetadataInterfaceNew.cxx
rename to Modules/Core/Metadata/test/otbWorldView2ImageMetadataInterfaceNew.cxx
diff --git a/Code/Common/otbImageList.h b/Modules/Core/ObjectList/include/otbImageList.h
similarity index 100%
rename from Code/Common/otbImageList.h
rename to Modules/Core/ObjectList/include/otbImageList.h
diff --git a/Code/Common/otbImageList.txx b/Modules/Core/ObjectList/include/otbImageList.txx
similarity index 100%
rename from Code/Common/otbImageList.txx
rename to Modules/Core/ObjectList/include/otbImageList.txx
diff --git a/Code/Common/otbImageListSource.h b/Modules/Core/ObjectList/include/otbImageListSource.h
similarity index 100%
rename from Code/Common/otbImageListSource.h
rename to Modules/Core/ObjectList/include/otbImageListSource.h
diff --git a/Code/Common/otbImageListSource.txx b/Modules/Core/ObjectList/include/otbImageListSource.txx
similarity index 100%
rename from Code/Common/otbImageListSource.txx
rename to Modules/Core/ObjectList/include/otbImageListSource.txx
diff --git a/Code/Common/otbImageListToImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
similarity index 100%
rename from Code/Common/otbImageListToImageFilter.h
rename to Modules/Core/ObjectList/include/otbImageListToImageFilter.h
diff --git a/Code/Common/otbImageListToImageFilter.txx b/Modules/Core/ObjectList/include/otbImageListToImageFilter.txx
similarity index 100%
rename from Code/Common/otbImageListToImageFilter.txx
rename to Modules/Core/ObjectList/include/otbImageListToImageFilter.txx
diff --git a/Code/BasicFilters/otbImageListToImageListApplyFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
similarity index 100%
rename from Code/BasicFilters/otbImageListToImageListApplyFilter.h
rename to Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
diff --git a/Code/BasicFilters/otbImageListToImageListApplyFilter.txx b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbImageListToImageListApplyFilter.txx
rename to Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.txx
diff --git a/Code/Common/otbImageListToImageListFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
similarity index 100%
rename from Code/Common/otbImageListToImageListFilter.h
rename to Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
diff --git a/Code/Common/otbImageListToImageListFilter.txx b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.txx
similarity index 100%
rename from Code/Common/otbImageListToImageListFilter.txx
rename to Modules/Core/ObjectList/include/otbImageListToImageListFilter.txx
diff --git a/Code/BasicFilters/otbImageListToSingleImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbImageListToSingleImageFilter.h
rename to Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
diff --git a/Code/BasicFilters/otbImageListToSingleImageFilter.txx b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbImageListToSingleImageFilter.txx
rename to Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.txx
diff --git a/Code/Common/otbImageListToVectorImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
similarity index 100%
rename from Code/Common/otbImageListToVectorImageFilter.h
rename to Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
diff --git a/Code/Common/otbImageListToVectorImageFilter.txx b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.txx
similarity index 100%
rename from Code/Common/otbImageListToVectorImageFilter.txx
rename to Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.txx
diff --git a/Code/Common/otbObjectList.h b/Modules/Core/ObjectList/include/otbObjectList.h
similarity index 100%
rename from Code/Common/otbObjectList.h
rename to Modules/Core/ObjectList/include/otbObjectList.h
diff --git a/Code/Common/otbObjectList.txx b/Modules/Core/ObjectList/include/otbObjectList.txx
similarity index 100%
rename from Code/Common/otbObjectList.txx
rename to Modules/Core/ObjectList/include/otbObjectList.txx
diff --git a/Code/Common/otbObjectListSource.h b/Modules/Core/ObjectList/include/otbObjectListSource.h
similarity index 100%
rename from Code/Common/otbObjectListSource.h
rename to Modules/Core/ObjectList/include/otbObjectListSource.h
diff --git a/Code/Common/otbObjectListSource.txx b/Modules/Core/ObjectList/include/otbObjectListSource.txx
similarity index 100%
rename from Code/Common/otbObjectListSource.txx
rename to Modules/Core/ObjectList/include/otbObjectListSource.txx
diff --git a/Code/Common/otbObjectListToObjectListFilter.h b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
similarity index 100%
rename from Code/Common/otbObjectListToObjectListFilter.h
rename to Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
diff --git a/Code/Common/otbObjectListToObjectListFilter.txx b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.txx
similarity index 100%
rename from Code/Common/otbObjectListToObjectListFilter.txx
rename to Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.txx
diff --git a/Code/BasicFilters/otbUnaryFunctorObjectListBooleanFilter.h b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
similarity index 100%
rename from Code/BasicFilters/otbUnaryFunctorObjectListBooleanFilter.h
rename to Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
diff --git a/Code/BasicFilters/otbUnaryFunctorObjectListBooleanFilter.txx b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbUnaryFunctorObjectListBooleanFilter.txx
rename to Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.txx
diff --git a/Code/BasicFilters/otbUnaryFunctorObjectListFilter.h b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
similarity index 100%
rename from Code/BasicFilters/otbUnaryFunctorObjectListFilter.h
rename to Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
diff --git a/Code/BasicFilters/otbUnaryFunctorObjectListFilter.txx b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbUnaryFunctorObjectListFilter.txx
rename to Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.txx
diff --git a/Code/BasicFilters/otbImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
similarity index 100%
rename from Code/BasicFilters/otbImageToPointSetFilter.h
rename to Modules/Core/PointSet/include/otbImageToPointSetFilter.h
diff --git a/Code/BasicFilters/otbImageToPointSetFilter.txx b/Modules/Core/PointSet/include/otbImageToPointSetFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbImageToPointSetFilter.txx
rename to Modules/Core/PointSet/include/otbImageToPointSetFilter.txx
diff --git a/Code/Common/otbPointSetAndValuesFunction.h b/Modules/Core/PointSet/include/otbPointSetAndValuesFunction.h
similarity index 100%
rename from Code/Common/otbPointSetAndValuesFunction.h
rename to Modules/Core/PointSet/include/otbPointSetAndValuesFunction.h
diff --git a/Code/BasicFilters/otbPointSetExtractROI.h b/Modules/Core/PointSet/include/otbPointSetExtractROI.h
similarity index 100%
rename from Code/BasicFilters/otbPointSetExtractROI.h
rename to Modules/Core/PointSet/include/otbPointSetExtractROI.h
diff --git a/Code/BasicFilters/otbPointSetExtractROI.txx b/Modules/Core/PointSet/include/otbPointSetExtractROI.txx
similarity index 100%
rename from Code/BasicFilters/otbPointSetExtractROI.txx
rename to Modules/Core/PointSet/include/otbPointSetExtractROI.txx
diff --git a/Code/BasicFilters/otbPointSetFunction.h b/Modules/Core/PointSet/include/otbPointSetFunction.h
similarity index 100%
rename from Code/BasicFilters/otbPointSetFunction.h
rename to Modules/Core/PointSet/include/otbPointSetFunction.h
diff --git a/Code/BasicFilters/otbPointSetFunction.txx b/Modules/Core/PointSet/include/otbPointSetFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbPointSetFunction.txx
rename to Modules/Core/PointSet/include/otbPointSetFunction.txx
diff --git a/Code/Common/otbPointSetSource.h b/Modules/Core/PointSet/include/otbPointSetSource.h
similarity index 100%
rename from Code/Common/otbPointSetSource.h
rename to Modules/Core/PointSet/include/otbPointSetSource.h
diff --git a/Code/Common/otbPointSetSource.txx b/Modules/Core/PointSet/include/otbPointSetSource.txx
similarity index 100%
rename from Code/Common/otbPointSetSource.txx
rename to Modules/Core/PointSet/include/otbPointSetSource.txx
diff --git a/Code/BasicFilters/otbPointSetToPointSetFilter.h b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
similarity index 100%
rename from Code/BasicFilters/otbPointSetToPointSetFilter.h
rename to Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
diff --git a/Code/BasicFilters/otbPointSetToPointSetFilter.txx b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbPointSetToPointSetFilter.txx
rename to Modules/Core/PointSet/include/otbPointSetToPointSetFilter.txx
diff --git a/Code/BasicFilters/otbRandomPointSetSource.h b/Modules/Core/PointSet/include/otbRandomPointSetSource.h
similarity index 100%
rename from Code/BasicFilters/otbRandomPointSetSource.h
rename to Modules/Core/PointSet/include/otbRandomPointSetSource.h
diff --git a/Code/BasicFilters/otbRandomPointSetSource.txx b/Modules/Core/PointSet/include/otbRandomPointSetSource.txx
similarity index 100%
rename from Code/BasicFilters/otbRandomPointSetSource.txx
rename to Modules/Core/PointSet/include/otbRandomPointSetSource.txx
diff --git a/Code/FeatureExtraction/otbSimplePointCountStrategy.h b/Modules/Core/PointSet/include/otbSimplePointCountStrategy.h
similarity index 100%
rename from Code/FeatureExtraction/otbSimplePointCountStrategy.h
rename to Modules/Core/PointSet/include/otbSimplePointCountStrategy.h
diff --git a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbThresholdImageToPointSetFilter.h
rename to Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
diff --git a/Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbThresholdImageToPointSetFilter.txx
rename to Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.txx
diff --git a/Code/BasicFilters/otbTransformPointSetFilter.h b/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
similarity index 100%
rename from Code/BasicFilters/otbTransformPointSetFilter.h
rename to Modules/Core/PointSet/include/otbTransformPointSetFilter.h
diff --git a/Code/BasicFilters/otbTransformPointSetFilter.txx b/Modules/Core/PointSet/include/otbTransformPointSetFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbTransformPointSetFilter.txx
rename to Modules/Core/PointSet/include/otbTransformPointSetFilter.txx
diff --git a/Testing/Code/BasicFilters/otbImageToPointSetFilterTest.cxx b/Modules/Core/PointSet/test/otbImageToPointSetFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbImageToPointSetFilterTest.cxx
rename to Modules/Core/PointSet/test/otbImageToPointSetFilterTest.cxx
diff --git a/Testing/Code/BasicFilters/otbPointSetExtractROITest.cxx b/Modules/Core/PointSet/test/otbPointSetExtractROITest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPointSetExtractROITest.cxx
rename to Modules/Core/PointSet/test/otbPointSetExtractROITest.cxx
diff --git a/Testing/Code/Common/otbPointSetSourceTest.cxx b/Modules/Core/PointSet/test/otbPointSetSourceTest.cxx
similarity index 100%
rename from Testing/Code/Common/otbPointSetSourceTest.cxx
rename to Modules/Core/PointSet/test/otbPointSetSourceTest.cxx
diff --git a/Testing/Code/BasicFilters/otbRandomPointSetSourceTest.cxx b/Modules/Core/PointSet/test/otbRandomPointSetSourceTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbRandomPointSetSourceTest.cxx
rename to Modules/Core/PointSet/test/otbRandomPointSetSourceTest.cxx
diff --git a/Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx b/Modules/Core/PointSet/test/otbSimplePointCountStrategyTest.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbSimplePointCountStrategyTest.cxx
rename to Modules/Core/PointSet/test/otbSimplePointCountStrategyTest.cxx
diff --git a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetFilterNew.cxx b/Modules/Core/PointSet/test/otbThresholdImageToPointSetFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbThresholdImageToPointSetFilterNew.cxx
rename to Modules/Core/PointSet/test/otbThresholdImageToPointSetFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx b/Modules/Core/PointSet/test/otbThresholdImageToPointSetTest.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
rename to Modules/Core/PointSet/test/otbThresholdImageToPointSetTest.cxx
diff --git a/Testing/Code/BasicFilters/otbTransformPointSetFilterTest.cxx b/Modules/Core/PointSet/test/otbTransformPointSetFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbTransformPointSetFilterTest.cxx
rename to Modules/Core/PointSet/test/otbTransformPointSetFilterTest.cxx
diff --git a/Code/Common/otbDrawLineSpatialObjectFilter.h b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
similarity index 100%
rename from Code/Common/otbDrawLineSpatialObjectFilter.h
rename to Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
diff --git a/Code/Common/otbDrawLineSpatialObjectFilter.txx b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.txx
similarity index 100%
rename from Code/Common/otbDrawLineSpatialObjectFilter.txx
rename to Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.txx
diff --git a/Code/Common/otbDrawLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
similarity index 100%
rename from Code/Common/otbDrawLineSpatialObjectListFilter.h
rename to Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
diff --git a/Code/Common/otbDrawLineSpatialObjectListFilter.txx b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.txx
similarity index 100%
rename from Code/Common/otbDrawLineSpatialObjectListFilter.txx
rename to Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.txx
diff --git a/Code/FeatureExtraction/otbFillGapsFilter.h b/Modules/Core/SpatialObjects/include/otbFillGapsFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbFillGapsFilter.h
rename to Modules/Core/SpatialObjects/include/otbFillGapsFilter.h
diff --git a/Code/Common/otbImageToLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
similarity index 100%
rename from Code/Common/otbImageToLineSpatialObjectListFilter.h
rename to Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
diff --git a/Code/Common/otbImageToLineSpatialObjectListFilter.txx b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.txx
similarity index 100%
rename from Code/Common/otbImageToLineSpatialObjectListFilter.txx
rename to Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.txx
diff --git a/Code/Common/otbLineSpatialObject.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
similarity index 100%
rename from Code/Common/otbLineSpatialObject.h
rename to Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
diff --git a/Code/Common/otbLineSpatialObject.txx b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.txx
similarity index 100%
rename from Code/Common/otbLineSpatialObject.txx
rename to Modules/Core/SpatialObjects/include/otbLineSpatialObject.txx
diff --git a/Code/Common/otbLineSpatialObjectList.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h
similarity index 100%
rename from Code/Common/otbLineSpatialObjectList.h
rename to Modules/Core/SpatialObjects/include/otbLineSpatialObjectList.h
diff --git a/Code/Common/otbLineSpatialObjectListToPointSetFilter.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
similarity index 100%
rename from Code/Common/otbLineSpatialObjectListToPointSetFilter.h
rename to Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
diff --git a/Code/Common/otbLineSpatialObjectListToPointSetFilter.txx b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.txx
similarity index 100%
rename from Code/Common/otbLineSpatialObjectListToPointSetFilter.txx
rename to Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.txx
diff --git a/Code/Common/otbSpatialObjectSource.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
similarity index 100%
rename from Code/Common/otbSpatialObjectSource.h
rename to Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
diff --git a/Code/Common/otbSpatialObjectSource.txx b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.txx
similarity index 100%
rename from Code/Common/otbSpatialObjectSource.txx
rename to Modules/Core/SpatialObjects/include/otbSpatialObjectSource.txx
diff --git a/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
similarity index 100%
rename from Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.h
rename to Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
diff --git a/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx
rename to Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.txx
diff --git a/Code/FeatureExtraction/otbFillGapsFilter.cxx b/Modules/Core/SpatialObjects/src/otbFillGapsFilter.cxx
similarity index 100%
rename from Code/FeatureExtraction/otbFillGapsFilter.cxx
rename to Modules/Core/SpatialObjects/src/otbFillGapsFilter.cxx
diff --git a/Testing/Code/Common/otbDrawLineSpatialObject.cxx b/Modules/Core/SpatialObjects/test/otbDrawLineSpatialObject.cxx
similarity index 100%
rename from Testing/Code/Common/otbDrawLineSpatialObject.cxx
rename to Modules/Core/SpatialObjects/test/otbDrawLineSpatialObject.cxx
diff --git a/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx b/Modules/Core/SpatialObjects/test/otbDrawLineSpatialObjectList.cxx
similarity index 100%
rename from Testing/Code/Common/otbDrawLineSpatialObjectList.cxx
rename to Modules/Core/SpatialObjects/test/otbDrawLineSpatialObjectList.cxx
diff --git a/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx b/Modules/Core/SpatialObjects/test/otbDrawLineSpatialObjectListNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx
rename to Modules/Core/SpatialObjects/test/otbDrawLineSpatialObjectListNew.cxx
diff --git a/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx b/Modules/Core/SpatialObjects/test/otbDrawLineSpatialObjectNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx
rename to Modules/Core/SpatialObjects/test/otbDrawLineSpatialObjectNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx b/Modules/Core/SpatialObjects/test/otbFillGapsFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
rename to Modules/Core/SpatialObjects/test/otbFillGapsFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbFillGapsFilterNew.cxx b/Modules/Core/SpatialObjects/test/otbFillGapsFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbFillGapsFilterNew.cxx
rename to Modules/Core/SpatialObjects/test/otbFillGapsFilterNew.cxx
diff --git a/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx b/Modules/Core/SpatialObjects/test/otbImageToLineSpatialObjectListNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx
rename to Modules/Core/SpatialObjects/test/otbImageToLineSpatialObjectListNew.cxx
diff --git a/Testing/Code/Common/otbLineSpatialObjectList.cxx b/Modules/Core/SpatialObjects/test/otbLineSpatialObjectList.cxx
similarity index 100%
rename from Testing/Code/Common/otbLineSpatialObjectList.cxx
rename to Modules/Core/SpatialObjects/test/otbLineSpatialObjectList.cxx
diff --git a/Testing/Code/Common/otbLineSpatialObjectListToPointSetFilterNew.cxx b/Modules/Core/SpatialObjects/test/otbLineSpatialObjectListToPointSetFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbLineSpatialObjectListToPointSetFilterNew.cxx
rename to Modules/Core/SpatialObjects/test/otbLineSpatialObjectListToPointSetFilterNew.cxx
diff --git a/Testing/Code/Common/otbLineSpatialObjectNew.cxx b/Modules/Core/SpatialObjects/test/otbLineSpatialObjectNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbLineSpatialObjectNew.cxx
rename to Modules/Core/SpatialObjects/test/otbLineSpatialObjectNew.cxx
diff --git a/Testing/Code/Common/otbSpatialObjectSourceNew.cxx b/Modules/Core/SpatialObjects/test/otbSpatialObjectSourceNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbSpatialObjectSourceNew.cxx
rename to Modules/Core/SpatialObjects/test/otbSpatialObjectSourceNew.cxx
diff --git a/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.cxx b/Modules/Core/SpatialObjects/test/otbSpatialObjectToImageDrawingFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.cxx
rename to Modules/Core/SpatialObjects/test/otbSpatialObjectToImageDrawingFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilterNew.cxx b/Modules/Core/SpatialObjects/test/otbSpatialObjectToImageDrawingFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbSpatialObjectToImageDrawingFilterNew.cxx
rename to Modules/Core/SpatialObjects/test/otbSpatialObjectToImageDrawingFilterNew.cxx
diff --git a/Code/Common/otbNumberOfDivisionsStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
similarity index 100%
rename from Code/Common/otbNumberOfDivisionsStrippedStreamingManager.h
rename to Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
diff --git a/Code/Common/otbNumberOfDivisionsStrippedStreamingManager.txx b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.txx
similarity index 100%
rename from Code/Common/otbNumberOfDivisionsStrippedStreamingManager.txx
rename to Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.txx
diff --git a/Code/Common/otbNumberOfDivisionsTiledStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
similarity index 100%
rename from Code/Common/otbNumberOfDivisionsTiledStreamingManager.h
rename to Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
diff --git a/Code/Common/otbNumberOfDivisionsTiledStreamingManager.txx b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.txx
similarity index 100%
rename from Code/Common/otbNumberOfDivisionsTiledStreamingManager.txx
rename to Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.txx
diff --git a/Code/Common/otbNumberOfLinesStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
similarity index 100%
rename from Code/Common/otbNumberOfLinesStrippedStreamingManager.h
rename to Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
diff --git a/Code/Common/otbNumberOfLinesStrippedStreamingManager.txx b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.txx
similarity index 100%
rename from Code/Common/otbNumberOfLinesStrippedStreamingManager.txx
rename to Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.txx
diff --git a/Code/Common/otbPersistentFilterStreamingDecorator.h b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
similarity index 100%
rename from Code/Common/otbPersistentFilterStreamingDecorator.h
rename to Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
diff --git a/Code/Common/otbPersistentFilterStreamingDecorator.txx b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.txx
similarity index 100%
rename from Code/Common/otbPersistentFilterStreamingDecorator.txx
rename to Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.txx
diff --git a/Code/Common/otbPersistentImageFilter.h b/Modules/Core/Streaming/include/otbPersistentImageFilter.h
similarity index 100%
rename from Code/Common/otbPersistentImageFilter.h
rename to Modules/Core/Streaming/include/otbPersistentImageFilter.h
diff --git a/Code/Common/otbPipelineMemoryPrintCalculator.h b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
similarity index 100%
rename from Code/Common/otbPipelineMemoryPrintCalculator.h
rename to Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
diff --git a/Code/Common/otbRAMDrivenAdaptativeStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
similarity index 100%
rename from Code/Common/otbRAMDrivenAdaptativeStreamingManager.h
rename to Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
diff --git a/Code/Common/otbRAMDrivenAdaptativeStreamingManager.txx b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.txx
similarity index 100%
rename from Code/Common/otbRAMDrivenAdaptativeStreamingManager.txx
rename to Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.txx
diff --git a/Code/Common/otbRAMDrivenStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
similarity index 100%
rename from Code/Common/otbRAMDrivenStrippedStreamingManager.h
rename to Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
diff --git a/Code/Common/otbRAMDrivenStrippedStreamingManager.txx b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.txx
similarity index 100%
rename from Code/Common/otbRAMDrivenStrippedStreamingManager.txx
rename to Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.txx
diff --git a/Code/Common/otbRAMDrivenTiledStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
similarity index 100%
rename from Code/Common/otbRAMDrivenTiledStreamingManager.h
rename to Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
diff --git a/Code/Common/otbRAMDrivenTiledStreamingManager.txx b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.txx
similarity index 100%
rename from Code/Common/otbRAMDrivenTiledStreamingManager.txx
rename to Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.txx
diff --git a/Code/IO/otbStreamingImageVirtualWriter.h b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
similarity index 100%
rename from Code/IO/otbStreamingImageVirtualWriter.h
rename to Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
diff --git a/Code/IO/otbStreamingImageVirtualWriter.txx b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.txx
similarity index 100%
rename from Code/IO/otbStreamingImageVirtualWriter.txx
rename to Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.txx
diff --git a/Code/Common/otbStreamingManager.h b/Modules/Core/Streaming/include/otbStreamingManager.h
similarity index 100%
rename from Code/Common/otbStreamingManager.h
rename to Modules/Core/Streaming/include/otbStreamingManager.h
diff --git a/Code/Common/otbStreamingManager.txx b/Modules/Core/Streaming/include/otbStreamingManager.txx
similarity index 100%
rename from Code/Common/otbStreamingManager.txx
rename to Modules/Core/Streaming/include/otbStreamingManager.txx
diff --git a/Code/Common/otbTileDimensionTiledStreamingManager.h b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
similarity index 100%
rename from Code/Common/otbTileDimensionTiledStreamingManager.h
rename to Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
diff --git a/Code/Common/otbTileDimensionTiledStreamingManager.txx b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.txx
similarity index 100%
rename from Code/Common/otbTileDimensionTiledStreamingManager.txx
rename to Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.txx
diff --git a/Code/Common/otbPipelineMemoryPrintCalculator.cxx b/Modules/Core/Streaming/src/otbPipelineMemoryPrintCalculator.cxx
similarity index 100%
rename from Code/Common/otbPipelineMemoryPrintCalculator.cxx
rename to Modules/Core/Streaming/src/otbPipelineMemoryPrintCalculator.cxx
diff --git a/Testing/Code/Common/otbStreamingManager.cxx b/Modules/Core/Streaming/test/otbStreamingManager.cxx
similarity index 100%
rename from Testing/Code/Common/otbStreamingManager.cxx
rename to Modules/Core/Streaming/test/otbStreamingManager.cxx
diff --git a/Code/Projections/otbCompositeTransform.h b/Modules/Core/Transform/include/otbCompositeTransform.h
similarity index 100%
rename from Code/Projections/otbCompositeTransform.h
rename to Modules/Core/Transform/include/otbCompositeTransform.h
diff --git a/Code/Projections/otbCompositeTransform.txx b/Modules/Core/Transform/include/otbCompositeTransform.txx
similarity index 100%
rename from Code/Projections/otbCompositeTransform.txx
rename to Modules/Core/Transform/include/otbCompositeTransform.txx
diff --git a/Code/Projections/otbForwardSensorModel.h b/Modules/Core/Transform/include/otbForwardSensorModel.h
similarity index 100%
rename from Code/Projections/otbForwardSensorModel.h
rename to Modules/Core/Transform/include/otbForwardSensorModel.h
diff --git a/Code/Projections/otbForwardSensorModel.txx b/Modules/Core/Transform/include/otbForwardSensorModel.txx
similarity index 100%
rename from Code/Projections/otbForwardSensorModel.txx
rename to Modules/Core/Transform/include/otbForwardSensorModel.txx
diff --git a/Code/Projections/otbGenericMapProjection.h b/Modules/Core/Transform/include/otbGenericMapProjection.h
similarity index 100%
rename from Code/Projections/otbGenericMapProjection.h
rename to Modules/Core/Transform/include/otbGenericMapProjection.h
diff --git a/Code/Projections/otbGenericMapProjection.txx b/Modules/Core/Transform/include/otbGenericMapProjection.txx
similarity index 100%
rename from Code/Projections/otbGenericMapProjection.txx
rename to Modules/Core/Transform/include/otbGenericMapProjection.txx
diff --git a/Code/Projections/otbGenericRSTransform.h b/Modules/Core/Transform/include/otbGenericRSTransform.h
similarity index 100%
rename from Code/Projections/otbGenericRSTransform.h
rename to Modules/Core/Transform/include/otbGenericRSTransform.h
diff --git a/Code/Projections/otbGenericRSTransform.txx b/Modules/Core/Transform/include/otbGenericRSTransform.txx
similarity index 100%
rename from Code/Projections/otbGenericRSTransform.txx
rename to Modules/Core/Transform/include/otbGenericRSTransform.txx
diff --git a/Code/Common/otbGeoInformationConversion.h b/Modules/Core/Transform/include/otbGeoInformationConversion.h
similarity index 100%
rename from Code/Common/otbGeoInformationConversion.h
rename to Modules/Core/Transform/include/otbGeoInformationConversion.h
diff --git a/Code/Projections/otbGeocentricTransform.h b/Modules/Core/Transform/include/otbGeocentricTransform.h
similarity index 100%
rename from Code/Projections/otbGeocentricTransform.h
rename to Modules/Core/Transform/include/otbGeocentricTransform.h
diff --git a/Code/Projections/otbGeocentricTransform.txx b/Modules/Core/Transform/include/otbGeocentricTransform.txx
similarity index 100%
rename from Code/Projections/otbGeocentricTransform.txx
rename to Modules/Core/Transform/include/otbGeocentricTransform.txx
diff --git a/Code/Projections/otbImageToGenericRSOutputParameters.h b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
similarity index 100%
rename from Code/Projections/otbImageToGenericRSOutputParameters.h
rename to Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
diff --git a/Code/Projections/otbImageToGenericRSOutputParameters.txx b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.txx
similarity index 100%
rename from Code/Projections/otbImageToGenericRSOutputParameters.txx
rename to Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.txx
diff --git a/Code/Projections/otbInverseSensorModel.h b/Modules/Core/Transform/include/otbInverseSensorModel.h
similarity index 100%
rename from Code/Projections/otbInverseSensorModel.h
rename to Modules/Core/Transform/include/otbInverseSensorModel.h
diff --git a/Code/Projections/otbInverseSensorModel.txx b/Modules/Core/Transform/include/otbInverseSensorModel.txx
similarity index 100%
rename from Code/Projections/otbInverseSensorModel.txx
rename to Modules/Core/Transform/include/otbInverseSensorModel.txx
diff --git a/Code/BasicFilters/otbLogPolarTransform.h b/Modules/Core/Transform/include/otbLogPolarTransform.h
similarity index 100%
rename from Code/BasicFilters/otbLogPolarTransform.h
rename to Modules/Core/Transform/include/otbLogPolarTransform.h
diff --git a/Code/BasicFilters/otbLogPolarTransform.txx b/Modules/Core/Transform/include/otbLogPolarTransform.txx
similarity index 100%
rename from Code/BasicFilters/otbLogPolarTransform.txx
rename to Modules/Core/Transform/include/otbLogPolarTransform.txx
diff --git a/Code/Projections/otbSensorModelBase.h b/Modules/Core/Transform/include/otbSensorModelBase.h
similarity index 100%
rename from Code/Projections/otbSensorModelBase.h
rename to Modules/Core/Transform/include/otbSensorModelBase.h
diff --git a/Code/Projections/otbSensorModelBase.txx b/Modules/Core/Transform/include/otbSensorModelBase.txx
similarity index 100%
rename from Code/Projections/otbSensorModelBase.txx
rename to Modules/Core/Transform/include/otbSensorModelBase.txx
diff --git a/Code/DisparityMap/otbStreamingWarpImageFilter.h b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
similarity index 100%
rename from Code/DisparityMap/otbStreamingWarpImageFilter.h
rename to Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
diff --git a/Code/DisparityMap/otbStreamingWarpImageFilter.txx b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbStreamingWarpImageFilter.txx
rename to Modules/Core/Transform/include/otbStreamingWarpImageFilter.txx
diff --git a/Code/Common/otbTransform.h b/Modules/Core/Transform/include/otbTransform.h
similarity index 100%
rename from Code/Common/otbTransform.h
rename to Modules/Core/Transform/include/otbTransform.h
diff --git a/Code/Common/otbGeoInformationConversion.cxx b/Modules/Core/Transform/src/otbGeoInformationConversion.cxx
similarity index 100%
rename from Code/Common/otbGeoInformationConversion.cxx
rename to Modules/Core/Transform/src/otbGeoInformationConversion.cxx
diff --git a/Testing/Fa/SensorModelBorder.cxx b/Modules/Core/Transform/test/SensorModelBorder.cxx
similarity index 100%
rename from Testing/Fa/SensorModelBorder.cxx
rename to Modules/Core/Transform/test/SensorModelBorder.cxx
diff --git a/Testing/Code/Projections/otbCreateInverseForwardSensorModel.cxx b/Modules/Core/Transform/test/otbCreateInverseForwardSensorModel.cxx
similarity index 100%
rename from Testing/Code/Projections/otbCreateInverseForwardSensorModel.cxx
rename to Modules/Core/Transform/test/otbCreateInverseForwardSensorModel.cxx
diff --git a/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx b/Modules/Core/Transform/test/otbCreateProjectionWithOSSIM.cxx
similarity index 100%
rename from Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
rename to Modules/Core/Transform/test/otbCreateProjectionWithOSSIM.cxx
diff --git a/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx b/Modules/Core/Transform/test/otbCreateProjectionWithOTB.cxx
similarity index 100%
rename from Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
rename to Modules/Core/Transform/test/otbCreateProjectionWithOTB.cxx
diff --git a/Testing/Code/Projections/otbForwardBackwardProjectionConsistency.cxx b/Modules/Core/Transform/test/otbForwardBackwardProjectionConsistency.cxx
similarity index 100%
rename from Testing/Code/Projections/otbForwardBackwardProjectionConsistency.cxx
rename to Modules/Core/Transform/test/otbForwardBackwardProjectionConsistency.cxx
diff --git a/Testing/Code/Projections/otbForwardSensorModelGrid.cxx b/Modules/Core/Transform/test/otbForwardSensorModelGrid.cxx
similarity index 100%
rename from Testing/Code/Projections/otbForwardSensorModelGrid.cxx
rename to Modules/Core/Transform/test/otbForwardSensorModelGrid.cxx
diff --git a/Testing/Code/Projections/otbGenericMapProjection.cxx b/Modules/Core/Transform/test/otbGenericMapProjection.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGenericMapProjection.cxx
rename to Modules/Core/Transform/test/otbGenericMapProjection.cxx
diff --git a/Testing/Code/Projections/otbGenericMapProjectionNew.cxx b/Modules/Core/Transform/test/otbGenericMapProjectionNew.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGenericMapProjectionNew.cxx
rename to Modules/Core/Transform/test/otbGenericMapProjectionNew.cxx
diff --git a/Testing/Code/Projections/otbGenericRSTransform.cxx b/Modules/Core/Transform/test/otbGenericRSTransform.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGenericRSTransform.cxx
rename to Modules/Core/Transform/test/otbGenericRSTransform.cxx
diff --git a/Testing/Code/Projections/otbGenericRSTransformNew.cxx b/Modules/Core/Transform/test/otbGenericRSTransformNew.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGenericRSTransformNew.cxx
rename to Modules/Core/Transform/test/otbGenericRSTransformNew.cxx
diff --git a/Testing/Code/Projections/otbGenericRSTransformWithSRID.cxx b/Modules/Core/Transform/test/otbGenericRSTransformWithSRID.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGenericRSTransformWithSRID.cxx
rename to Modules/Core/Transform/test/otbGenericRSTransformWithSRID.cxx
diff --git a/Testing/Code/Projections/otbGeocentricTransform.cxx b/Modules/Core/Transform/test/otbGeocentricTransform.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGeocentricTransform.cxx
rename to Modules/Core/Transform/test/otbGeocentricTransform.cxx
diff --git a/Testing/Code/Projections/otbGeocentricTransformNew.cxx b/Modules/Core/Transform/test/otbGeocentricTransformNew.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGeocentricTransformNew.cxx
rename to Modules/Core/Transform/test/otbGeocentricTransformNew.cxx
diff --git a/Testing/Code/BasicFilters/otbLogPolarTransform.cxx b/Modules/Core/Transform/test/otbLogPolarTransform.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLogPolarTransform.cxx
rename to Modules/Core/Transform/test/otbLogPolarTransform.cxx
diff --git a/Testing/Code/BasicFilters/otbLogPolarTransformNew.cxx b/Modules/Core/Transform/test/otbLogPolarTransformNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLogPolarTransformNew.cxx
rename to Modules/Core/Transform/test/otbLogPolarTransformNew.cxx
diff --git a/Testing/Code/BasicFilters/otbLogPolarTransformResample.cxx b/Modules/Core/Transform/test/otbLogPolarTransformResample.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLogPolarTransformResample.cxx
rename to Modules/Core/Transform/test/otbLogPolarTransformResample.cxx
diff --git a/Testing/Code/Projections/otbSensorModel.cxx b/Modules/Core/Transform/test/otbSensorModel.cxx
similarity index 100%
rename from Testing/Code/Projections/otbSensorModel.cxx
rename to Modules/Core/Transform/test/otbSensorModel.cxx
diff --git a/Testing/Code/Projections/otbSensorModelGrid.cxx b/Modules/Core/Transform/test/otbSensorModelGrid.cxx
similarity index 100%
rename from Testing/Code/Projections/otbSensorModelGrid.cxx
rename to Modules/Core/Transform/test/otbSensorModelGrid.cxx
diff --git a/Testing/Code/Projections/otbSensorModelsNew.cxx b/Modules/Core/Transform/test/otbSensorModelsNew.cxx
similarity index 100%
rename from Testing/Code/Projections/otbSensorModelsNew.cxx
rename to Modules/Core/Transform/test/otbSensorModelsNew.cxx
diff --git a/Testing/Code/DisparityMap/otbStreamingWarpImageFilter.cxx b/Modules/Core/Transform/test/otbStreamingWarpImageFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbStreamingWarpImageFilter.cxx
rename to Modules/Core/Transform/test/otbStreamingWarpImageFilter.cxx
diff --git a/Testing/Code/DisparityMap/otbStreamingWarpImageFilterNew.cxx b/Modules/Core/Transform/test/otbStreamingWarpImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbStreamingWarpImageFilterNew.cxx
rename to Modules/Core/Transform/test/otbStreamingWarpImageFilterNew.cxx
diff --git a/Code/Common/otbDataNode.h b/Modules/Core/VectorDataBase/include/otbDataNode.h
similarity index 100%
rename from Code/Common/otbDataNode.h
rename to Modules/Core/VectorDataBase/include/otbDataNode.h
diff --git a/Code/Common/otbDataNode.txx b/Modules/Core/VectorDataBase/include/otbDataNode.txx
similarity index 100%
rename from Code/Common/otbDataNode.txx
rename to Modules/Core/VectorDataBase/include/otbDataNode.txx
diff --git a/Code/Common/otbDataNodeFunctionBase.h b/Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h
similarity index 100%
rename from Code/Common/otbDataNodeFunctionBase.h
rename to Modules/Core/VectorDataBase/include/otbDataNodeFunctionBase.h
diff --git a/Code/Common/otbDataNodeImageFunction.h b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
similarity index 100%
rename from Code/Common/otbDataNodeImageFunction.h
rename to Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
diff --git a/Code/Common/otbDataNodeImageFunction.txx b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.txx
similarity index 100%
rename from Code/Common/otbDataNodeImageFunction.txx
rename to Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.txx
diff --git a/Code/Common/otbDataNodeVectorDataFunction.h b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
similarity index 100%
rename from Code/Common/otbDataNodeVectorDataFunction.h
rename to Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
diff --git a/Code/Common/otbDataNodeVectorDataFunction.txx b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.txx
similarity index 100%
rename from Code/Common/otbDataNodeVectorDataFunction.txx
rename to Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.txx
diff --git a/Code/Common/otbGISConnectionImplementation.h b/Modules/Core/VectorDataBase/include/otbGISConnectionImplementation.h
similarity index 100%
rename from Code/Common/otbGISConnectionImplementation.h
rename to Modules/Core/VectorDataBase/include/otbGISConnectionImplementation.h
diff --git a/Code/Common/otbGISTable.h b/Modules/Core/VectorDataBase/include/otbGISTable.h
similarity index 100%
rename from Code/Common/otbGISTable.h
rename to Modules/Core/VectorDataBase/include/otbGISTable.h
diff --git a/Code/Common/otbGISTable.txx b/Modules/Core/VectorDataBase/include/otbGISTable.txx
similarity index 100%
rename from Code/Common/otbGISTable.txx
rename to Modules/Core/VectorDataBase/include/otbGISTable.txx
diff --git a/Code/Common/otbGISTableSource.h b/Modules/Core/VectorDataBase/include/otbGISTableSource.h
similarity index 100%
rename from Code/Common/otbGISTableSource.h
rename to Modules/Core/VectorDataBase/include/otbGISTableSource.h
diff --git a/Code/Common/otbGISTableSource.txx b/Modules/Core/VectorDataBase/include/otbGISTableSource.txx
similarity index 100%
rename from Code/Common/otbGISTableSource.txx
rename to Modules/Core/VectorDataBase/include/otbGISTableSource.txx
diff --git a/Code/Common/otbPolyLineParametricPathWithValue.h b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
similarity index 100%
rename from Code/Common/otbPolyLineParametricPathWithValue.h
rename to Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
diff --git a/Code/Common/otbPolyLineParametricPathWithValue.txx b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.txx
similarity index 100%
rename from Code/Common/otbPolyLineParametricPathWithValue.txx
rename to Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.txx
diff --git a/Code/Common/otbPolygon.h b/Modules/Core/VectorDataBase/include/otbPolygon.h
similarity index 100%
rename from Code/Common/otbPolygon.h
rename to Modules/Core/VectorDataBase/include/otbPolygon.h
diff --git a/Code/Common/otbPolygon.txx b/Modules/Core/VectorDataBase/include/otbPolygon.txx
similarity index 100%
rename from Code/Common/otbPolygon.txx
rename to Modules/Core/VectorDataBase/include/otbPolygon.txx
diff --git a/Code/Common/otbRemoteSensingRegion.h b/Modules/Core/VectorDataBase/include/otbRemoteSensingRegion.h
similarity index 100%
rename from Code/Common/otbRemoteSensingRegion.h
rename to Modules/Core/VectorDataBase/include/otbRemoteSensingRegion.h
diff --git a/Code/Common/otbVectorData.h b/Modules/Core/VectorDataBase/include/otbVectorData.h
similarity index 100%
rename from Code/Common/otbVectorData.h
rename to Modules/Core/VectorDataBase/include/otbVectorData.h
diff --git a/Code/Common/otbVectorData.txx b/Modules/Core/VectorDataBase/include/otbVectorData.txx
similarity index 100%
rename from Code/Common/otbVectorData.txx
rename to Modules/Core/VectorDataBase/include/otbVectorData.txx
diff --git a/Code/IO/otbVectorDataIOBase.h b/Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h
similarity index 100%
rename from Code/IO/otbVectorDataIOBase.h
rename to Modules/Core/VectorDataBase/include/otbVectorDataIOBase.h
diff --git a/Code/IO/otbVectorDataKeywordlist.h b/Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h
similarity index 100%
rename from Code/IO/otbVectorDataKeywordlist.h
rename to Modules/Core/VectorDataBase/include/otbVectorDataKeywordlist.h
diff --git a/Code/Common/otbVectorDataProperties.h b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
similarity index 100%
rename from Code/Common/otbVectorDataProperties.h
rename to Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
diff --git a/Code/Common/otbVectorDataProperties.txx b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.txx
similarity index 100%
rename from Code/Common/otbVectorDataProperties.txx
rename to Modules/Core/VectorDataBase/include/otbVectorDataProperties.txx
diff --git a/Code/Common/otbVectorDataSource.h b/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
similarity index 100%
rename from Code/Common/otbVectorDataSource.h
rename to Modules/Core/VectorDataBase/include/otbVectorDataSource.h
diff --git a/Code/Common/otbVectorDataSource.txx b/Modules/Core/VectorDataBase/include/otbVectorDataSource.txx
similarity index 100%
rename from Code/Common/otbVectorDataSource.txx
rename to Modules/Core/VectorDataBase/include/otbVectorDataSource.txx
diff --git a/Code/IO/otbVectorDataIOBase.cxx b/Modules/Core/VectorDataBase/src/otbVectorDataIOBase.cxx
similarity index 100%
rename from Code/IO/otbVectorDataIOBase.cxx
rename to Modules/Core/VectorDataBase/src/otbVectorDataIOBase.cxx
diff --git a/Code/IO/otbVectorDataKeywordlist.cxx b/Modules/Core/VectorDataBase/src/otbVectorDataKeywordlist.cxx
similarity index 100%
rename from Code/IO/otbVectorDataKeywordlist.cxx
rename to Modules/Core/VectorDataBase/src/otbVectorDataKeywordlist.cxx
diff --git a/Testing/Code/Common/otbDataNodeTest.cxx b/Modules/Core/VectorDataBase/test/otbDataNodeTest.cxx
similarity index 100%
rename from Testing/Code/Common/otbDataNodeTest.cxx
rename to Modules/Core/VectorDataBase/test/otbDataNodeTest.cxx
diff --git a/Testing/Code/Common/otbObjectList2.cxx b/Modules/Core/VectorDataBase/test/otbObjectList2.cxx
similarity index 100%
rename from Testing/Code/Common/otbObjectList2.cxx
rename to Modules/Core/VectorDataBase/test/otbObjectList2.cxx
diff --git a/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx b/Modules/Core/VectorDataBase/test/otbObjectListToObjectListFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx
rename to Modules/Core/VectorDataBase/test/otbObjectListToObjectListFilterNew.cxx
diff --git a/Testing/Code/Common/otbPolyLineParametricPathWithValueNew.cxx b/Modules/Core/VectorDataBase/test/otbPolyLineParametricPathWithValueNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbPolyLineParametricPathWithValueNew.cxx
rename to Modules/Core/VectorDataBase/test/otbPolyLineParametricPathWithValueNew.cxx
diff --git a/Testing/Code/Common/otbPolygon.cxx b/Modules/Core/VectorDataBase/test/otbPolygon.cxx
similarity index 100%
rename from Testing/Code/Common/otbPolygon.cxx
rename to Modules/Core/VectorDataBase/test/otbPolygon.cxx
diff --git a/Testing/Code/Common/otbPolygonNew.cxx b/Modules/Core/VectorDataBase/test/otbPolygonNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbPolygonNew.cxx
rename to Modules/Core/VectorDataBase/test/otbPolygonNew.cxx
diff --git a/Testing/Code/Common/otbRemoteSensingRegion.cxx b/Modules/Core/VectorDataBase/test/otbRemoteSensingRegion.cxx
similarity index 100%
rename from Testing/Code/Common/otbRemoteSensingRegion.cxx
rename to Modules/Core/VectorDataBase/test/otbRemoteSensingRegion.cxx
diff --git a/Testing/Code/Common/otbRemoteSensingRegionNew.cxx b/Modules/Core/VectorDataBase/test/otbRemoteSensingRegionNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbRemoteSensingRegionNew.cxx
rename to Modules/Core/VectorDataBase/test/otbRemoteSensingRegionNew.cxx
diff --git a/Testing/Code/Common/otbVectorData.cxx b/Modules/Core/VectorDataBase/test/otbVectorData.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorData.cxx
rename to Modules/Core/VectorDataBase/test/otbVectorData.cxx
diff --git a/Testing/Code/IO/otbVectorDataKeywordlistTest.cxx b/Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorDataKeywordlistTest.cxx
rename to Modules/Core/VectorDataBase/test/otbVectorDataKeywordlistTest.cxx
diff --git a/Testing/Code/Common/otbVectorDataNew.cxx b/Modules/Core/VectorDataBase/test/otbVectorDataNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataNew.cxx
rename to Modules/Core/VectorDataBase/test/otbVectorDataNew.cxx
diff --git a/Testing/Code/Common/otbVectorDataSourceNew.cxx b/Modules/Core/VectorDataBase/test/otbVectorDataSourceNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataSourceNew.cxx
rename to Modules/Core/VectorDataBase/test/otbVectorDataSourceNew.cxx
diff --git a/Code/FeatureExtraction/otbCloudDetectionFilter.h b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbCloudDetectionFilter.h
rename to Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
diff --git a/Code/FeatureExtraction/otbCloudDetectionFilter.txx b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbCloudDetectionFilter.txx
rename to Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.txx
diff --git a/Code/FeatureExtraction/otbCloudDetectionFunctor.h b/Modules/Detection/CloudDetection/include/otbCloudDetectionFunctor.h
similarity index 100%
rename from Code/FeatureExtraction/otbCloudDetectionFunctor.h
rename to Modules/Detection/CloudDetection/include/otbCloudDetectionFunctor.h
diff --git a/Code/FeatureExtraction/otbCloudEstimatorFilter.h b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbCloudEstimatorFilter.h
rename to Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
diff --git a/Code/FeatureExtraction/otbCloudEstimatorFilter.txx b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbCloudEstimatorFilter.txx
rename to Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.txx
diff --git a/Code/FeatureExtraction/otbCloudEstimatorFunctor.h b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFunctor.h
similarity index 100%
rename from Code/FeatureExtraction/otbCloudEstimatorFunctor.h
rename to Modules/Detection/CloudDetection/include/otbCloudEstimatorFunctor.h
diff --git a/Testing/Code/FeatureExtraction/otbCloudDetectionFilter.cxx b/Modules/Detection/CloudDetection/test/otbCloudDetectionFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbCloudDetectionFilter.cxx
rename to Modules/Detection/CloudDetection/test/otbCloudDetectionFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbCloudDetectionFilterNew.cxx b/Modules/Detection/CloudDetection/test/otbCloudDetectionFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbCloudDetectionFilterNew.cxx
rename to Modules/Detection/CloudDetection/test/otbCloudDetectionFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbCloudEstimatorDefaultFilter.cxx b/Modules/Detection/CloudDetection/test/otbCloudEstimatorDefaultFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbCloudEstimatorDefaultFilter.cxx
rename to Modules/Detection/CloudDetection/test/otbCloudEstimatorDefaultFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbCloudEstimatorFilter.cxx b/Modules/Detection/CloudDetection/test/otbCloudEstimatorFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbCloudEstimatorFilter.cxx
rename to Modules/Detection/CloudDetection/test/otbCloudEstimatorFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbCloudEstimatorFilterNew.cxx b/Modules/Detection/CloudDetection/test/otbCloudEstimatorFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbCloudEstimatorFilterNew.cxx
rename to Modules/Detection/CloudDetection/test/otbCloudEstimatorFilterNew.cxx
diff --git a/Code/ObjectDetection/otbDescriptorsListSampleGenerator.h b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
similarity index 100%
rename from Code/ObjectDetection/otbDescriptorsListSampleGenerator.h
rename to Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
diff --git a/Code/ObjectDetection/otbDescriptorsListSampleGenerator.txx b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.txx
similarity index 100%
rename from Code/ObjectDetection/otbDescriptorsListSampleGenerator.txx
rename to Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.txx
diff --git a/Code/ObjectDetection/otbFlusserMomentsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
similarity index 100%
rename from Code/ObjectDetection/otbFlusserMomentsIFFactory.h
rename to Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
diff --git a/Code/ObjectDetection/otbFlusserMomentsIFFactory.txx b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.txx
similarity index 100%
rename from Code/ObjectDetection/otbFlusserMomentsIFFactory.txx
rename to Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.txx
diff --git a/Code/ObjectDetection/otbFourierMellinDescriptorsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
similarity index 100%
rename from Code/ObjectDetection/otbFourierMellinDescriptorsIFFactory.h
rename to Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
diff --git a/Code/ObjectDetection/otbFourierMellinDescriptorsIFFactory.txx b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.txx
similarity index 100%
rename from Code/ObjectDetection/otbFourierMellinDescriptorsIFFactory.txx
rename to Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.txx
diff --git a/Code/ObjectDetection/otbHaralickTexturesIFFactory.h b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
similarity index 100%
rename from Code/ObjectDetection/otbHaralickTexturesIFFactory.h
rename to Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
diff --git a/Code/ObjectDetection/otbHaralickTexturesIFFactory.txx b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.txx
similarity index 100%
rename from Code/ObjectDetection/otbHaralickTexturesIFFactory.txx
rename to Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.txx
diff --git a/Code/ObjectDetection/otbLabeledSampleLocalizationGenerator.h b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
similarity index 100%
rename from Code/ObjectDetection/otbLabeledSampleLocalizationGenerator.h
rename to Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
diff --git a/Code/ObjectDetection/otbLabeledSampleLocalizationGenerator.txx b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.txx
similarity index 100%
rename from Code/ObjectDetection/otbLabeledSampleLocalizationGenerator.txx
rename to Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.txx
diff --git a/Code/ObjectDetection/otbLocalHistogramIFFactory.h b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
similarity index 100%
rename from Code/ObjectDetection/otbLocalHistogramIFFactory.h
rename to Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
diff --git a/Code/ObjectDetection/otbLocalHistogramIFFactory.txx b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.txx
similarity index 100%
rename from Code/ObjectDetection/otbLocalHistogramIFFactory.txx
rename to Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.txx
diff --git a/Code/ObjectDetection/otbMultiChannelIFFactory.h b/Modules/Detection/ObjectDetection/include/otbMultiChannelIFFactory.h
similarity index 100%
rename from Code/ObjectDetection/otbMultiChannelIFFactory.h
rename to Modules/Detection/ObjectDetection/include/otbMultiChannelIFFactory.h
diff --git a/Code/ObjectDetection/otbRadiometricMomentsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
similarity index 100%
rename from Code/ObjectDetection/otbRadiometricMomentsIFFactory.h
rename to Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
diff --git a/Code/ObjectDetection/otbRadiometricMomentsIFFactory.txx b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.txx
similarity index 100%
rename from Code/ObjectDetection/otbRadiometricMomentsIFFactory.txx
rename to Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.txx
diff --git a/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.h b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
similarity index 100%
rename from Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.h
rename to Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
diff --git a/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.txx b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.txx
similarity index 100%
rename from Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.txx
rename to Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.txx
diff --git a/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx b/Modules/Detection/ObjectDetection/test/otbDescriptorsListSampleGenerator.cxx
similarity index 100%
rename from Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
rename to Modules/Detection/ObjectDetection/test/otbDescriptorsListSampleGenerator.cxx
diff --git a/Testing/Code/ObjectDetection/otbLabeledSampleLocalizationGenerator.cxx b/Modules/Detection/ObjectDetection/test/otbLabeledSampleLocalizationGenerator.cxx
similarity index 100%
rename from Testing/Code/ObjectDetection/otbLabeledSampleLocalizationGenerator.cxx
rename to Modules/Detection/ObjectDetection/test/otbLabeledSampleLocalizationGenerator.cxx
diff --git a/Testing/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.cxx b/Modules/Detection/ObjectDetection/test/otbStandardMetaImageFunctionBuilder.cxx
similarity index 100%
rename from Testing/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.cxx
rename to Modules/Detection/ObjectDetection/test/otbStandardMetaImageFunctionBuilder.cxx
diff --git a/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbGenericRoadExtractionFilter.h
rename to Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
diff --git a/Code/FeatureExtraction/otbGenericRoadExtractionFilter.txx b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbGenericRoadExtractionFilter.txx
rename to Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.txx
diff --git a/Code/FeatureExtraction/otbImageToPathListAlignFilter.h b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbImageToPathListAlignFilter.h
rename to Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
diff --git a/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
rename to Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.txx
diff --git a/Code/FeatureExtraction/otbLikelihoodPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbLikelihoodPathListFilter.h
rename to Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
diff --git a/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbLikelihoodPathListFilter.txx
rename to Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.txx
diff --git a/Code/FeatureExtraction/otbLinkPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbLinkPathListFilter.h
rename to Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
diff --git a/Code/FeatureExtraction/otbLinkPathListFilter.txx b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbLinkPathListFilter.txx
rename to Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.txx
diff --git a/Code/FeatureExtraction/otbModulusAndDirectionImageToImageFilter.h b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbModulusAndDirectionImageToImageFilter.h
rename to Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
diff --git a/Code/FeatureExtraction/otbModulusAndDirectionImageToImageFilter.txx b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbModulusAndDirectionImageToImageFilter.txx
rename to Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.txx
diff --git a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h
rename to Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
diff --git a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx
rename to Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.txx
diff --git a/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h b/Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h
rename to Modules/Detection/RoadExtraction/include/otbNonMaxRemovalByDirectionFilter.h
diff --git a/Code/FeatureExtraction/otbParallelLinePathListFilter.h b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbParallelLinePathListFilter.h
rename to Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
diff --git a/Code/FeatureExtraction/otbParallelLinePathListFilter.txx b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbParallelLinePathListFilter.txx
rename to Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.txx
diff --git a/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h b/Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h
rename to Modules/Detection/RoadExtraction/include/otbRemoveIsolatedByDirectionFilter.h
diff --git a/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbRemoveTortuousPathListFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h
rename to Modules/Detection/RoadExtraction/include/otbRemoveTortuousPathListFilter.h
diff --git a/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h b/Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h
rename to Modules/Detection/RoadExtraction/include/otbRemoveWrongDirectionFilter.h
diff --git a/Code/FeatureExtraction/otbRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbRoadExtractionFilter.h
rename to Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
diff --git a/Code/FeatureExtraction/otbRoadExtractionFilter.txx b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbRoadExtractionFilter.txx
rename to Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.txx
diff --git a/Code/FeatureExtraction/otbSimplifyPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbSimplifyPathListFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbSimplifyPathListFilter.h
rename to Modules/Detection/RoadExtraction/include/otbSimplifyPathListFilter.h
diff --git a/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.h b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
similarity index 100%
rename from Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.h
rename to Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
diff --git a/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.txx b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.txx
similarity index 100%
rename from Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.txx
rename to Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.txx
diff --git a/Testing/Fa/AlignementsQB.cxx b/Modules/Detection/RoadExtraction/test/AlignementsQB.cxx
similarity index 100%
rename from Testing/Fa/AlignementsQB.cxx
rename to Modules/Detection/RoadExtraction/test/AlignementsQB.cxx
diff --git a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx b/Modules/Detection/RoadExtraction/test/otbAlignImageToPath.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
rename to Modules/Detection/RoadExtraction/test/otbAlignImageToPath.cxx
diff --git a/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx b/Modules/Detection/RoadExtraction/test/otbDrawPathAlign.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx
rename to Modules/Detection/RoadExtraction/test/otbDrawPathAlign.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx b/Modules/Detection/RoadExtraction/test/otbLikelihoodPathListFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLikelihoodPathListFilter.cxx
rename to Modules/Detection/RoadExtraction/test/otbLikelihoodPathListFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLikelihoodPathListFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbLikelihoodPathListFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLikelihoodPathListFilterNew.cxx
rename to Modules/Detection/RoadExtraction/test/otbLikelihoodPathListFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx b/Modules/Detection/RoadExtraction/test/otbLinkPathListFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLinkPathListFilter.cxx
rename to Modules/Detection/RoadExtraction/test/otbLinkPathListFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLinkPathListFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbLinkPathListFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLinkPathListFilterNew.cxx
rename to Modules/Detection/RoadExtraction/test/otbLinkPathListFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbModulusAndDirectionImageFiltersNew.cxx b/Modules/Detection/RoadExtraction/test/otbModulusAndDirectionImageFiltersNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbModulusAndDirectionImageFiltersNew.cxx
rename to Modules/Detection/RoadExtraction/test/otbModulusAndDirectionImageFiltersNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx b/Modules/Detection/RoadExtraction/test/otbNeighborhoodScalarProductFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.cxx
rename to Modules/Detection/RoadExtraction/test/otbNeighborhoodScalarProductFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbNeighborhoodScalarProductFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbNeighborhoodScalarProductFilterNew.cxx
rename to Modules/Detection/RoadExtraction/test/otbNeighborhoodScalarProductFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.cxx b/Modules/Detection/RoadExtraction/test/otbNonMaxRemovalByDirectionFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.cxx
rename to Modules/Detection/RoadExtraction/test/otbNonMaxRemovalByDirectionFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbNonMaxRemovalByDirectionFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilterNew.cxx
rename to Modules/Detection/RoadExtraction/test/otbNonMaxRemovalByDirectionFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbParallelLinePathListFilter.cxx b/Modules/Detection/RoadExtraction/test/otbParallelLinePathListFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbParallelLinePathListFilter.cxx
rename to Modules/Detection/RoadExtraction/test/otbParallelLinePathListFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbParallelLinePathListFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbParallelLinePathListFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbParallelLinePathListFilterNew.cxx
rename to Modules/Detection/RoadExtraction/test/otbParallelLinePathListFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.cxx b/Modules/Detection/RoadExtraction/test/otbRemoveIsolatedByDirectionFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.cxx
rename to Modules/Detection/RoadExtraction/test/otbRemoveIsolatedByDirectionFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbRemoveIsolatedByDirectionFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilterNew.cxx
rename to Modules/Detection/RoadExtraction/test/otbRemoveIsolatedByDirectionFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx b/Modules/Detection/RoadExtraction/test/otbRemoveTortuousPathListFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.cxx
rename to Modules/Detection/RoadExtraction/test/otbRemoveTortuousPathListFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbRemoveTortuousPathListFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRemoveTortuousPathListFilterNew.cxx
rename to Modules/Detection/RoadExtraction/test/otbRemoveTortuousPathListFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.cxx b/Modules/Detection/RoadExtraction/test/otbRemoveWrongDirectionFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.cxx
rename to Modules/Detection/RoadExtraction/test/otbRemoveWrongDirectionFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRemoveWrongDirectionFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbRemoveWrongDirectionFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRemoveWrongDirectionFilterNew.cxx
rename to Modules/Detection/RoadExtraction/test/otbRemoveWrongDirectionFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx b/Modules/Detection/RoadExtraction/test/otbRoadExtractionFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx
rename to Modules/Detection/RoadExtraction/test/otbRoadExtractionFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRoadExtractionFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbRoadExtractionFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRoadExtractionFilterNew.cxx
rename to Modules/Detection/RoadExtraction/test/otbRoadExtractionFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbSimplifyManyPathListFilter.cxx b/Modules/Detection/RoadExtraction/test/otbSimplifyManyPathListFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbSimplifyManyPathListFilter.cxx
rename to Modules/Detection/RoadExtraction/test/otbSimplifyManyPathListFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx b/Modules/Detection/RoadExtraction/test/otbSimplifyPathListFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbSimplifyPathListFilter.cxx
rename to Modules/Detection/RoadExtraction/test/otbSimplifyPathListFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbSimplifyPathListFilterNew.cxx b/Modules/Detection/RoadExtraction/test/otbSimplifyPathListFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbSimplifyPathListFilterNew.cxx
rename to Modules/Detection/RoadExtraction/test/otbSimplifyPathListFilterNew.cxx
diff --git a/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx b/Modules/Detection/RoadExtraction/test/otbVectorDataToRoadDescriptionFilter.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx
rename to Modules/Detection/RoadExtraction/test/otbVectorDataToRoadDescriptionFilter.cxx
diff --git a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
rename to Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
diff --git a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.txx b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.txx
rename to Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.txx
diff --git a/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.cxx b/Modules/Detection/UrbanArea/test/otbUrbanAreaDetectionImageFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.cxx
rename to Modules/Detection/UrbanArea/test/otbUrbanAreaDetectionImageFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilterNew.cxx b/Modules/Detection/UrbanArea/test/otbUrbanAreaDetectionImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilterNew.cxx
rename to Modules/Detection/UrbanArea/test/otbUrbanAreaDetectionImageFilterNew.cxx
diff --git a/Code/FeatureExtraction/otbHarrisImageFilter.h b/Modules/Feature/Corner/include/otbHarrisImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbHarrisImageFilter.h
rename to Modules/Feature/Corner/include/otbHarrisImageFilter.h
diff --git a/Code/FeatureExtraction/otbHarrisImageFilter.txx b/Modules/Feature/Corner/include/otbHarrisImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbHarrisImageFilter.txx
rename to Modules/Feature/Corner/include/otbHarrisImageFilter.txx
diff --git a/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h
rename to Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
diff --git a/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.txx b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbHarrisImageToPointSetFilter.txx
rename to Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.txx
diff --git a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
rename to Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
diff --git a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
rename to Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
diff --git a/Code/FeatureExtraction/otbVectorDataToRightAngleVectorDataFilter.h b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbVectorDataToRightAngleVectorDataFilter.h
rename to Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
diff --git a/Code/FeatureExtraction/otbVectorDataToRightAngleVectorDataFilter.txx b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbVectorDataToRightAngleVectorDataFilter.txx
rename to Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.txx
diff --git a/Testing/Code/FeatureExtraction/otbHarrisImage.cxx b/Modules/Feature/Corner/test/otbHarrisImage.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbHarrisImage.cxx
rename to Modules/Feature/Corner/test/otbHarrisImage.cxx
diff --git a/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx b/Modules/Feature/Corner/test/otbHarrisToPointSet.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
rename to Modules/Feature/Corner/test/otbHarrisToPointSet.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx b/Modules/Feature/Corner/test/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
rename to Modules/Feature/Corner/test/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx b/Modules/Feature/Corner/test/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
rename to Modules/Feature/Corner/test/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx b/Modules/Feature/Corner/test/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx
rename to Modules/Feature/Corner/test/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbVectorDataToRightAngleVectorDataFilter.cxx b/Modules/Feature/Corner/test/otbVectorDataToRightAngleVectorDataFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbVectorDataToRightAngleVectorDataFilter.cxx
rename to Modules/Feature/Corner/test/otbVectorDataToRightAngleVectorDataFilter.cxx
diff --git a/Code/BasicFilters/otbKeyPointDensityImageFilter.h b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbKeyPointDensityImageFilter.h
rename to Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
diff --git a/Code/BasicFilters/otbKeyPointDensityImageFilter.txx b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbKeyPointDensityImageFilter.txx
rename to Modules/Feature/Density/include/otbKeyPointDensityImageFilter.txx
diff --git a/Code/BasicFilters/otbPointSetDensityEpanechnikovFunction.h b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
similarity index 100%
rename from Code/BasicFilters/otbPointSetDensityEpanechnikovFunction.h
rename to Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
diff --git a/Code/BasicFilters/otbPointSetDensityEpanechnikovFunction.txx b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbPointSetDensityEpanechnikovFunction.txx
rename to Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.txx
diff --git a/Code/BasicFilters/otbPointSetDensityFunction.h b/Modules/Feature/Density/include/otbPointSetDensityFunction.h
similarity index 100%
rename from Code/BasicFilters/otbPointSetDensityFunction.h
rename to Modules/Feature/Density/include/otbPointSetDensityFunction.h
diff --git a/Code/BasicFilters/otbPointSetDensityFunction.txx b/Modules/Feature/Density/include/otbPointSetDensityFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbPointSetDensityFunction.txx
rename to Modules/Feature/Density/include/otbPointSetDensityFunction.txx
diff --git a/Code/BasicFilters/otbPointSetDensityGaussianFunction.h b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
similarity index 100%
rename from Code/BasicFilters/otbPointSetDensityGaussianFunction.h
rename to Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
diff --git a/Code/BasicFilters/otbPointSetDensityGaussianFunction.txx b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbPointSetDensityGaussianFunction.txx
rename to Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.txx
diff --git a/Code/BasicFilters/otbPointSetToDensityImageFilter.h b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbPointSetToDensityImageFilter.h
rename to Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
diff --git a/Code/BasicFilters/otbPointSetToDensityImageFilter.txx b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbPointSetToDensityImageFilter.txx
rename to Modules/Feature/Density/include/otbPointSetToDensityImageFilter.txx
diff --git a/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx b/Modules/Feature/Density/test/otbKeyPointDensityImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbKeyPointDensityImageFilterNew.cxx
rename to Modules/Feature/Density/test/otbKeyPointDensityImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbKeyPointDensityImageFilterTest.cxx b/Modules/Feature/Density/test/otbKeyPointDensityImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbKeyPointDensityImageFilterTest.cxx
rename to Modules/Feature/Density/test/otbKeyPointDensityImageFilterTest.cxx
diff --git a/Testing/Code/BasicFilters/otbPointSetDensityEpanechnikovFunctionNew.cxx b/Modules/Feature/Density/test/otbPointSetDensityEpanechnikovFunctionNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPointSetDensityEpanechnikovFunctionNew.cxx
rename to Modules/Feature/Density/test/otbPointSetDensityEpanechnikovFunctionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbPointSetDensityEpanechnikovFunctionTest.cxx b/Modules/Feature/Density/test/otbPointSetDensityEpanechnikovFunctionTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPointSetDensityEpanechnikovFunctionTest.cxx
rename to Modules/Feature/Density/test/otbPointSetDensityEpanechnikovFunctionTest.cxx
diff --git a/Testing/Code/BasicFilters/otbPointSetDensityFunctionNew.cxx b/Modules/Feature/Density/test/otbPointSetDensityFunctionNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPointSetDensityFunctionNew.cxx
rename to Modules/Feature/Density/test/otbPointSetDensityFunctionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx b/Modules/Feature/Density/test/otbPointSetDensityFunctionTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPointSetDensityFunctionTest.cxx
rename to Modules/Feature/Density/test/otbPointSetDensityFunctionTest.cxx
diff --git a/Testing/Code/BasicFilters/otbPointSetDensityGaussianFunctionNew.cxx b/Modules/Feature/Density/test/otbPointSetDensityGaussianFunctionNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPointSetDensityGaussianFunctionNew.cxx
rename to Modules/Feature/Density/test/otbPointSetDensityGaussianFunctionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbPointSetDensityGaussianFunctionTest.cxx b/Modules/Feature/Density/test/otbPointSetDensityGaussianFunctionTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPointSetDensityGaussianFunctionTest.cxx
rename to Modules/Feature/Density/test/otbPointSetDensityGaussianFunctionTest.cxx
diff --git a/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx b/Modules/Feature/Density/test/otbPointSetToDensityImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx
rename to Modules/Feature/Density/test/otbPointSetToDensityImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterTest.cxx b/Modules/Feature/Density/test/otbPointSetToDensityImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPointSetToDensityImageFilterTest.cxx
rename to Modules/Feature/Density/test/otbPointSetToDensityImageFilterTest.cxx
diff --git a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
rename to Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
diff --git a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx
rename to Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.txx
diff --git a/Code/FeatureExtraction/otbFourierMellinDescriptorsImageFunction.h b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbFourierMellinDescriptorsImageFunction.h
rename to Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
diff --git a/Code/FeatureExtraction/otbFourierMellinDescriptorsImageFunction.txx b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbFourierMellinDescriptorsImageFunction.txx
rename to Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.txx
diff --git a/Code/FeatureExtraction/otbHessianToScalarImageFilter.h b/Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbHessianToScalarImageFilter.h
rename to Modules/Feature/Descriptors/include/otbHessianToScalarImageFilter.h
diff --git a/Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.h b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.h
rename to Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
diff --git a/Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.txx b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.txx
rename to Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.txx
diff --git a/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.h b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.h
rename to Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
diff --git a/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.txx b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.txx
rename to Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.txx
diff --git a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
rename to Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
diff --git a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx
rename to Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.txx
diff --git a/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h
rename to Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
diff --git a/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.txx b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.txx
rename to Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.txx
diff --git a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
rename to Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
diff --git a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.txx b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.txx
rename to Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.txx
diff --git a/Code/FeatureExtraction/otbLandmark.h b/Modules/Feature/Descriptors/include/otbLandmark.h
similarity index 100%
rename from Code/FeatureExtraction/otbLandmark.h
rename to Modules/Feature/Descriptors/include/otbLandmark.h
diff --git a/Code/FeatureExtraction/otbSiftFastImageFilter.h b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbSiftFastImageFilter.h
rename to Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
diff --git a/Code/FeatureExtraction/otbSiftFastImageFilter.txx b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbSiftFastImageFilter.txx
rename to Modules/Feature/Descriptors/include/otbSiftFastImageFilter.txx
diff --git a/Testing/Code/FeatureExtraction/otbFourierMellinDescriptors.cxx b/Modules/Feature/Descriptors/test/otbFourierMellinDescriptors.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbFourierMellinDescriptors.cxx
rename to Modules/Feature/Descriptors/test/otbFourierMellinDescriptors.cxx
diff --git a/Testing/Code/FeatureExtraction/otbFourierMellinImageFilter.cxx b/Modules/Feature/Descriptors/test/otbFourierMellinImageFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbFourierMellinImageFilter.cxx
rename to Modules/Feature/Descriptors/test/otbFourierMellinImageFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbFourierMellinImageFilterNew.cxx b/Modules/Feature/Descriptors/test/otbFourierMellinImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbFourierMellinImageFilterNew.cxx
rename to Modules/Feature/Descriptors/test/otbFourierMellinImageFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.cxx b/Modules/Feature/Descriptors/test/otbHistogramOfOrientedGradientCovariantImageFunction.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.cxx
rename to Modules/Feature/Descriptors/test/otbHistogramOfOrientedGradientCovariantImageFunction.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterNew.cxx b/Modules/Feature/Descriptors/test/otbImageToFastSIFTKeyPointSetFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterNew.cxx
rename to Modules/Feature/Descriptors/test/otbImageToFastSIFTKeyPointSetFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx b/Modules/Feature/Descriptors/test/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
rename to Modules/Feature/Descriptors/test/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx b/Modules/Feature/Descriptors/test/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
rename to Modules/Feature/Descriptors/test/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.cxx b/Modules/Feature/Descriptors/test/otbImageToHessianDeterminantImageFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.cxx
rename to Modules/Feature/Descriptors/test/otbImageToHessianDeterminantImageFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilterNew.cxx b/Modules/Feature/Descriptors/test/otbImageToHessianDeterminantImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilterNew.cxx
rename to Modules/Feature/Descriptors/test/otbImageToHessianDeterminantImageFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx b/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
rename to Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterNew.cxx b/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterNew.cxx
rename to Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputAscii.cxx b/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterOutputAscii.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputAscii.cxx
rename to Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterOutputAscii.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii.cxx b/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
rename to Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputImage.cxx b/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterOutputImage.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputImage.cxx
rename to Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterOutputImage.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx b/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
rename to Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterNew.cxx b/Modules/Feature/Descriptors/test/otbImageToSURFKeyPointSetFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterNew.cxx
rename to Modules/Feature/Descriptors/test/otbImageToSURFKeyPointSetFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx b/Modules/Feature/Descriptors/test/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
rename to Modules/Feature/Descriptors/test/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx b/Modules/Feature/Descriptors/test/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx
rename to Modules/Feature/Descriptors/test/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx
diff --git a/Testing/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.cxx b/Modules/Feature/Descriptors/test/otbKeyPointSetsMatchingFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.cxx
rename to Modules/Feature/Descriptors/test/otbKeyPointSetsMatchingFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbKeyPointSetsMatchingFilterNew.cxx b/Modules/Feature/Descriptors/test/otbKeyPointSetsMatchingFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbKeyPointSetsMatchingFilterNew.cxx
rename to Modules/Feature/Descriptors/test/otbKeyPointSetsMatchingFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLandmarkNew.cxx b/Modules/Feature/Descriptors/test/otbLandmarkNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLandmarkNew.cxx
rename to Modules/Feature/Descriptors/test/otbLandmarkNew.cxx
diff --git a/Code/FeatureExtraction/otbAssociativeSymmetricalSumImageFilter.h b/Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbAssociativeSymmetricalSumImageFilter.h
rename to Modules/Feature/Edge/include/otbAssociativeSymmetricalSumImageFilter.h
diff --git a/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h b/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h
rename to Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.h
diff --git a/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.txx b/Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.txx
rename to Modules/Feature/Edge/include/otbAssymmetricFusionOfLineDetectorImageFilter.txx
diff --git a/Code/BasicFilters/otbEdgeDensityImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbEdgeDensityImageFilter.h
rename to Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
diff --git a/Code/BasicFilters/otbEdgeDensityImageFilter.txx b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbEdgeDensityImageFilter.txx
rename to Modules/Feature/Edge/include/otbEdgeDensityImageFilter.txx
diff --git a/Code/BasicFilters/otbEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbEdgeDetectorImageFilter.h
rename to Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
diff --git a/Code/BasicFilters/otbEdgeDetectorImageFilter.txx b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbEdgeDetectorImageFilter.txx
rename to Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.txx
diff --git a/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbExtractSegmentsImageFilter.h
rename to Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
diff --git a/Code/FeatureExtraction/otbExtractSegmentsImageFilter.txx b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbExtractSegmentsImageFilter.txx
rename to Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.txx
diff --git a/Code/BasicFilters/otbGaborFilterGenerator.h b/Modules/Feature/Edge/include/otbGaborFilterGenerator.h
similarity index 100%
rename from Code/BasicFilters/otbGaborFilterGenerator.h
rename to Modules/Feature/Edge/include/otbGaborFilterGenerator.h
diff --git a/Code/BasicFilters/otbGaborFilterGenerator.txx b/Modules/Feature/Edge/include/otbGaborFilterGenerator.txx
similarity index 100%
rename from Code/BasicFilters/otbGaborFilterGenerator.txx
rename to Modules/Feature/Edge/include/otbGaborFilterGenerator.txx
diff --git a/Code/BasicFilters/otbHorizontalSobelVectorImageFilter.h b/Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbHorizontalSobelVectorImageFilter.h
rename to Modules/Feature/Edge/include/otbHorizontalSobelVectorImageFilter.h
diff --git a/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.h b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.h
rename to Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
diff --git a/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.txx b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.txx
rename to Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.txx
diff --git a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
rename to Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
diff --git a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
rename to Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.txx
diff --git a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.h b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
similarity index 100%
rename from Code/FeatureExtraction/otbLineDetectorImageFilterBase.h
rename to Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
diff --git a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.txx
similarity index 100%
rename from Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
rename to Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.txx
diff --git a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
rename to Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
diff --git a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
rename to Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.txx
diff --git a/Code/FeatureExtraction/otbLineSegmentDetector.h b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
similarity index 100%
rename from Code/FeatureExtraction/otbLineSegmentDetector.h
rename to Modules/Feature/Edge/include/otbLineSegmentDetector.h
diff --git a/Code/FeatureExtraction/otbLineSegmentDetector.txx b/Modules/Feature/Edge/include/otbLineSegmentDetector.txx
similarity index 100%
rename from Code/FeatureExtraction/otbLineSegmentDetector.txx
rename to Modules/Feature/Edge/include/otbLineSegmentDetector.txx
diff --git a/Code/FeatureExtraction/otbLocalHoughFilter.h b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbLocalHoughFilter.h
rename to Modules/Feature/Edge/include/otbLocalHoughFilter.h
diff --git a/Code/FeatureExtraction/otbLocalHoughFilter.txx b/Modules/Feature/Edge/include/otbLocalHoughFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbLocalHoughFilter.txx
rename to Modules/Feature/Edge/include/otbLocalHoughFilter.txx
diff --git a/Code/BasicFilters/otbPersistentVectorizationImageFilter.h b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbPersistentVectorizationImageFilter.h
rename to Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
diff --git a/Code/BasicFilters/otbPersistentVectorizationImageFilter.txx b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbPersistentVectorizationImageFilter.txx
rename to Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.txx
diff --git a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.h b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.h
rename to Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
diff --git a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
rename to Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.txx
diff --git a/Code/BasicFilters/otbSobelVectorImageFilter.h b/Modules/Feature/Edge/include/otbSobelVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbSobelVectorImageFilter.h
rename to Modules/Feature/Edge/include/otbSobelVectorImageFilter.h
diff --git a/Code/FeatureExtraction/otbStreamingLineSegmentDetector.h b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
similarity index 100%
rename from Code/FeatureExtraction/otbStreamingLineSegmentDetector.h
rename to Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
diff --git a/Code/FeatureExtraction/otbStreamingLineSegmentDetector.txx b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.txx
similarity index 100%
rename from Code/FeatureExtraction/otbStreamingLineSegmentDetector.txx
rename to Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.txx
diff --git a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.h
rename to Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
diff --git a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
rename to Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.txx
diff --git a/Code/BasicFilters/otbVerticalSobelVectorImageFilter.h b/Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbVerticalSobelVectorImageFilter.h
rename to Modules/Feature/Edge/include/otbVerticalSobelVectorImageFilter.h
diff --git a/Testing/Fa/0000094-PolygonsVectorization.cxx b/Modules/Feature/Edge/test/0000094-PolygonsVectorization.cxx
similarity index 100%
rename from Testing/Fa/0000094-PolygonsVectorization.cxx
rename to Modules/Feature/Edge/test/0000094-PolygonsVectorization.cxx
diff --git a/Testing/Fa/0000433-LineSegmentDetector_8b_16b_compare.cxx b/Modules/Feature/Edge/test/0000433-LineSegmentDetector_8b_16b_compare.cxx
similarity index 100%
rename from Testing/Fa/0000433-LineSegmentDetector_8b_16b_compare.cxx
rename to Modules/Feature/Edge/test/0000433-LineSegmentDetector_8b_16b_compare.cxx
diff --git a/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSum.cxx b/Modules/Feature/Edge/test/otbAssociativeSymmetricalSum.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSum.cxx
rename to Modules/Feature/Edge/test/otbAssociativeSymmetricalSum.cxx
diff --git a/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSumNew.cxx b/Modules/Feature/Edge/test/otbAssociativeSymmetricalSumNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSumNew.cxx
rename to Modules/Feature/Edge/test/otbAssociativeSymmetricalSumNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx b/Modules/Feature/Edge/test/otbAssymmetricFusionOfLineDetector.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx
rename to Modules/Feature/Edge/test/otbAssymmetricFusionOfLineDetector.cxx
diff --git a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx b/Modules/Feature/Edge/test/otbAssymmetricFusionOfLineDetectorNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx
rename to Modules/Feature/Edge/test/otbAssymmetricFusionOfLineDetectorNew.cxx
diff --git a/Testing/Code/BasicFilters/otbCompareOverlapSaveAndClassicalConvolutionWithGaborFilter.cxx b/Modules/Feature/Edge/test/otbCompareOverlapSaveAndClassicalConvolutionWithGaborFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbCompareOverlapSaveAndClassicalConvolutionWithGaborFilter.cxx
rename to Modules/Feature/Edge/test/otbCompareOverlapSaveAndClassicalConvolutionWithGaborFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbEdgeDensityImageFilter.cxx b/Modules/Feature/Edge/test/otbEdgeDensityImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbEdgeDensityImageFilter.cxx
rename to Modules/Feature/Edge/test/otbEdgeDensityImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx b/Modules/Feature/Edge/test/otbEdgeDensityImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbEdgeDensityImageFilterNew.cxx
rename to Modules/Feature/Edge/test/otbEdgeDensityImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbEdgeDetectorImageFilter.cxx b/Modules/Feature/Edge/test/otbEdgeDetectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbEdgeDetectorImageFilter.cxx
rename to Modules/Feature/Edge/test/otbEdgeDetectorImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbEdgeDetectorImageFilterNew.cxx b/Modules/Feature/Edge/test/otbEdgeDetectorImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbEdgeDetectorImageFilterNew.cxx
rename to Modules/Feature/Edge/test/otbEdgeDetectorImageFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbExtractSegments.cxx b/Modules/Feature/Edge/test/otbExtractSegments.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbExtractSegments.cxx
rename to Modules/Feature/Edge/test/otbExtractSegments.cxx
diff --git a/Testing/Code/FeatureExtraction/otbExtractSegmentsNew.cxx b/Modules/Feature/Edge/test/otbExtractSegmentsNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbExtractSegmentsNew.cxx
rename to Modules/Feature/Edge/test/otbExtractSegmentsNew.cxx
diff --git a/Testing/Code/BasicFilters/otbGaborFilterGenerator.cxx b/Modules/Feature/Edge/test/otbGaborFilterGenerator.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbGaborFilterGenerator.cxx
rename to Modules/Feature/Edge/test/otbGaborFilterGenerator.cxx
diff --git a/Testing/Code/BasicFilters/otbGaborFilterGeneratorNew.cxx b/Modules/Feature/Edge/test/otbGaborFilterGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbGaborFilterGeneratorNew.cxx
rename to Modules/Feature/Edge/test/otbGaborFilterGeneratorNew.cxx
diff --git a/Testing/Code/BasicFilters/otbHorizontalSobelVectorImageFilter.cxx b/Modules/Feature/Edge/test/otbHorizontalSobelVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbHorizontalSobelVectorImageFilter.cxx
rename to Modules/Feature/Edge/test/otbHorizontalSobelVectorImageFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx b/Modules/Feature/Edge/test/otbHoughTransform2DLinesImageTest.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx
rename to Modules/Feature/Edge/test/otbHoughTransform2DLinesImageTest.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLineCorrelationDetector.cxx b/Modules/Feature/Edge/test/otbLineCorrelationDetector.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLineCorrelationDetector.cxx
rename to Modules/Feature/Edge/test/otbLineCorrelationDetector.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx b/Modules/Feature/Edge/test/otbLineCorrelationDetectorLinear.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx
rename to Modules/Feature/Edge/test/otbLineCorrelationDetectorLinear.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorNew.cxx b/Modules/Feature/Edge/test/otbLineCorrelationDetectorNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLineCorrelationDetectorNew.cxx
rename to Modules/Feature/Edge/test/otbLineCorrelationDetectorNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx b/Modules/Feature/Edge/test/otbLineDetectorBaseNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx
rename to Modules/Feature/Edge/test/otbLineDetectorBaseNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLineRatioDetector.cxx b/Modules/Feature/Edge/test/otbLineRatioDetector.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLineRatioDetector.cxx
rename to Modules/Feature/Edge/test/otbLineRatioDetector.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx b/Modules/Feature/Edge/test/otbLineRatioDetectorLinear.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx
rename to Modules/Feature/Edge/test/otbLineRatioDetectorLinear.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLineRatioDetectorNew.cxx b/Modules/Feature/Edge/test/otbLineRatioDetectorNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLineRatioDetectorNew.cxx
rename to Modules/Feature/Edge/test/otbLineRatioDetectorNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx b/Modules/Feature/Edge/test/otbLineSegmentDetector.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx
rename to Modules/Feature/Edge/test/otbLineSegmentDetector.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLocalHough.cxx b/Modules/Feature/Edge/test/otbLocalHough.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLocalHough.cxx
rename to Modules/Feature/Edge/test/otbLocalHough.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx b/Modules/Feature/Edge/test/otbLocalHoughDraw.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx
rename to Modules/Feature/Edge/test/otbLocalHoughDraw.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLocalHoughNew.cxx b/Modules/Feature/Edge/test/otbLocalHoughNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLocalHoughNew.cxx
rename to Modules/Feature/Edge/test/otbLocalHoughNew.cxx
diff --git a/Testing/Code/BasicFilters/otbPersistentVectorizationFilter.cxx b/Modules/Feature/Edge/test/otbPersistentVectorizationFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPersistentVectorizationFilter.cxx
rename to Modules/Feature/Edge/test/otbPersistentVectorizationFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbPersistentVectorizationFilterNew.cxx b/Modules/Feature/Edge/test/otbPersistentVectorizationFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPersistentVectorizationFilterNew.cxx
rename to Modules/Feature/Edge/test/otbPersistentVectorizationFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirection.cxx b/Modules/Feature/Edge/test/otbPixelSuppressionByDirection.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbPixelSuppressionByDirection.cxx
rename to Modules/Feature/Edge/test/otbPixelSuppressionByDirection.cxx
diff --git a/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx b/Modules/Feature/Edge/test/otbPixelSuppressionByDirectionNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx
rename to Modules/Feature/Edge/test/otbPixelSuppressionByDirectionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbSobelVectorImageFilter.cxx b/Modules/Feature/Edge/test/otbSobelVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbSobelVectorImageFilter.cxx
rename to Modules/Feature/Edge/test/otbSobelVectorImageFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbStreamingLineSegmentDetector.cxx b/Modules/Feature/Edge/test/otbStreamingLineSegmentDetector.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbStreamingLineSegmentDetector.cxx
rename to Modules/Feature/Edge/test/otbStreamingLineSegmentDetector.cxx
diff --git a/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx b/Modules/Feature/Edge/test/otbTouziEdgeDetector.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx
rename to Modules/Feature/Edge/test/otbTouziEdgeDetector.cxx
diff --git a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx b/Modules/Feature/Edge/test/otbTouziEdgeDetectorDirection.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx
rename to Modules/Feature/Edge/test/otbTouziEdgeDetectorDirection.cxx
diff --git a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx b/Modules/Feature/Edge/test/otbTouziEdgeDetectorNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx
rename to Modules/Feature/Edge/test/otbTouziEdgeDetectorNew.cxx
diff --git a/Testing/Code/BasicFilters/otbVerticalSobelVectorImageFilter.cxx b/Modules/Feature/Edge/test/otbVerticalSobelVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVerticalSobelVectorImageFilter.cxx
rename to Modules/Feature/Edge/test/otbVerticalSobelVectorImageFilter.cxx
diff --git a/Code/FeatureExtraction/otbComplexMomentPathFunction.h b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbComplexMomentPathFunction.h
rename to Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
diff --git a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbComplexMomentPathFunction.txx
rename to Modules/Feature/Moments/include/otbComplexMomentPathFunction.txx
diff --git a/Code/FeatureExtraction/otbComplexMomentsImageFunction.h b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbComplexMomentsImageFunction.h
rename to Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
diff --git a/Code/FeatureExtraction/otbComplexMomentsImageFunction.txx b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbComplexMomentsImageFunction.txx
rename to Modules/Feature/Moments/include/otbComplexMomentsImageFunction.txx
diff --git a/Code/FeatureExtraction/otbFlusserMomentsImageFunction.h b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbFlusserMomentsImageFunction.h
rename to Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
diff --git a/Code/FeatureExtraction/otbFlusserMomentsImageFunction.txx b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbFlusserMomentsImageFunction.txx
rename to Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.txx
diff --git a/Code/FeatureExtraction/otbFlusserPathFunction.h b/Modules/Feature/Moments/include/otbFlusserPathFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbFlusserPathFunction.h
rename to Modules/Feature/Moments/include/otbFlusserPathFunction.h
diff --git a/Code/FeatureExtraction/otbFlusserPathFunction.txx b/Modules/Feature/Moments/include/otbFlusserPathFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbFlusserPathFunction.txx
rename to Modules/Feature/Moments/include/otbFlusserPathFunction.txx
diff --git a/Code/FeatureExtraction/otbGeometricMomentPathFunction.h b/Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbGeometricMomentPathFunction.h
rename to Modules/Feature/Moments/include/otbGeometricMomentPathFunction.h
diff --git a/Code/FeatureExtraction/otbHuMomentsImageFunction.h b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbHuMomentsImageFunction.h
rename to Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
diff --git a/Code/FeatureExtraction/otbHuMomentsImageFunction.txx b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbHuMomentsImageFunction.txx
rename to Modules/Feature/Moments/include/otbHuMomentsImageFunction.txx
diff --git a/Code/FeatureExtraction/otbHuPathFunction.h b/Modules/Feature/Moments/include/otbHuPathFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbHuPathFunction.h
rename to Modules/Feature/Moments/include/otbHuPathFunction.h
diff --git a/Code/FeatureExtraction/otbHuPathFunction.txx b/Modules/Feature/Moments/include/otbHuPathFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbHuPathFunction.txx
rename to Modules/Feature/Moments/include/otbHuPathFunction.txx
diff --git a/Code/OBIA/otbImageToLabelMapWithAttributesFilter.h b/Modules/Feature/Moments/include/otbImageToLabelMapWithAttributesFilter.h
similarity index 100%
rename from Code/OBIA/otbImageToLabelMapWithAttributesFilter.h
rename to Modules/Feature/Moments/include/otbImageToLabelMapWithAttributesFilter.h
diff --git a/Code/OBIA/otbImageToLabelMapWithAttributesFilter.txx b/Modules/Feature/Moments/include/otbImageToLabelMapWithAttributesFilter.txx
similarity index 100%
rename from Code/OBIA/otbImageToLabelMapWithAttributesFilter.txx
rename to Modules/Feature/Moments/include/otbImageToLabelMapWithAttributesFilter.txx
diff --git a/Code/FeatureExtraction/otbRadiometricMomentsFunctor.h b/Modules/Feature/Moments/include/otbRadiometricMomentsFunctor.h
similarity index 100%
rename from Code/FeatureExtraction/otbRadiometricMomentsFunctor.h
rename to Modules/Feature/Moments/include/otbRadiometricMomentsFunctor.h
diff --git a/Code/FeatureExtraction/otbRadiometricMomentsImageFilter.h b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbRadiometricMomentsImageFilter.h
rename to Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
diff --git a/Code/FeatureExtraction/otbRadiometricMomentsImageFilter.txx b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbRadiometricMomentsImageFilter.txx
rename to Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.txx
diff --git a/Code/FeatureExtraction/otbRadiometricMomentsImageFunction.h b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbRadiometricMomentsImageFunction.h
rename to Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
diff --git a/Code/FeatureExtraction/otbRadiometricMomentsImageFunction.txx b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbRadiometricMomentsImageFunction.txx
rename to Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.txx
diff --git a/Code/FeatureExtraction/otbRealMomentPathFunction.h b/Modules/Feature/Moments/include/otbRealMomentPathFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbRealMomentPathFunction.h
rename to Modules/Feature/Moments/include/otbRealMomentPathFunction.h
diff --git a/Code/FeatureExtraction/otbRealMomentsImageFunction.h b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbRealMomentsImageFunction.h
rename to Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
diff --git a/Code/FeatureExtraction/otbRealMomentsImageFunction.txx b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbRealMomentsImageFunction.txx
rename to Modules/Feature/Moments/include/otbRealMomentsImageFunction.txx
diff --git a/Code/OBIA/otbShapeAttributesLabelMapFilter.h b/Modules/Feature/Moments/include/otbShapeAttributesLabelMapFilter.h
similarity index 100%
rename from Code/OBIA/otbShapeAttributesLabelMapFilter.h
rename to Modules/Feature/Moments/include/otbShapeAttributesLabelMapFilter.h
diff --git a/Code/OBIA/otbShapeAttributesLabelMapFilter.txx b/Modules/Feature/Moments/include/otbShapeAttributesLabelMapFilter.txx
similarity index 100%
rename from Code/OBIA/otbShapeAttributesLabelMapFilter.txx
rename to Modules/Feature/Moments/include/otbShapeAttributesLabelMapFilter.txx
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx b/Modules/Feature/Moments/test/otbComplexMomentPath.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx
rename to Modules/Feature/Moments/test/otbComplexMomentPath.cxx
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx b/Modules/Feature/Moments/test/otbComplexMomentPathFloat.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx
rename to Modules/Feature/Moments/test/otbComplexMomentPathFloat.cxx
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx b/Modules/Feature/Moments/test/otbComplexMomentPathNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx
rename to Modules/Feature/Moments/test/otbComplexMomentPathNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentsImageFunction.cxx b/Modules/Feature/Moments/test/otbComplexMomentsImageFunction.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbComplexMomentsImageFunction.cxx
rename to Modules/Feature/Moments/test/otbComplexMomentsImageFunction.cxx
diff --git a/Testing/Code/FeatureExtraction/otbFlusserMomentsImageFunction.cxx b/Modules/Feature/Moments/test/otbFlusserMomentsImageFunction.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbFlusserMomentsImageFunction.cxx
rename to Modules/Feature/Moments/test/otbFlusserMomentsImageFunction.cxx
diff --git a/Testing/Code/FeatureExtraction/otbFlusserPath.cxx b/Modules/Feature/Moments/test/otbFlusserPath.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbFlusserPath.cxx
rename to Modules/Feature/Moments/test/otbFlusserPath.cxx
diff --git a/Testing/Code/FeatureExtraction/otbFlusserPathNew.cxx b/Modules/Feature/Moments/test/otbFlusserPathNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbFlusserPathNew.cxx
rename to Modules/Feature/Moments/test/otbFlusserPathNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbHuMomentsImageFunction.cxx b/Modules/Feature/Moments/test/otbHuMomentsImageFunction.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbHuMomentsImageFunction.cxx
rename to Modules/Feature/Moments/test/otbHuMomentsImageFunction.cxx
diff --git a/Testing/Code/FeatureExtraction/otbHuPath.cxx b/Modules/Feature/Moments/test/otbHuPath.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbHuPath.cxx
rename to Modules/Feature/Moments/test/otbHuPath.cxx
diff --git a/Testing/Code/FeatureExtraction/otbHuPathNew.cxx b/Modules/Feature/Moments/test/otbHuPathNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbHuPathNew.cxx
rename to Modules/Feature/Moments/test/otbHuPathNew.cxx
diff --git a/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilter.cxx b/Modules/Feature/Moments/test/otbImageToLabelMapWithAttributesFilter.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilter.cxx
rename to Modules/Feature/Moments/test/otbImageToLabelMapWithAttributesFilter.cxx
diff --git a/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilterNew.cxx b/Modules/Feature/Moments/test/otbImageToLabelMapWithAttributesFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilterNew.cxx
rename to Modules/Feature/Moments/test/otbImageToLabelMapWithAttributesFilterNew.cxx
diff --git a/Testing/Code/OBIA/otbKMeansAttributesLabelMapFilter.cxx b/Modules/Feature/Moments/test/otbKMeansAttributesLabelMapFilter.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbKMeansAttributesLabelMapFilter.cxx
rename to Modules/Feature/Moments/test/otbKMeansAttributesLabelMapFilter.cxx
diff --git a/Testing/Code/OBIA/otbLabelMapToSampleListFilter.cxx b/Modules/Feature/Moments/test/otbLabelMapToSampleListFilter.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbLabelMapToSampleListFilter.cxx
rename to Modules/Feature/Moments/test/otbLabelMapToSampleListFilter.cxx
diff --git a/Testing/Code/OBIA/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx b/Modules/Feature/Moments/test/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx
rename to Modules/Feature/Moments/test/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbMetaImageFunction.cxx b/Modules/Feature/Moments/test/otbMetaImageFunction.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbMetaImageFunction.cxx
rename to Modules/Feature/Moments/test/otbMetaImageFunction.cxx
diff --git a/Testing/Code/OBIA/otbMinMaxAttributesLabelMapFilter.cxx b/Modules/Feature/Moments/test/otbMinMaxAttributesLabelMapFilter.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbMinMaxAttributesLabelMapFilter.cxx
rename to Modules/Feature/Moments/test/otbMinMaxAttributesLabelMapFilter.cxx
diff --git a/Testing/Code/OBIA/otbNormalizeAttributesLabelMapFilter.cxx b/Modules/Feature/Moments/test/otbNormalizeAttributesLabelMapFilter.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbNormalizeAttributesLabelMapFilter.cxx
rename to Modules/Feature/Moments/test/otbNormalizeAttributesLabelMapFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRadiometricMomentsImageFilter.cxx b/Modules/Feature/Moments/test/otbRadiometricMomentsImageFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRadiometricMomentsImageFilter.cxx
rename to Modules/Feature/Moments/test/otbRadiometricMomentsImageFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRadiometricMomentsImageFunction.cxx b/Modules/Feature/Moments/test/otbRadiometricMomentsImageFunction.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRadiometricMomentsImageFunction.cxx
rename to Modules/Feature/Moments/test/otbRadiometricMomentsImageFunction.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRealMomentsImageFunction.cxx b/Modules/Feature/Moments/test/otbRealMomentsImageFunction.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRealMomentsImageFunction.cxx
rename to Modules/Feature/Moments/test/otbRealMomentsImageFunction.cxx
diff --git a/Testing/Code/OBIA/otbShapeAttributesLabelMapFilterNew.cxx b/Modules/Feature/Moments/test/otbShapeAttributesLabelMapFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbShapeAttributesLabelMapFilterNew.cxx
rename to Modules/Feature/Moments/test/otbShapeAttributesLabelMapFilterNew.cxx
diff --git a/Code/FeatureExtraction/otbImageToCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbImageToCarvingPathFilter.h
rename to Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
diff --git a/Code/FeatureExtraction/otbImageToCarvingPathFilter.txx b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbImageToCarvingPathFilter.txx
rename to Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.txx
diff --git a/Code/FeatureExtraction/otbRemoveCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbRemoveCarvingPathFilter.h
rename to Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
diff --git a/Code/FeatureExtraction/otbRemoveCarvingPathFilter.txx b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbRemoveCarvingPathFilter.txx
rename to Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.txx
diff --git a/Testing/Code/FeatureExtraction/otbImageToCarvingPathFilterNew.cxx b/Modules/Feature/SeamCarving/test/otbImageToCarvingPathFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToCarvingPathFilterNew.cxx
rename to Modules/Feature/SeamCarving/test/otbImageToCarvingPathFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRemoveCarvingPathFilterNew.cxx b/Modules/Feature/SeamCarving/test/otbRemoveCarvingPathFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRemoveCarvingPathFilterNew.cxx
rename to Modules/Feature/SeamCarving/test/otbRemoveCarvingPathFilterNew.cxx
diff --git a/Code/FeatureExtraction/otbGreyLevelCooccurrenceIndexedList.h b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
similarity index 100%
rename from Code/FeatureExtraction/otbGreyLevelCooccurrenceIndexedList.h
rename to Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
diff --git a/Code/FeatureExtraction/otbGreyLevelCooccurrenceIndexedList.txx b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.txx
similarity index 100%
rename from Code/FeatureExtraction/otbGreyLevelCooccurrenceIndexedList.txx
rename to Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.txx
diff --git a/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h
similarity index 100%
rename from Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h
rename to Modules/Feature/Textures/include/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h
diff --git a/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.txx b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.txx
similarity index 100%
rename from Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.txx
rename to Modules/Feature/Textures/include/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.txx
diff --git a/Code/FeatureExtraction/otbHaralickTexturesImageFunction.h b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbHaralickTexturesImageFunction.h
rename to Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
diff --git a/Code/FeatureExtraction/otbHaralickTexturesImageFunction.txx b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbHaralickTexturesImageFunction.txx
rename to Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.txx
diff --git a/Code/FeatureExtraction/otbSFSTexturesFunctor.h b/Modules/Feature/Textures/include/otbSFSTexturesFunctor.h
similarity index 100%
rename from Code/FeatureExtraction/otbSFSTexturesFunctor.h
rename to Modules/Feature/Textures/include/otbSFSTexturesFunctor.h
diff --git a/Code/FeatureExtraction/otbSFSTexturesImageFilter.h b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbSFSTexturesImageFilter.h
rename to Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
diff --git a/Code/FeatureExtraction/otbSFSTexturesImageFilter.txx b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbSFSTexturesImageFilter.txx
rename to Modules/Feature/Textures/include/otbSFSTexturesImageFilter.txx
diff --git a/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.h
rename to Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
diff --git a/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.txx b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.txx
rename to Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.txx
diff --git a/Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilter.h
rename to Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
diff --git a/Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilter.txx b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilter.txx
rename to Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.txx
diff --git a/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.h b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.h
rename to Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
diff --git a/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.txx b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.txx
rename to Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.txx
diff --git a/Code/FeatureExtraction/otbScalarImageToTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbScalarImageToTexturesFilter.h
rename to Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
diff --git a/Code/FeatureExtraction/otbScalarImageToTexturesFilter.txx b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbScalarImageToTexturesFilter.txx
rename to Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.txx
diff --git a/Code/FeatureExtraction/otbTextureImageFunction.h b/Modules/Feature/Textures/include/otbTextureImageFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbTextureImageFunction.h
rename to Modules/Feature/Textures/include/otbTextureImageFunction.h
diff --git a/Code/FeatureExtraction/otbTextureImageFunction.txx b/Modules/Feature/Textures/include/otbTextureImageFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbTextureImageFunction.txx
rename to Modules/Feature/Textures/include/otbTextureImageFunction.txx
diff --git a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceIndexedList.cxx b/Modules/Feature/Textures/test/otbGreyLevelCooccurrenceIndexedList.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceIndexedList.cxx
rename to Modules/Feature/Textures/test/otbGreyLevelCooccurrenceIndexedList.cxx
diff --git a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceIndexedListNew.cxx b/Modules/Feature/Textures/test/otbGreyLevelCooccurrenceIndexedListNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceIndexedListNew.cxx
rename to Modules/Feature/Textures/test/otbGreyLevelCooccurrenceIndexedListNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx b/Modules/Feature/Textures/test/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
rename to Modules/Feature/Textures/test/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
diff --git a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx b/Modules/Feature/Textures/test/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx
rename to Modules/Feature/Textures/test/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbHaralickTexturesImageFunction.cxx b/Modules/Feature/Textures/test/otbHaralickTexturesImageFunction.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbHaralickTexturesImageFunction.cxx
rename to Modules/Feature/Textures/test/otbHaralickTexturesImageFunction.cxx
diff --git a/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterNew.cxx b/Modules/Feature/Textures/test/otbSFSTexturesImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterNew.cxx
rename to Modules/Feature/Textures/test/otbSFSTexturesImageFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx b/Modules/Feature/Textures/test/otbSFSTexturesImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbSFSTexturesImageFilterTest.cxx
rename to Modules/Feature/Textures/test/otbSFSTexturesImageFilterTest.cxx
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.cxx b/Modules/Feature/Textures/test/otbScalarImageToAdvancedTexturesFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilter.cxx
rename to Modules/Feature/Textures/test/otbScalarImageToAdvancedTexturesFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilterNew.cxx b/Modules/Feature/Textures/test/otbScalarImageToAdvancedTexturesFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbScalarImageToAdvancedTexturesFilterNew.cxx
rename to Modules/Feature/Textures/test/otbScalarImageToAdvancedTexturesFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilter.cxx b/Modules/Feature/Textures/test/otbScalarImageToHigherOrderTexturesFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbScalarImageToHigherOrderTexturesFilter.cxx
rename to Modules/Feature/Textures/test/otbScalarImageToHigherOrderTexturesFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.cxx b/Modules/Feature/Textures/test/otbScalarImageToPanTexTextureFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilter.cxx
rename to Modules/Feature/Textures/test/otbScalarImageToPanTexTextureFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilterNew.cxx b/Modules/Feature/Textures/test/otbScalarImageToPanTexTextureFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbScalarImageToPanTexTextureFilterNew.cxx
rename to Modules/Feature/Textures/test/otbScalarImageToPanTexTextureFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToTexturesFilter.cxx b/Modules/Feature/Textures/test/otbScalarImageToTexturesFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbScalarImageToTexturesFilter.cxx
rename to Modules/Feature/Textures/test/otbScalarImageToTexturesFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbScalarImageToTexturesFilterNew.cxx b/Modules/Feature/Textures/test/otbScalarImageToTexturesFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbScalarImageToTexturesFilterNew.cxx
rename to Modules/Feature/Textures/test/otbScalarImageToTexturesFilterNew.cxx
diff --git a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
similarity index 100%
rename from Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
rename to Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
diff --git a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
similarity index 100%
rename from Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
rename to Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
diff --git a/Code/ChangeDetection/otbCBAMI.h b/Modules/Filtering/ChangeDetection/include/otbCBAMI.h
similarity index 100%
rename from Code/ChangeDetection/otbCBAMI.h
rename to Modules/Filtering/ChangeDetection/include/otbCBAMI.h
diff --git a/Code/ChangeDetection/otbCBAMIChangeDetector.h b/Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
similarity index 100%
rename from Code/ChangeDetection/otbCBAMIChangeDetector.h
rename to Modules/Filtering/ChangeDetection/include/otbCBAMIChangeDetector.h
diff --git a/Code/ChangeDetection/otbCorrelationChangeDetector.h b/Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
similarity index 100%
rename from Code/ChangeDetection/otbCorrelationChangeDetector.h
rename to Modules/Filtering/ChangeDetection/include/otbCorrelationChangeDetector.h
diff --git a/Code/ChangeDetection/otbCrossCorrelation.h b/Modules/Filtering/ChangeDetection/include/otbCrossCorrelation.h
similarity index 100%
rename from Code/ChangeDetection/otbCrossCorrelation.h
rename to Modules/Filtering/ChangeDetection/include/otbCrossCorrelation.h
diff --git a/Code/ChangeDetection/otbJoinHistogramMI.h b/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMI.h
similarity index 100%
rename from Code/ChangeDetection/otbJoinHistogramMI.h
rename to Modules/Filtering/ChangeDetection/include/otbJoinHistogramMI.h
diff --git a/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
similarity index 100%
rename from Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
rename to Modules/Filtering/ChangeDetection/include/otbJoinHistogramMIImageFilter.h
diff --git a/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
similarity index 100%
rename from Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.h
rename to Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
diff --git a/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.txx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.txx
similarity index 100%
rename from Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.txx
rename to Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.txx
diff --git a/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
similarity index 100%
rename from Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.h
rename to Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
diff --git a/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.txx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.txx
similarity index 100%
rename from Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.txx
rename to Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.txx
diff --git a/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
similarity index 100%
rename from Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.h
rename to Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
diff --git a/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.txx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
similarity index 100%
rename from Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
rename to Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.txx
diff --git a/Code/ChangeDetection/otbLHMI.h b/Modules/Filtering/ChangeDetection/include/otbLHMI.h
similarity index 100%
rename from Code/ChangeDetection/otbLHMI.h
rename to Modules/Filtering/ChangeDetection/include/otbLHMI.h
diff --git a/Code/ChangeDetection/otbLHMIChangeDetector.h b/Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h
similarity index 100%
rename from Code/ChangeDetection/otbLHMIChangeDetector.h
rename to Modules/Filtering/ChangeDetection/include/otbLHMIChangeDetector.h
diff --git a/Code/ChangeDetection/otbMeanDifference.h b/Modules/Filtering/ChangeDetection/include/otbMeanDifference.h
similarity index 100%
rename from Code/ChangeDetection/otbMeanDifference.h
rename to Modules/Filtering/ChangeDetection/include/otbMeanDifference.h
diff --git a/Code/ChangeDetection/otbMeanDifferenceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
similarity index 100%
rename from Code/ChangeDetection/otbMeanDifferenceImageFilter.h
rename to Modules/Filtering/ChangeDetection/include/otbMeanDifferenceImageFilter.h
diff --git a/Code/ChangeDetection/otbMeanRatio.h b/Modules/Filtering/ChangeDetection/include/otbMeanRatio.h
similarity index 100%
rename from Code/ChangeDetection/otbMeanRatio.h
rename to Modules/Filtering/ChangeDetection/include/otbMeanRatio.h
diff --git a/Code/ChangeDetection/otbMeanRatioImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h
similarity index 100%
rename from Code/ChangeDetection/otbMeanRatioImageFilter.h
rename to Modules/Filtering/ChangeDetection/include/otbMeanRatioImageFilter.h
diff --git a/Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
similarity index 100%
rename from Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.h
rename to Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
diff --git a/Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.txx b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.txx
similarity index 100%
rename from Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.txx
rename to Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.txx
diff --git a/Testing/Code/ChangeDetection/otbCBAMIChangeDetectionTest.cxx b/Modules/Filtering/ChangeDetection/test/otbCBAMIChangeDetectionTest.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbCBAMIChangeDetectionTest.cxx
rename to Modules/Filtering/ChangeDetection/test/otbCBAMIChangeDetectionTest.cxx
diff --git a/Testing/Code/ChangeDetection/otbCorrelChangeDetectionTest.cxx b/Modules/Filtering/ChangeDetection/test/otbCorrelChangeDetectionTest.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbCorrelChangeDetectionTest.cxx
rename to Modules/Filtering/ChangeDetection/test/otbCorrelChangeDetectionTest.cxx
diff --git a/Testing/Code/ChangeDetection/otbJHMIChangeDetectionTest.cxx b/Modules/Filtering/ChangeDetection/test/otbJHMIChangeDetectionTest.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbJHMIChangeDetectionTest.cxx
rename to Modules/Filtering/ChangeDetection/test/otbJHMIChangeDetectionTest.cxx
diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.cxx b/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerDistanceImageFilter.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilter.cxx
rename to Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerDistanceImageFilter.cxx
diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilterNew.cxx b/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerDistanceImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbKullbackLeiblerDistanceImageFilterNew.cxx
rename to Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerDistanceImageFilterNew.cxx
diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.cxx b/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerProfileImageFilter.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilter.cxx
rename to Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerProfileImageFilter.cxx
diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilterNew.cxx b/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerProfileImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbKullbackLeiblerProfileImageFilterNew.cxx
rename to Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerProfileImageFilterNew.cxx
diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx b/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx
rename to Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx
diff --git a/Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx b/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx
rename to Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerSupervizedDistanceImageFilterNew.cxx
diff --git a/Testing/Code/ChangeDetection/otbLHMIChangeDetectionTest.cxx b/Modules/Filtering/ChangeDetection/test/otbLHMIChangeDetectionTest.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbLHMIChangeDetectionTest.cxx
rename to Modules/Filtering/ChangeDetection/test/otbLHMIChangeDetectionTest.cxx
diff --git a/Testing/Code/ChangeDetection/otbMeanDiffChangeDetectionTest.cxx b/Modules/Filtering/ChangeDetection/test/otbMeanDiffChangeDetectionTest.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbMeanDiffChangeDetectionTest.cxx
rename to Modules/Filtering/ChangeDetection/test/otbMeanDiffChangeDetectionTest.cxx
diff --git a/Testing/Code/ChangeDetection/otbMeanRatioChangeDetectionTest.cxx b/Modules/Filtering/ChangeDetection/test/otbMeanRatioChangeDetectionTest.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbMeanRatioChangeDetectionTest.cxx
rename to Modules/Filtering/ChangeDetection/test/otbMeanRatioChangeDetectionTest.cxx
diff --git a/Testing/Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.cxx b/Modules/Filtering/ChangeDetection/test/otbMultivariateAlterationDetectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.cxx
rename to Modules/Filtering/ChangeDetection/test/otbMultivariateAlterationDetectorImageFilter.cxx
diff --git a/Code/BasicFilters/otbAmplitudePhaseToRGBFunctor.h b/Modules/Filtering/ColorMap/include/otbAmplitudePhaseToRGBFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbAmplitudePhaseToRGBFunctor.h
rename to Modules/Filtering/ColorMap/include/otbAmplitudePhaseToRGBFunctor.h
diff --git a/Code/BasicFilters/otbReliefColormapFunctor.h b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbReliefColormapFunctor.h
rename to Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
diff --git a/Code/BasicFilters/otbReliefColormapFunctor.txx b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.txx
similarity index 100%
rename from Code/BasicFilters/otbReliefColormapFunctor.txx
rename to Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.txx
diff --git a/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.h b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.h
rename to Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
diff --git a/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.txx b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.txx
similarity index 100%
rename from Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.txx
rename to Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.txx
diff --git a/Testing/Code/BasicFilters/otbAmplitudePhaseToRGBFunctor.cxx b/Modules/Filtering/ColorMap/test/otbAmplitudePhaseToRGBFunctor.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbAmplitudePhaseToRGBFunctor.cxx
rename to Modules/Filtering/ColorMap/test/otbAmplitudePhaseToRGBFunctor.cxx
diff --git a/Testing/Code/BasicFilters/otbAmplitudePhaseToRGBFunctorNew.cxx b/Modules/Filtering/ColorMap/test/otbAmplitudePhaseToRGBFunctorNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbAmplitudePhaseToRGBFunctorNew.cxx
rename to Modules/Filtering/ColorMap/test/otbAmplitudePhaseToRGBFunctorNew.cxx
diff --git a/Testing/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.cxx b/Modules/Filtering/ColorMap/test/otbScalarToRainbowRGBPixelFunctor.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.cxx
rename to Modules/Filtering/ColorMap/test/otbScalarToRainbowRGBPixelFunctor.cxx
diff --git a/Testing/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctorNew.cxx b/Modules/Filtering/ColorMap/test/otbScalarToRainbowRGBPixelFunctorNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctorNew.cxx
rename to Modules/Filtering/ColorMap/test/otbScalarToRainbowRGBPixelFunctorNew.cxx
diff --git a/Code/BasicFilters/otbConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbConvolutionImageFilter.h
rename to Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
diff --git a/Code/BasicFilters/otbConvolutionImageFilter.txx b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbConvolutionImageFilter.txx
rename to Modules/Filtering/Convolution/include/otbConvolutionImageFilter.txx
diff --git a/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.h
rename to Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
diff --git a/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.txx b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.txx
rename to Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.txx
diff --git a/Testing/Code/BasicFilters/otbConvolutionImageFilter.cxx b/Modules/Filtering/Convolution/test/otbConvolutionImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbConvolutionImageFilter.cxx
rename to Modules/Filtering/Convolution/test/otbConvolutionImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbConvolutionImageFilterNew.cxx b/Modules/Filtering/Convolution/test/otbConvolutionImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbConvolutionImageFilterNew.cxx
rename to Modules/Filtering/Convolution/test/otbConvolutionImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.cxx b/Modules/Filtering/Convolution/test/otbOverlapSaveConvolutionImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.cxx
rename to Modules/Filtering/Convolution/test/otbOverlapSaveConvolutionImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbOverlapSaveConvolutionImageFilterNew.cxx b/Modules/Filtering/Convolution/test/otbOverlapSaveConvolutionImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbOverlapSaveConvolutionImageFilterNew.cxx
rename to Modules/Filtering/Convolution/test/otbOverlapSaveConvolutionImageFilterNew.cxx
diff --git a/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbAngularProjectionBinaryImageFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
diff --git a/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbAngularProjectionBinaryImageFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.txx
diff --git a/Code/BasicFilters/otbAngularProjectionImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbAngularProjectionImageFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
diff --git a/Code/BasicFilters/otbAngularProjectionImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbAngularProjectionImageFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.txx
diff --git a/Code/BasicFilters/otbAngularProjectionSetImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbAngularProjectionSetImageFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
diff --git a/Code/BasicFilters/otbAngularProjectionSetImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbAngularProjectionSetImageFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.txx
diff --git a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
diff --git a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.txx
diff --git a/Code/BasicFilters/otbFastICAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbFastICAImageFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
diff --git a/Code/BasicFilters/otbFastICAImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbFastICAImageFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.txx
diff --git a/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
diff --git a/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbInnerProductPCAImageFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
diff --git a/Code/BasicFilters/otbInnerProductPCAImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbInnerProductPCAImageFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.txx
diff --git a/Code/BasicFilters/otbMNFImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbMNFImageFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
diff --git a/Code/BasicFilters/otbMNFImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbMNFImageFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.txx
diff --git a/Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
diff --git a/Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.txx
diff --git a/Code/BasicFilters/otbNAPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbNAPCAImageFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
diff --git a/Code/BasicFilters/otbNAPCAImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbNAPCAImageFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.txx
diff --git a/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
diff --git a/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.txx
diff --git a/Code/BasicFilters/otbPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbPCAImageFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
diff --git a/Code/BasicFilters/otbPCAImageFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbPCAImageFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.txx
diff --git a/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
similarity index 100%
rename from Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.h
rename to Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
diff --git a/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.txx b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.txx
rename to Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.txx
diff --git a/Testing/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionBinaryImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionBinaryImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbAngularProjectionImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbAngularProjectionImageFilter.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbAngularProjectionImageFilterNew.cxx b/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbAngularProjectionImageFilterNew.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbAngularProjectionSetImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionSetImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbAngularProjectionSetImageFilter.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionSetImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbAngularProjectionSetImageFilterNew.cxx b/Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionSetImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbAngularProjectionSetImageFilterNew.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbAngularProjectionSetImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbEstimateInnerProductPCAImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbEstimateInnerProductPCAImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbEstimateInnerProductPCAImageFilterNew.cxx b/Modules/Filtering/DimensionalityReduction/test/otbEstimateInnerProductPCAImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbEstimateInnerProductPCAImageFilterNew.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbEstimateInnerProductPCAImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbFastICAImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbFastICAImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbFastICAImageFilter.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbFastICAImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbInnerProductPCAImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbInnerProductPCAImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilterNew.cxx b/Modules/Filtering/DimensionalityReduction/test/otbInnerProductPCAImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbInnerProductPCAImageFilterNew.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbInnerProductPCAImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbMNFImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbMNFImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMNFImageFilter.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbMNFImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbMaximumAutocorrelationFactorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbMaximumAutocorrelationFactorImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbNAPCAImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbNAPCAImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbNAPCAImageFilter.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbNAPCAImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbNormalizeInnerProductPCAImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbNormalizeInnerProductPCAImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilterNew.cxx b/Modules/Filtering/DimensionalityReduction/test/otbNormalizeInnerProductPCAImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilterNew.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbNormalizeInnerProductPCAImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbPCAImageFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbPCAImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPCAImageFilter.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbPCAImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.cxx b/Modules/Filtering/DimensionalityReduction/test/otbSparseWvltToAngleMapperListFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbSparseWvltToAngleMapperListFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilterNew.cxx b/Modules/Filtering/DimensionalityReduction/test/otbSparseWvltToAngleMapperListFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilterNew.cxx
rename to Modules/Filtering/DimensionalityReduction/test/otbSparseWvltToAngleMapperListFilterNew.cxx
diff --git a/Code/BasicFilters/otbAlphaBlendingFunctor.h b/Modules/Filtering/ImageManipulation/include/otbAlphaBlendingFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbAlphaBlendingFunctor.h
rename to Modules/Filtering/ImageManipulation/include/otbAlphaBlendingFunctor.h
diff --git a/Code/BasicFilters/otbAmplitudeFunctor.h b/Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbAmplitudeFunctor.h
rename to Modules/Filtering/ImageManipulation/include/otbAmplitudeFunctor.h
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
similarity index 100%
rename from Code/Common/otbBinaryFunctorNeighborhoodImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.txx
similarity index 100%
rename from Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.txx
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
similarity index 100%
rename from Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
similarity index 100%
rename from Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbBinaryImageDensityFunction.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
similarity index 100%
rename from Code/BasicFilters/otbBinaryImageDensityFunction.h
rename to Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
diff --git a/Code/BasicFilters/otbBinaryImageDensityFunction.txx b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbBinaryImageDensityFunction.txx
rename to Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.txx
diff --git a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
similarity index 100%
rename from Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.h
rename to Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
diff --git a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.txx
similarity index 100%
rename from Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
rename to Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.txx
diff --git a/Code/BasicFilters/otbBinaryImageToDensityImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbBinaryImageToDensityImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
diff --git a/Code/BasicFilters/otbBinaryImageToDensityImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbBinaryImageToDensityImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.txx
diff --git a/Code/BasicFilters/otbBinarySpectralAngleFunctor.h b/Modules/Filtering/ImageManipulation/include/otbBinarySpectralAngleFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbBinarySpectralAngleFunctor.h
rename to Modules/Filtering/ImageManipulation/include/otbBinarySpectralAngleFunctor.h
diff --git a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbBoxAndWhiskerImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
diff --git a/Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbBoxAndWhiskerImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.txx
diff --git a/Code/BasicFilters/otbChangeLabelImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbChangeLabelImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
diff --git a/Code/BasicFilters/otbChangeLabelImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbChangeLabelImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.txx
diff --git a/Code/BasicFilters/otbClampImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbClampImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
diff --git a/Code/BasicFilters/otbClampImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbClampImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbClampImageFilter.txx
diff --git a/Code/BasicFilters/otbClampVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbClampVectorImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
diff --git a/Code/BasicFilters/otbClampVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbClampVectorImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbConcatenateScalarValueImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbConcatenateScalarValueImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
diff --git a/Code/BasicFilters/otbConcatenateScalarValueImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbConcatenateScalarValueImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.txx
diff --git a/Code/Common/otbConcatenateVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
similarity index 100%
rename from Code/Common/otbConcatenateVectorImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
diff --git a/Code/Common/otbConcatenateVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.txx
similarity index 100%
rename from Code/Common/otbConcatenateVectorImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.txx
diff --git a/Code/IO/otbDEMToImageGenerator.h b/Modules/Filtering/ImageManipulation/include/otbDEMToImageGenerator.h
similarity index 100%
rename from Code/IO/otbDEMToImageGenerator.h
rename to Modules/Filtering/ImageManipulation/include/otbDEMToImageGenerator.h
diff --git a/Code/IO/otbDEMToImageGenerator.txx b/Modules/Filtering/ImageManipulation/include/otbDEMToImageGenerator.txx
similarity index 100%
rename from Code/IO/otbDEMToImageGenerator.txx
rename to Modules/Filtering/ImageManipulation/include/otbDEMToImageGenerator.txx
diff --git a/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
diff --git a/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.txx
diff --git a/Code/BasicFilters/otbHillShadingFilter.h b/Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h
similarity index 100%
rename from Code/BasicFilters/otbHillShadingFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbHillShadingFilter.h
diff --git a/Code/BasicFilters/otbHillShadingFunctor.h b/Modules/Filtering/ImageManipulation/include/otbHillShadingFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbHillShadingFunctor.h
rename to Modules/Filtering/ImageManipulation/include/otbHillShadingFunctor.h
diff --git a/Code/Common/otbImageToImageListFilter.h b/Modules/Filtering/ImageManipulation/include/otbImageToImageListFilter.h
similarity index 100%
rename from Code/Common/otbImageToImageListFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbImageToImageListFilter.h
diff --git a/Code/Common/otbImageToImageListFilter.txx b/Modules/Filtering/ImageManipulation/include/otbImageToImageListFilter.txx
similarity index 100%
rename from Code/Common/otbImageToImageListFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbImageToImageListFilter.txx
diff --git a/Code/Common/otbImageToVectorImageCastFilter.h b/Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h
similarity index 100%
rename from Code/Common/otbImageToVectorImageCastFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbImageToVectorImageCastFilter.h
diff --git a/Code/BasicFilters/otbInverseLogPolarTransform.h b/Modules/Filtering/ImageManipulation/include/otbInverseLogPolarTransform.h
similarity index 100%
rename from Code/BasicFilters/otbInverseLogPolarTransform.h
rename to Modules/Filtering/ImageManipulation/include/otbInverseLogPolarTransform.h
diff --git a/Code/BasicFilters/otbInverseLogPolarTransform.txx b/Modules/Filtering/ImageManipulation/include/otbInverseLogPolarTransform.txx
similarity index 100%
rename from Code/BasicFilters/otbInverseLogPolarTransform.txx
rename to Modules/Filtering/ImageManipulation/include/otbInverseLogPolarTransform.txx
diff --git a/Code/BasicFilters/otbLocalActivityVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbLocalActivityVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbLocalActivityVectorImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbLocalActivityVectorImageFilter.h
diff --git a/Code/BasicFilters/otbLocalGradientVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbLocalGradientVectorImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbLocalGradientVectorImageFilter.h
diff --git a/Code/BasicFilters/otbLog10ThresholdedImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbLog10ThresholdedImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbLog10ThresholdedImageFilter.h
diff --git a/Code/BasicFilters/otbMatrixImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbMatrixImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
diff --git a/Code/BasicFilters/otbMatrixImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbMatrixImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.txx
diff --git a/Code/BasicFilters/otbMeanFunctor.h b/Modules/Filtering/ImageManipulation/include/otbMeanFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbMeanFunctor.h
rename to Modules/Filtering/ImageManipulation/include/otbMeanFunctor.h
diff --git a/Code/FeatureExtraction/otbMultiplyByScalarImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbMultiplyByScalarImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbMultiplyByScalarImageFilter.h
diff --git a/Code/BasicFilters/otbPerBandVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbPerBandVectorImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
diff --git a/Code/BasicFilters/otbPerBandVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbPerBandVectorImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbPhaseFunctor.h b/Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbPhaseFunctor.h
rename to Modules/Filtering/ImageManipulation/include/otbPhaseFunctor.h
diff --git a/Code/BasicFilters/otbPrintableImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbPrintableImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
diff --git a/Code/BasicFilters/otbPrintableImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbPrintableImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.txx
diff --git a/Code/BasicFilters/otbRealAndImaginaryImageToComplexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbRealAndImaginaryImageToComplexImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbRealAndImaginaryImageToComplexImageFilter.h
diff --git a/Code/BasicFilters/otbRealImageToComplexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbRealImageToComplexImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbRealImageToComplexImageFilter.h
diff --git a/Code/Common/otbShiftScaleImageAdaptor.h b/Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h
similarity index 100%
rename from Code/Common/otbShiftScaleImageAdaptor.h
rename to Modules/Filtering/ImageManipulation/include/otbShiftScaleImageAdaptor.h
diff --git a/Code/BasicFilters/otbShiftScaleVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbShiftScaleVectorImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
diff --git a/Code/BasicFilters/otbShiftScaleVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbShiftScaleVectorImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
diff --git a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.txx
diff --git a/Code/FeatureExtraction/otbSpectralAngleFunctor.h b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleFunctor.h
similarity index 100%
rename from Code/FeatureExtraction/otbSpectralAngleFunctor.h
rename to Modules/Filtering/ImageManipulation/include/otbSpectralAngleFunctor.h
diff --git a/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h b/Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h
similarity index 100%
rename from Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
rename to Modules/Filtering/ImageManipulation/include/otbSqrtSpectralAngleFunctor.h
diff --git a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
diff --git a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
diff --git a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.txx
diff --git a/Code/BasicFilters/otbStreamingResampleImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbStreamingResampleImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
diff --git a/Code/BasicFilters/otbStreamingResampleImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbStreamingResampleImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.txx
diff --git a/Code/BasicFilters/otbStreamingShrinkImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbStreamingShrinkImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
diff --git a/Code/BasicFilters/otbStreamingShrinkImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbStreamingShrinkImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.txx
diff --git a/Code/BasicFilters/otbThresholdVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbThresholdVectorImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
diff --git a/Code/BasicFilters/otbThresholdVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbThresholdVectorImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbTileImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbTileImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
diff --git a/Code/BasicFilters/otbTileImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbTileImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbTileImageFilter.txx
diff --git a/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
similarity index 100%
rename from Code/Common/otbUnaryFunctorNeighborhoodImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
diff --git a/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.txx
similarity index 100%
rename from Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.txx
diff --git a/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
similarity index 100%
rename from Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
diff --git a/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx
similarity index 100%
rename from Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx
diff --git a/Code/Common/otbUnaryFunctorWithIndexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
similarity index 100%
rename from Code/Common/otbUnaryFunctorWithIndexImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
diff --git a/Code/Common/otbUnaryFunctorWithIndexImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.txx
similarity index 100%
rename from Code/Common/otbUnaryFunctorWithIndexImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.txx
diff --git a/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
diff --git a/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
diff --git a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.txx
diff --git a/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbVectorImageToAmplitudeImageFilter.h
diff --git a/Code/BasicFilters/otbVectorImageToImageListFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorImageToImageListFilter.h
similarity index 100%
rename from Code/BasicFilters/otbVectorImageToImageListFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbVectorImageToImageListFilter.h
diff --git a/Code/BasicFilters/otbVectorImageToImageListFilter.txx b/Modules/Filtering/ImageManipulation/include/otbVectorImageToImageListFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbVectorImageToImageListFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbVectorImageToImageListFilter.txx
diff --git a/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbVectorRescaleIntensityImageFilter.h
rename to Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
diff --git a/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
rename to Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.txx
diff --git a/Code/BasicFilters/otbStreamingShrinkImageFilter.cxx b/Modules/Filtering/ImageManipulation/src/otbStreamingShrinkImageFilter.cxx
similarity index 100%
rename from Code/BasicFilters/otbStreamingShrinkImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/src/otbStreamingShrinkImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbAmplitudeFunctorTest.cxx b/Modules/Filtering/ImageManipulation/test/otbAmplitudeFunctorTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbAmplitudeFunctorTest.cxx
rename to Modules/Filtering/ImageManipulation/test/otbAmplitudeFunctorTest.cxx
diff --git a/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx b/Modules/Filtering/ImageManipulation/test/otbBCOInterpolateImageFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx
rename to Modules/Filtering/ImageManipulation/test/otbBCOInterpolateImageFunction.cxx
diff --git a/Testing/Code/BasicFilters/otbBinaryImageDensityFunction.cxx b/Modules/Filtering/ImageManipulation/test/otbBinaryImageDensityFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBinaryImageDensityFunction.cxx
rename to Modules/Filtering/ImageManipulation/test/otbBinaryImageDensityFunction.cxx
diff --git a/Testing/Code/BasicFilters/otbBinaryImageDensityFunctionNew.cxx b/Modules/Filtering/ImageManipulation/test/otbBinaryImageDensityFunctionNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBinaryImageDensityFunctionNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbBinaryImageDensityFunctionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.cxx b/Modules/Filtering/ImageManipulation/test/otbBinaryImageMinimalBoundingRegionCalculator.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.cxx
rename to Modules/Filtering/ImageManipulation/test/otbBinaryImageMinimalBoundingRegionCalculator.cxx
diff --git a/Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx b/Modules/Filtering/ImageManipulation/test/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbBinaryImageMinimalBoundingRegionCalculatorNew.cxx
diff --git a/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbBinaryImageToDensityImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbBinaryImageToDensityImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbBinaryImageToDensityImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBinaryImageToDensityImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbBinaryImageToDensityImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbBoxAndWhiskerImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbBoxAndWhiskerImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbBoxAndWhiskerImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbBoxAndWhiskerImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbChangeLabelImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbChangeLabelImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbChangeLabelImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbChangeLabelImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbChangeLabelImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbChangeLabelImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbChangeLabelImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbChangeLabelImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbClampImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbClampImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbClampImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbClampImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbClampVectorImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbClampVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbClampVectorImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbClampVectorImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbConcatenateScalarValueImageFilterTest.cxx b/Modules/Filtering/ImageManipulation/test/otbConcatenateScalarValueImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbConcatenateScalarValueImageFilterTest.cxx
rename to Modules/Filtering/ImageManipulation/test/otbConcatenateScalarValueImageFilterTest.cxx
diff --git a/Testing/Code/Common/otbConcatenateVectorImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbConcatenateVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbConcatenateVectorImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbConcatenateVectorImageFilter.cxx
diff --git a/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbConcatenateVectorImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbConcatenateVectorImageFilterNew.cxx
diff --git a/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx b/Modules/Filtering/ImageManipulation/test/otbDEMToImageGeneratorFromImageTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx
rename to Modules/Filtering/ImageManipulation/test/otbDEMToImageGeneratorFromImageTest.cxx
diff --git a/Testing/Code/IO/otbDEMToImageGeneratorNew.cxx b/Modules/Filtering/ImageManipulation/test/otbDEMToImageGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbDEMToImageGeneratorNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbDEMToImageGeneratorNew.cxx
diff --git a/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx b/Modules/Filtering/ImageManipulation/test/otbDEMToImageGeneratorTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbDEMToImageGeneratorTest.cxx
rename to Modules/Filtering/ImageManipulation/test/otbDEMToImageGeneratorTest.cxx
diff --git a/Testing/Code/BasicFilters/otbExtractROIResample.cxx b/Modules/Filtering/ImageManipulation/test/otbExtractROIResample.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbExtractROIResample.cxx
rename to Modules/Filtering/ImageManipulation/test/otbExtractROIResample.cxx
diff --git a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbFunctionWithNeighborhoodToImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbFunctionWithNeighborhoodToImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbFunctionWithNeighborhoodToImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbFunctionWithNeighborhoodToImageFilterNew.cxx
diff --git a/Testing/Code/Common/otbImageToImageListFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbImageToImageListFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageToImageListFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbImageToImageListFilterNew.cxx
diff --git a/Testing/Code/Common/otbImageToVectorImageCastFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbImageToVectorImageCastFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageToVectorImageCastFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbImageToVectorImageCastFilter.cxx
diff --git a/Testing/Code/Common/otbImageToVectorImageCastFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbImageToVectorImageCastFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageToVectorImageCastFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbImageToVectorImageCastFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbInverseLogPolarTransform.cxx b/Modules/Filtering/ImageManipulation/test/otbInverseLogPolarTransform.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbInverseLogPolarTransform.cxx
rename to Modules/Filtering/ImageManipulation/test/otbInverseLogPolarTransform.cxx
diff --git a/Testing/Code/BasicFilters/otbInverseLogPolarTransformNew.cxx b/Modules/Filtering/ImageManipulation/test/otbInverseLogPolarTransformNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbInverseLogPolarTransformNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbInverseLogPolarTransformNew.cxx
diff --git a/Testing/Code/BasicFilters/otbInverseLogPolarTransformResample.cxx b/Modules/Filtering/ImageManipulation/test/otbInverseLogPolarTransformResample.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbInverseLogPolarTransformResample.cxx
rename to Modules/Filtering/ImageManipulation/test/otbInverseLogPolarTransformResample.cxx
diff --git a/Testing/Code/BasicFilters/otbLocalActivityVectorImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbLocalActivityVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLocalActivityVectorImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbLocalActivityVectorImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbLocalGradientVectorImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbLocalGradientVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLocalGradientVectorImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbLocalGradientVectorImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbLog10ThresholdedImageFilterTest.cxx b/Modules/Filtering/ImageManipulation/test/otbLog10ThresholdedImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLog10ThresholdedImageFilterTest.cxx
rename to Modules/Filtering/ImageManipulation/test/otbLog10ThresholdedImageFilterTest.cxx
diff --git a/Testing/Code/BasicFilters/otbMatrixImageFilterTest.cxx b/Modules/Filtering/ImageManipulation/test/otbMatrixImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMatrixImageFilterTest.cxx
rename to Modules/Filtering/ImageManipulation/test/otbMatrixImageFilterTest.cxx
diff --git a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbMatrixTransposeMatrixImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbMatrixTransposeMatrixImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbMatrixTransposeMatrixImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbMatrixTransposeMatrixImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbMeanFunctorImageTest.cxx b/Modules/Filtering/ImageManipulation/test/otbMeanFunctorImageTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMeanFunctorImageTest.cxx
rename to Modules/Filtering/ImageManipulation/test/otbMeanFunctorImageTest.cxx
diff --git a/Testing/Code/FeatureExtraction/otbMultiplyByScalarImageTest.cxx b/Modules/Filtering/ImageManipulation/test/otbMultiplyByScalarImageTest.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbMultiplyByScalarImageTest.cxx
rename to Modules/Filtering/ImageManipulation/test/otbMultiplyByScalarImageTest.cxx
diff --git a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithMeanFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterWithMeanFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithMeanFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterWithMeanFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithSobelFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterWithSobelFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithSobelFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterWithSobelFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbPhaseFunctorTest.cxx b/Modules/Filtering/ImageManipulation/test/otbPhaseFunctorTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPhaseFunctorTest.cxx
rename to Modules/Filtering/ImageManipulation/test/otbPhaseFunctorTest.cxx
diff --git a/Testing/Code/BasicFilters/otbPrintableImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbPrintableImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPrintableImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbPrintableImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbPrintableImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbPrintableImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPrintableImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbPrintableImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbPrintableImageFilterWithMask.cxx b/Modules/Filtering/ImageManipulation/test/otbPrintableImageFilterWithMask.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPrintableImageFilterWithMask.cxx
rename to Modules/Filtering/ImageManipulation/test/otbPrintableImageFilterWithMask.cxx
diff --git a/Testing/Code/BasicFilters/otbProlateInterpolateImageFunction.cxx b/Modules/Filtering/ImageManipulation/test/otbProlateInterpolateImageFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbProlateInterpolateImageFunction.cxx
rename to Modules/Filtering/ImageManipulation/test/otbProlateInterpolateImageFunction.cxx
diff --git a/Testing/Code/BasicFilters/otbProlateValidationTest.cxx b/Modules/Filtering/ImageManipulation/test/otbProlateValidationTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbProlateValidationTest.cxx
rename to Modules/Filtering/ImageManipulation/test/otbProlateValidationTest.cxx
diff --git a/Testing/Code/Projections/otbRegionProjectionResampler.cxx b/Modules/Filtering/ImageManipulation/test/otbRegionProjectionResampler.cxx
similarity index 100%
rename from Testing/Code/Projections/otbRegionProjectionResampler.cxx
rename to Modules/Filtering/ImageManipulation/test/otbRegionProjectionResampler.cxx
diff --git a/Testing/Code/Common/otbShiftScaleImageAdaptor.cxx b/Modules/Filtering/ImageManipulation/test/otbShiftScaleImageAdaptor.cxx
similarity index 100%
rename from Testing/Code/Common/otbShiftScaleImageAdaptor.cxx
rename to Modules/Filtering/ImageManipulation/test/otbShiftScaleImageAdaptor.cxx
diff --git a/Testing/Code/Common/otbShiftScaleImageAdaptorNew.cxx b/Modules/Filtering/ImageManipulation/test/otbShiftScaleImageAdaptorNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbShiftScaleImageAdaptorNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbShiftScaleImageAdaptorNew.cxx
diff --git a/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbShiftScaleVectorImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbShiftScaleVectorImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbSpectralAngleDistanceImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbSpectralAngleDistanceImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbSpectralAngleDistanceImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbSpectralAngleDistanceImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbSpectralAngleDistanceImageFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbSqrtSpectralAngleImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbSqrtSpectralAngleImageFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbSqrtSpectralAngleImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbSqrtSpectralAngleImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbStreamingInnerProductVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbStreamingInnerProductVectorImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbStreamingInnerProductVectorImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbStreamingInnerProductVectorImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbStreamingResampleImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingResampleImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbStreamingResampleImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterCompareWithITK.cxx b/Modules/Filtering/ImageManipulation/test/otbStreamingResampleImageFilterCompareWithITK.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingResampleImageFilterCompareWithITK.cxx
rename to Modules/Filtering/ImageManipulation/test/otbStreamingResampleImageFilterCompareWithITK.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbStreamingResampleImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbStreamingResampleImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterWithAffineTransform.cxx b/Modules/Filtering/ImageManipulation/test/otbStreamingResampleImageFilterWithAffineTransform.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingResampleImageFilterWithAffineTransform.cxx
rename to Modules/Filtering/ImageManipulation/test/otbStreamingResampleImageFilterWithAffineTransform.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingShrinkImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbStreamingShrinkImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingShrinkImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbStreamingShrinkImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingShrinkImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbStreamingShrinkImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingShrinkImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbStreamingShrinkImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbThresholdVectorImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbThresholdVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbThresholdVectorImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbThresholdVectorImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbTileImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbTileImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbTileImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbTileImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbUnaryFunctorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbUnaryFunctorImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbUnaryFunctorImageFilterNew.cxx
diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodImageFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodImageFilter.cxx
diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbUnaryFunctorNeighborhoodImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodImageFilterNew.cxx
diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx
diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx
diff --git a/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorWithIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbUnaryFunctorWithIndexImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbUnaryFunctorWithIndexImageFilter.cxx
diff --git a/Testing/Code/Common/otbUnaryFunctorWithIndexImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryFunctorWithIndexImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbUnaryFunctorWithIndexImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbUnaryFunctorWithIndexImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryImageFunctorWithVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbUnaryImageFunctorWithVectorImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbUnaryImageFunctorWithVectorImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbUnaryImageFunctorWithVectorImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbVectorImageTo3DScalarImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbVectorImageTo3DScalarImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbVectorImageTo3DScalarImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbVectorImageTo3DScalarImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbVectorImageToAmplitudeImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbVectorImageToAmplitudeImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbVectorImageToAmplitudeImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVectorImageToAmplitudeImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbVectorImageToAmplitudeImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbVectorImageToImageListFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbVectorImageToImageListFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVectorImageToImageListFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbVectorImageToImageListFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbVectorImageToImageListFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbVectorImageToImageListFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVectorImageToImageListFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbVectorImageToImageListFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbVectorRescaleIntensityImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.cxx
rename to Modules/Filtering/ImageManipulation/test/otbVectorRescaleIntensityImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbVectorRescaleIntensityImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilterNew.cxx
rename to Modules/Filtering/ImageManipulation/test/otbVectorRescaleIntensityImageFilterNew.cxx
diff --git a/Code/BasicFilters/otbFrostImageFilter.h b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbFrostImageFilter.h
rename to Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
diff --git a/Code/BasicFilters/otbFrostImageFilter.txx b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbFrostImageFilter.txx
rename to Modules/Filtering/ImageNoise/include/otbFrostImageFilter.txx
diff --git a/Code/BasicFilters/otbLeeImageFilter.h b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbLeeImageFilter.h
rename to Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
diff --git a/Code/BasicFilters/otbLeeImageFilter.txx b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbLeeImageFilter.txx
rename to Modules/Filtering/ImageNoise/include/otbLeeImageFilter.txx
diff --git a/Code/BasicFilters/otbNoiseEstimatorVectorImageFilter.h b/Modules/Filtering/ImageNoise/include/otbNoiseEstimatorVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbNoiseEstimatorVectorImageFilter.h
rename to Modules/Filtering/ImageNoise/include/otbNoiseEstimatorVectorImageFilter.h
diff --git a/Testing/Code/BasicFilters/otbFrostFilter.cxx b/Modules/Filtering/ImageNoise/test/otbFrostFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbFrostFilter.cxx
rename to Modules/Filtering/ImageNoise/test/otbFrostFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbFrostFilterNew.cxx b/Modules/Filtering/ImageNoise/test/otbFrostFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbFrostFilterNew.cxx
rename to Modules/Filtering/ImageNoise/test/otbFrostFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbLeeFilter.cxx b/Modules/Filtering/ImageNoise/test/otbLeeFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLeeFilter.cxx
rename to Modules/Filtering/ImageNoise/test/otbLeeFilter.cxx
diff --git a/Code/BasicFilters/otbBandMathImageFilter.h b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbBandMathImageFilter.h
rename to Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
diff --git a/Code/BasicFilters/otbBandMathImageFilter.txx b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbBandMathImageFilter.txx
rename to Modules/Filtering/MathParser/include/otbBandMathImageFilter.txx
diff --git a/Code/BasicFilters/otbBandMathXImageFilter.h b/Modules/Filtering/MathParser/include/otbBandMathXImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbBandMathXImageFilter.h
rename to Modules/Filtering/MathParser/include/otbBandMathXImageFilter.h
diff --git a/Code/BasicFilters/otbBandMathXImageFilter.txx b/Modules/Filtering/MathParser/include/otbBandMathXImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbBandMathXImageFilter.txx
rename to Modules/Filtering/MathParser/include/otbBandMathXImageFilter.txx
diff --git a/Code/BasicFilters/otbMaskMuParserFilter.h b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
similarity index 100%
rename from Code/BasicFilters/otbMaskMuParserFilter.h
rename to Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
diff --git a/Code/BasicFilters/otbMaskMuParserFilter.txx b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbMaskMuParserFilter.txx
rename to Modules/Filtering/MathParser/include/otbMaskMuParserFilter.txx
diff --git a/Code/BasicFilters/otbMaskMuParserFunctor.h b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbMaskMuParserFunctor.h
rename to Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
diff --git a/Code/BasicFilters/otbMaskMuParserFunctor.txx b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.txx
similarity index 100%
rename from Code/BasicFilters/otbMaskMuParserFunctor.txx
rename to Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.txx
diff --git a/Code/BasicFilters/otbOBIAMuParserFunctor.h b/Modules/Filtering/MathParser/include/otbOBIAMuParserFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbOBIAMuParserFunctor.h
rename to Modules/Filtering/MathParser/include/otbOBIAMuParserFunctor.h
diff --git a/Code/Common/otbParser.h b/Modules/Filtering/MathParser/include/otbParser.h
similarity index 100%
rename from Code/Common/otbParser.h
rename to Modules/Filtering/MathParser/include/otbParser.h
diff --git a/Code/BasicFilters/otbParserConditionDataNodeFeatureFunction.h b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
similarity index 100%
rename from Code/BasicFilters/otbParserConditionDataNodeFeatureFunction.h
rename to Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
diff --git a/Code/BasicFilters/otbParserConditionDataNodeFeatureFunction.txx b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbParserConditionDataNodeFeatureFunction.txx
rename to Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.txx
diff --git a/Code/Common/otbParserX.h b/Modules/Filtering/MathParser/include/otbParserX.h
similarity index 100%
rename from Code/Common/otbParserX.h
rename to Modules/Filtering/MathParser/include/otbParserX.h
diff --git a/Code/Common/otbParserXPlugins.h b/Modules/Filtering/MathParser/include/otbParserXPlugins.h
similarity index 100%
rename from Code/Common/otbParserXPlugins.h
rename to Modules/Filtering/MathParser/include/otbParserXPlugins.h
diff --git a/Code/Common/otbParser.cxx b/Modules/Filtering/MathParser/src/otbParser.cxx
similarity index 100%
rename from Code/Common/otbParser.cxx
rename to Modules/Filtering/MathParser/src/otbParser.cxx
diff --git a/Code/Common/otbParserX.cxx b/Modules/Filtering/MathParser/src/otbParserX.cxx
similarity index 100%
rename from Code/Common/otbParserX.cxx
rename to Modules/Filtering/MathParser/src/otbParserX.cxx
diff --git a/Code/Common/otbParserXPlugins.cxx b/Modules/Filtering/MathParser/src/otbParserXPlugins.cxx
similarity index 100%
rename from Code/Common/otbParserXPlugins.cxx
rename to Modules/Filtering/MathParser/src/otbParserXPlugins.cxx
diff --git a/Testing/Code/BasicFilters/otbBandMathImageFilter.cxx b/Modules/Filtering/MathParser/test/otbBandMathImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBandMathImageFilter.cxx
rename to Modules/Filtering/MathParser/test/otbBandMathImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbBandMathXImageFilter.cxx b/Modules/Filtering/MathParser/test/otbBandMathXImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbBandMathXImageFilter.cxx
rename to Modules/Filtering/MathParser/test/otbBandMathXImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbImageListToSingleImageFilterTest.cxx b/Modules/Filtering/MathParser/test/otbImageListToSingleImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbImageListToSingleImageFilterTest.cxx
rename to Modules/Filtering/MathParser/test/otbImageListToSingleImageFilterTest.cxx
diff --git a/Testing/Code/BasicFilters/otbMaskMuParserFilterNew.cxx b/Modules/Filtering/MathParser/test/otbMaskMuParserFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMaskMuParserFilterNew.cxx
rename to Modules/Filtering/MathParser/test/otbMaskMuParserFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbMaskMuParserFilterTest.cxx b/Modules/Filtering/MathParser/test/otbMaskMuParserFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMaskMuParserFilterTest.cxx
rename to Modules/Filtering/MathParser/test/otbMaskMuParserFilterTest.cxx
diff --git a/Testing/Code/BasicFilters/otbParserConditionDataNodeFeatureFunction.cxx b/Modules/Filtering/MathParser/test/otbParserConditionDataNodeFeatureFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbParserConditionDataNodeFeatureFunction.cxx
rename to Modules/Filtering/MathParser/test/otbParserConditionDataNodeFeatureFunction.cxx
diff --git a/Testing/Code/Common/otbParserTest.cxx b/Modules/Filtering/MathParser/test/otbParserTest.cxx
similarity index 100%
rename from Testing/Code/Common/otbParserTest.cxx
rename to Modules/Filtering/MathParser/test/otbParserTest.cxx
diff --git a/Testing/Code/Common/otbParserXTest.cxx b/Modules/Filtering/MathParser/test/otbParserXTest.cxx
similarity index 100%
rename from Testing/Code/Common/otbParserXTest.cxx
rename to Modules/Filtering/MathParser/test/otbParserXTest.cxx
diff --git a/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
similarity index 100%
rename from Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.h
rename to Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
diff --git a/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.txx
similarity index 100%
rename from Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx
rename to Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.txx
diff --git a/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
similarity index 100%
rename from Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.h
rename to Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
diff --git a/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.txx
similarity index 100%
rename from Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.txx
rename to Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.txx
diff --git a/Code/MultiScale/otbMorphologicalPyramidResampler.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
similarity index 100%
rename from Code/MultiScale/otbMorphologicalPyramidResampler.h
rename to Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
diff --git a/Code/MultiScale/otbMorphologicalPyramidResampler.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.txx
similarity index 100%
rename from Code/MultiScale/otbMorphologicalPyramidResampler.txx
rename to Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.txx
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
similarity index 100%
rename from Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.h
rename to Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.txx
similarity index 100%
rename from Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx
rename to Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.txx
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmenter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
similarity index 100%
rename from Code/MultiScale/otbMorphologicalPyramidSegmenter.h
rename to Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.txx
similarity index 100%
rename from Code/MultiScale/otbMorphologicalPyramidSegmenter.txx
rename to Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.txx
diff --git a/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
similarity index 100%
rename from Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.h
rename to Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
diff --git a/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.txx
similarity index 100%
rename from Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx
rename to Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.txx
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidAnalysisFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.cxx
rename to Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidAnalysisFilter.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilterNew.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidAnalysisFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalPyramidAnalysisFilterNew.cxx
rename to Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidAnalysisFilterNew.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidMRToMSConverter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.cxx
rename to Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidMRToMSConverter.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverterNew.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidMRToMSConverterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalPyramidMRToMSConverterNew.cxx
rename to Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidMRToMSConverterNew.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidResampler.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidResampler.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalPyramidResampler.cxx
rename to Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidResampler.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidResamplerNew.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidResamplerNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalPyramidResamplerNew.cxx
rename to Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidResamplerNew.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmentationFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.cxx
rename to Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmentationFilter.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilterNew.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmentationFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalPyramidSegmentationFilterNew.cxx
rename to Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmentationFilterNew.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenter.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmenter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalPyramidSegmenter.cxx
rename to Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmenter.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSegmenterNew.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmenterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalPyramidSegmenterNew.cxx
rename to Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSegmenterNew.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSynthesisFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.cxx
rename to Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSynthesisFilter.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilterNew.cxx b/Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSynthesisFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalPyramidSynthesisFilterNew.cxx
rename to Modules/Filtering/MorphologicalPyramid/test/otbMorphologicalPyramidSynthesisFilterNew.cxx
diff --git a/Code/FeatureExtraction/otbAddCarvingPathFilter.h b/Modules/Filtering/Path/include/otbAddCarvingPathFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbAddCarvingPathFilter.h
rename to Modules/Filtering/Path/include/otbAddCarvingPathFilter.h
diff --git a/Code/FeatureExtraction/otbAddCarvingPathFilter.txx b/Modules/Filtering/Path/include/otbAddCarvingPathFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbAddCarvingPathFilter.txx
rename to Modules/Filtering/Path/include/otbAddCarvingPathFilter.txx
diff --git a/Code/FeatureExtraction/otbBreakAngularPathListFilter.h b/Modules/Filtering/Path/include/otbBreakAngularPathListFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbBreakAngularPathListFilter.h
rename to Modules/Filtering/Path/include/otbBreakAngularPathListFilter.h
diff --git a/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx b/Modules/Filtering/Path/include/otbBreakAngularPathListFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbBreakAngularPathListFilter.txx
rename to Modules/Filtering/Path/include/otbBreakAngularPathListFilter.txx
diff --git a/Code/BasicFilters/otbClosePathFunctor.h b/Modules/Filtering/Path/include/otbClosePathFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbClosePathFunctor.h
rename to Modules/Filtering/Path/include/otbClosePathFunctor.h
diff --git a/Code/FeatureExtraction/otbCompacityPathFunction.h b/Modules/Filtering/Path/include/otbCompacityPathFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbCompacityPathFunction.h
rename to Modules/Filtering/Path/include/otbCompacityPathFunction.h
diff --git a/Code/FeatureExtraction/otbCompacityPathFunction.txx b/Modules/Filtering/Path/include/otbCompacityPathFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbCompacityPathFunction.txx
rename to Modules/Filtering/Path/include/otbCompacityPathFunction.txx
diff --git a/Code/Common/otbDrawPathFilter.h b/Modules/Filtering/Path/include/otbDrawPathFilter.h
similarity index 100%
rename from Code/Common/otbDrawPathFilter.h
rename to Modules/Filtering/Path/include/otbDrawPathFilter.h
diff --git a/Code/Common/otbDrawPathFilter.txx b/Modules/Filtering/Path/include/otbDrawPathFilter.txx
similarity index 100%
rename from Code/Common/otbDrawPathFilter.txx
rename to Modules/Filtering/Path/include/otbDrawPathFilter.txx
diff --git a/Code/Common/otbDrawPathListFilter.h b/Modules/Filtering/Path/include/otbDrawPathListFilter.h
similarity index 100%
rename from Code/Common/otbDrawPathListFilter.h
rename to Modules/Filtering/Path/include/otbDrawPathListFilter.h
diff --git a/Code/Common/otbDrawPathListFilter.txx b/Modules/Filtering/Path/include/otbDrawPathListFilter.txx
similarity index 100%
rename from Code/Common/otbDrawPathListFilter.txx
rename to Modules/Filtering/Path/include/otbDrawPathListFilter.txx
diff --git a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.h b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbImageFittingPolygonListFilter.h
rename to Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
diff --git a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
rename to Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.txx
diff --git a/Code/FeatureExtraction/otbImageToEdgePathFilter.h b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbImageToEdgePathFilter.h
rename to Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
diff --git a/Code/FeatureExtraction/otbImageToEdgePathFilter.txx b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbImageToEdgePathFilter.txx
rename to Modules/Filtering/Path/include/otbImageToEdgePathFilter.txx
diff --git a/Code/Common/otbImageToPathFilter.h b/Modules/Filtering/Path/include/otbImageToPathFilter.h
similarity index 100%
rename from Code/Common/otbImageToPathFilter.h
rename to Modules/Filtering/Path/include/otbImageToPathFilter.h
diff --git a/Code/Common/otbImageToPathFilter.txx b/Modules/Filtering/Path/include/otbImageToPathFilter.txx
similarity index 100%
rename from Code/Common/otbImageToPathFilter.txx
rename to Modules/Filtering/Path/include/otbImageToPathFilter.txx
diff --git a/Code/Common/otbImageToPathListFilter.h b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
similarity index 100%
rename from Code/Common/otbImageToPathListFilter.h
rename to Modules/Filtering/Path/include/otbImageToPathListFilter.h
diff --git a/Code/Common/otbImageToPathListFilter.txx b/Modules/Filtering/Path/include/otbImageToPathListFilter.txx
similarity index 100%
rename from Code/Common/otbImageToPathListFilter.txx
rename to Modules/Filtering/Path/include/otbImageToPathListFilter.txx
diff --git a/Code/FeatureExtraction/otbOrientationPathFunction.h b/Modules/Filtering/Path/include/otbOrientationPathFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbOrientationPathFunction.h
rename to Modules/Filtering/Path/include/otbOrientationPathFunction.h
diff --git a/Code/FeatureExtraction/otbOrientationPathFunction.txx b/Modules/Filtering/Path/include/otbOrientationPathFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbOrientationPathFunction.txx
rename to Modules/Filtering/Path/include/otbOrientationPathFunction.txx
diff --git a/Code/Common/otbPathFunction.h b/Modules/Filtering/Path/include/otbPathFunction.h
similarity index 100%
rename from Code/Common/otbPathFunction.h
rename to Modules/Filtering/Path/include/otbPathFunction.h
diff --git a/Code/Common/otbPathFunction.txx b/Modules/Filtering/Path/include/otbPathFunction.txx
similarity index 100%
rename from Code/Common/otbPathFunction.txx
rename to Modules/Filtering/Path/include/otbPathFunction.txx
diff --git a/Code/BasicFilters/otbPathLengthFunctor.h b/Modules/Filtering/Path/include/otbPathLengthFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbPathLengthFunctor.h
rename to Modules/Filtering/Path/include/otbPathLengthFunctor.h
diff --git a/Code/Common/otbPathListSource.h b/Modules/Filtering/Path/include/otbPathListSource.h
similarity index 100%
rename from Code/Common/otbPathListSource.h
rename to Modules/Filtering/Path/include/otbPathListSource.h
diff --git a/Code/Common/otbPathListToHistogramGenerator.h b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
similarity index 100%
rename from Code/Common/otbPathListToHistogramGenerator.h
rename to Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
diff --git a/Code/Common/otbPathListToHistogramGenerator.txx b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.txx
similarity index 100%
rename from Code/Common/otbPathListToHistogramGenerator.txx
rename to Modules/Filtering/Path/include/otbPathListToHistogramGenerator.txx
diff --git a/Code/Common/otbPathListToPathListFilter.h b/Modules/Filtering/Path/include/otbPathListToPathListFilter.h
similarity index 100%
rename from Code/Common/otbPathListToPathListFilter.h
rename to Modules/Filtering/Path/include/otbPathListToPathListFilter.h
diff --git a/Code/BasicFilters/otbPathMeanDistanceFunctor.h b/Modules/Filtering/Path/include/otbPathMeanDistanceFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbPathMeanDistanceFunctor.h
rename to Modules/Filtering/Path/include/otbPathMeanDistanceFunctor.h
diff --git a/Code/Common/otbPolyLineImageConstIterator.h b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
similarity index 100%
rename from Code/Common/otbPolyLineImageConstIterator.h
rename to Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
diff --git a/Code/Common/otbPolyLineImageConstIterator.txx b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.txx
similarity index 100%
rename from Code/Common/otbPolyLineImageConstIterator.txx
rename to Modules/Filtering/Path/include/otbPolyLineImageConstIterator.txx
diff --git a/Code/Common/otbPolyLineImageIterator.h b/Modules/Filtering/Path/include/otbPolyLineImageIterator.h
similarity index 100%
rename from Code/Common/otbPolyLineImageIterator.h
rename to Modules/Filtering/Path/include/otbPolyLineImageIterator.h
diff --git a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.h
rename to Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
diff --git a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
rename to Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.txx
diff --git a/Code/FeatureExtraction/otbVectorizationPathListFilter.h b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
similarity index 100%
rename from Code/FeatureExtraction/otbVectorizationPathListFilter.h
rename to Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
diff --git a/Code/FeatureExtraction/otbVectorizationPathListFilter.txx b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.txx
similarity index 100%
rename from Code/FeatureExtraction/otbVectorizationPathListFilter.txx
rename to Modules/Filtering/Path/include/otbVectorizationPathListFilter.txx
diff --git a/Testing/Code/FeatureExtraction/otbAddCarvingPathFilterNew.cxx b/Modules/Filtering/Path/test/otbAddCarvingPathFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbAddCarvingPathFilterNew.cxx
rename to Modules/Filtering/Path/test/otbAddCarvingPathFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx b/Modules/Filtering/Path/test/otbBreakAngularPathListFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbBreakAngularPathListFilter.cxx
rename to Modules/Filtering/Path/test/otbBreakAngularPathListFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbBreakAngularPathListFilterNew.cxx b/Modules/Filtering/Path/test/otbBreakAngularPathListFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbBreakAngularPathListFilterNew.cxx
rename to Modules/Filtering/Path/test/otbBreakAngularPathListFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbClosePathFunctor.cxx b/Modules/Filtering/Path/test/otbClosePathFunctor.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbClosePathFunctor.cxx
rename to Modules/Filtering/Path/test/otbClosePathFunctor.cxx
diff --git a/Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx b/Modules/Filtering/Path/test/otbCompacityPathCircle.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbCompacityPathCircle.cxx
rename to Modules/Filtering/Path/test/otbCompacityPathCircle.cxx
diff --git a/Testing/Code/FeatureExtraction/otbCompacityPathNew.cxx b/Modules/Filtering/Path/test/otbCompacityPathNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbCompacityPathNew.cxx
rename to Modules/Filtering/Path/test/otbCompacityPathNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbCompacityPathRectangle.cxx b/Modules/Filtering/Path/test/otbCompacityPathRectangle.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbCompacityPathRectangle.cxx
rename to Modules/Filtering/Path/test/otbCompacityPathRectangle.cxx
diff --git a/Testing/Code/FeatureExtraction/otbCompacityPathSquare.cxx b/Modules/Filtering/Path/test/otbCompacityPathSquare.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbCompacityPathSquare.cxx
rename to Modules/Filtering/Path/test/otbCompacityPathSquare.cxx
diff --git a/Testing/Code/FeatureExtraction/otbDrawPath.cxx b/Modules/Filtering/Path/test/otbDrawPath.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbDrawPath.cxx
rename to Modules/Filtering/Path/test/otbDrawPath.cxx
diff --git a/Testing/Code/Common/otbDrawPathFilter.cxx b/Modules/Filtering/Path/test/otbDrawPathFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbDrawPathFilter.cxx
rename to Modules/Filtering/Path/test/otbDrawPathFilter.cxx
diff --git a/Testing/Code/Common/otbDrawPathFilterNew.cxx b/Modules/Filtering/Path/test/otbDrawPathFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbDrawPathFilterNew.cxx
rename to Modules/Filtering/Path/test/otbDrawPathFilterNew.cxx
diff --git a/Testing/Code/Common/otbDrawPathListFilter.cxx b/Modules/Filtering/Path/test/otbDrawPathListFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbDrawPathListFilter.cxx
rename to Modules/Filtering/Path/test/otbDrawPathListFilter.cxx
diff --git a/Testing/Code/Common/otbDrawPathListFilterNew.cxx b/Modules/Filtering/Path/test/otbDrawPathListFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbDrawPathListFilterNew.cxx
rename to Modules/Filtering/Path/test/otbDrawPathListFilterNew.cxx
diff --git a/Testing/Code/Common/otbDrawPathListFilterWithValue.cxx b/Modules/Filtering/Path/test/otbDrawPathListFilterWithValue.cxx
similarity index 100%
rename from Testing/Code/Common/otbDrawPathListFilterWithValue.cxx
rename to Modules/Filtering/Path/test/otbDrawPathListFilterWithValue.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilter.cxx b/Modules/Filtering/Path/test/otbImageFittingPolygonListFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilter.cxx
rename to Modules/Filtering/Path/test/otbImageFittingPolygonListFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilterNew.cxx b/Modules/Filtering/Path/test/otbImageFittingPolygonListFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilterNew.cxx
rename to Modules/Filtering/Path/test/otbImageFittingPolygonListFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx b/Modules/Filtering/Path/test/otbImageToEdgePathFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToEdgePathFilter.cxx
rename to Modules/Filtering/Path/test/otbImageToEdgePathFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbImageToEdgePathFilterNew.cxx b/Modules/Filtering/Path/test/otbImageToEdgePathFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbImageToEdgePathFilterNew.cxx
rename to Modules/Filtering/Path/test/otbImageToEdgePathFilterNew.cxx
diff --git a/Testing/Code/Common/otbImageToPathFilterNew.cxx b/Modules/Filtering/Path/test/otbImageToPathFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbImageToPathFilterNew.cxx
rename to Modules/Filtering/Path/test/otbImageToPathFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbOrientationPath.cxx b/Modules/Filtering/Path/test/otbOrientationPath.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbOrientationPath.cxx
rename to Modules/Filtering/Path/test/otbOrientationPath.cxx
diff --git a/Testing/Code/FeatureExtraction/otbOrientationPathNew.cxx b/Modules/Filtering/Path/test/otbOrientationPathNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbOrientationPathNew.cxx
rename to Modules/Filtering/Path/test/otbOrientationPathNew.cxx
diff --git a/Testing/Code/BasicFilters/otbPathLengthFunctor.cxx b/Modules/Filtering/Path/test/otbPathLengthFunctor.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPathLengthFunctor.cxx
rename to Modules/Filtering/Path/test/otbPathLengthFunctor.cxx
diff --git a/Testing/Code/Common/otbPathListToHistogramGenerator.cxx b/Modules/Filtering/Path/test/otbPathListToHistogramGenerator.cxx
similarity index 100%
rename from Testing/Code/Common/otbPathListToHistogramGenerator.cxx
rename to Modules/Filtering/Path/test/otbPathListToHistogramGenerator.cxx
diff --git a/Testing/Code/Common/otbPathListToHistogramGeneratorNew.cxx b/Modules/Filtering/Path/test/otbPathListToHistogramGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbPathListToHistogramGeneratorNew.cxx
rename to Modules/Filtering/Path/test/otbPathListToHistogramGeneratorNew.cxx
diff --git a/Testing/Code/Common/otbPathListToPathListFilterNew.cxx b/Modules/Filtering/Path/test/otbPathListToPathListFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbPathListToPathListFilterNew.cxx
rename to Modules/Filtering/Path/test/otbPathListToPathListFilterNew.cxx
diff --git a/Testing/Code/Common/otbPolyLineImageConstIterator.cxx b/Modules/Filtering/Path/test/otbPolyLineImageConstIterator.cxx
similarity index 100%
rename from Testing/Code/Common/otbPolyLineImageConstIterator.cxx
rename to Modules/Filtering/Path/test/otbPolyLineImageConstIterator.cxx
diff --git a/Testing/Code/Common/otbPolyLineImageIterator.cxx b/Modules/Filtering/Path/test/otbPolyLineImageIterator.cxx
similarity index 100%
rename from Testing/Code/Common/otbPolyLineImageIterator.cxx
rename to Modules/Filtering/Path/test/otbPolyLineImageIterator.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx b/Modules/Filtering/Path/test/otbRegionImageToRectangularPathListFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
rename to Modules/Filtering/Path/test/otbRegionImageToRectangularPathListFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx b/Modules/Filtering/Path/test/otbRegionImageToRectangularPathListFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx
rename to Modules/Filtering/Path/test/otbRegionImageToRectangularPathListFilterNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbVectorizationPathListFilter.cxx b/Modules/Filtering/Path/test/otbVectorizationPathListFilter.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbVectorizationPathListFilter.cxx
rename to Modules/Filtering/Path/test/otbVectorizationPathListFilter.cxx
diff --git a/Testing/Code/FeatureExtraction/otbVectorizationPathListFilterNew.cxx b/Modules/Filtering/Path/test/otbVectorizationPathListFilterNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbVectorizationPathListFilterNew.cxx
rename to Modules/Filtering/Path/test/otbVectorizationPathListFilterNew.cxx
diff --git a/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilter.h b/Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerImageFilter.h
similarity index 100%
rename from Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilter.h
rename to Modules/Filtering/Polarimetry/include/otbMuellerToPolarisationDegreeAndPowerImageFilter.h
diff --git a/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilter.h b/Modules/Filtering/Polarimetry/include/otbMuellerToReciprocalCovarianceImageFilter.h
similarity index 100%
rename from Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilter.h
rename to Modules/Filtering/Polarimetry/include/otbMuellerToReciprocalCovarianceImageFilter.h
diff --git a/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.h b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
similarity index 100%
rename from Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.h
rename to Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
diff --git a/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.txx b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.txx
similarity index 100%
rename from Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.txx
rename to Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.txx
diff --git a/Code/SARPolarimetry/otbPolarimetricData.h b/Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
similarity index 100%
rename from Code/SARPolarimetry/otbPolarimetricData.h
rename to Modules/Filtering/Polarimetry/include/otbPolarimetricData.h
diff --git a/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.h b/Modules/Filtering/Polarimetry/include/otbPolarimetricSynthesisFunctor.h
similarity index 100%
rename from Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.h
rename to Modules/Filtering/Polarimetry/include/otbPolarimetricSynthesisFunctor.h
diff --git a/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalCoherencyToReciprocalMuellerImageFilter.h
similarity index 100%
rename from Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilter.h
rename to Modules/Filtering/Polarimetry/include/otbReciprocalCoherencyToReciprocalMuellerImageFilter.h
diff --git a/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToCoherencyDegreeImageFilter.h
similarity index 100%
rename from Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilter.h
rename to Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToCoherencyDegreeImageFilter.h
diff --git a/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h
similarity index 100%
rename from Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h
rename to Modules/Filtering/Polarimetry/include/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.h
diff --git a/Code/SARPolarimetry/otbReciprocalHAlphaImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFilter.h
similarity index 100%
rename from Code/SARPolarimetry/otbReciprocalHAlphaImageFilter.h
rename to Modules/Filtering/Polarimetry/include/otbReciprocalHAlphaImageFilter.h
diff --git a/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h b/Modules/Filtering/Polarimetry/include/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h
similarity index 100%
rename from Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h
rename to Modules/Filtering/Polarimetry/include/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.h
diff --git a/Code/SARPolarimetry/otbSinclairImageFilter.h b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
similarity index 100%
rename from Code/SARPolarimetry/otbSinclairImageFilter.h
rename to Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
diff --git a/Code/SARPolarimetry/otbSinclairImageFilter.txx b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.txx
similarity index 100%
rename from Code/SARPolarimetry/otbSinclairImageFilter.txx
rename to Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.txx
diff --git a/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.h b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
similarity index 100%
rename from Code/SARPolarimetry/otbSinclairReciprocalImageFilter.h
rename to Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
diff --git a/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.txx b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.txx
similarity index 100%
rename from Code/SARPolarimetry/otbSinclairReciprocalImageFilter.txx
rename to Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.txx
diff --git a/Code/SARPolarimetry/otbSinclairToCircularCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToCircularCovarianceMatrixFunctor.h
similarity index 100%
rename from Code/SARPolarimetry/otbSinclairToCircularCovarianceMatrixFunctor.h
rename to Modules/Filtering/Polarimetry/include/otbSinclairToCircularCovarianceMatrixFunctor.h
diff --git a/Code/SARPolarimetry/otbSinclairToCoherencyMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToCoherencyMatrixFunctor.h
similarity index 100%
rename from Code/SARPolarimetry/otbSinclairToCoherencyMatrixFunctor.h
rename to Modules/Filtering/Polarimetry/include/otbSinclairToCoherencyMatrixFunctor.h
diff --git a/Code/SARPolarimetry/otbSinclairToCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToCovarianceMatrixFunctor.h
similarity index 100%
rename from Code/SARPolarimetry/otbSinclairToCovarianceMatrixFunctor.h
rename to Modules/Filtering/Polarimetry/include/otbSinclairToCovarianceMatrixFunctor.h
diff --git a/Code/SARPolarimetry/otbSinclairToMuellerMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToMuellerMatrixFunctor.h
similarity index 100%
rename from Code/SARPolarimetry/otbSinclairToMuellerMatrixFunctor.h
rename to Modules/Filtering/Polarimetry/include/otbSinclairToMuellerMatrixFunctor.h
diff --git a/Code/SARPolarimetry/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h
similarity index 100%
rename from Code/SARPolarimetry/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h
rename to Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h
diff --git a/Code/SARPolarimetry/otbSinclairToReciprocalCoherencyMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h
similarity index 100%
rename from Code/SARPolarimetry/otbSinclairToReciprocalCoherencyMatrixFunctor.h
rename to Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCoherencyMatrixFunctor.h
diff --git a/Code/SARPolarimetry/otbSinclairToReciprocalCovarianceMatrixFunctor.h b/Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h
similarity index 100%
rename from Code/SARPolarimetry/otbSinclairToReciprocalCovarianceMatrixFunctor.h
rename to Modules/Filtering/Polarimetry/include/otbSinclairToReciprocalCovarianceMatrixFunctor.h
diff --git a/Code/SARPolarimetry/otbPolarimetricData.cxx b/Modules/Filtering/Polarimetry/src/otbPolarimetricData.cxx
similarity index 100%
rename from Code/SARPolarimetry/otbPolarimetricData.cxx
rename to Modules/Filtering/Polarimetry/src/otbPolarimetricData.cxx
diff --git a/Testing/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilter.cxx b/Modules/Filtering/Polarimetry/test/otbMuellerToPolarisationDegreeAndPowerImageFilter.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilter.cxx
rename to Modules/Filtering/Polarimetry/test/otbMuellerToPolarisationDegreeAndPowerImageFilter.cxx
diff --git a/Testing/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx
rename to Modules/Filtering/Polarimetry/test/otbMuellerToPolarisationDegreeAndPowerImageFilterNew.cxx
diff --git a/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceFunctor.cxx b/Modules/Filtering/Polarimetry/test/otbMuellerToReciprocalCovarianceFunctor.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceFunctor.cxx
rename to Modules/Filtering/Polarimetry/test/otbMuellerToReciprocalCovarianceFunctor.cxx
diff --git a/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilter.cxx b/Modules/Filtering/Polarimetry/test/otbMuellerToReciprocalCovarianceImageFilter.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilter.cxx
rename to Modules/Filtering/Polarimetry/test/otbMuellerToReciprocalCovarianceImageFilter.cxx
diff --git a/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbMuellerToReciprocalCovarianceImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilterNew.cxx
rename to Modules/Filtering/Polarimetry/test/otbMuellerToReciprocalCovarianceImageFilterNew.cxx
diff --git a/Testing/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.cxx b/Modules/Filtering/Polarimetry/test/otbMultiChannelsPolarimetricSynthesisFilter.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.cxx
rename to Modules/Filtering/Polarimetry/test/otbMultiChannelsPolarimetricSynthesisFilter.cxx
diff --git a/Testing/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbMultiChannelsPolarimetricSynthesisFilterNew.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilterNew.cxx
rename to Modules/Filtering/Polarimetry/test/otbMultiChannelsPolarimetricSynthesisFilterNew.cxx
diff --git a/Testing/Code/SARPolarimetry/otbPolarimetricData.cxx b/Modules/Filtering/Polarimetry/test/otbPolarimetricData.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbPolarimetricData.cxx
rename to Modules/Filtering/Polarimetry/test/otbPolarimetricData.cxx
diff --git a/Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.cxx b/Modules/Filtering/Polarimetry/test/otbPolarimetricSynthesisFunctor.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbPolarimetricSynthesisFunctor.cxx
rename to Modules/Filtering/Polarimetry/test/otbPolarimetricSynthesisFunctor.cxx
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilter.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalCoherencyToReciprocalMuellerImageFilter.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilter.cxx
rename to Modules/Filtering/Polarimetry/test/otbReciprocalCoherencyToReciprocalMuellerImageFilter.cxx
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx
rename to Modules/Filtering/Polarimetry/test/otbReciprocalCoherencyToReciprocalMuellerImageFilterNew.cxx
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilter.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToCoherencyDegreeImageFilter.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilter.cxx
rename to Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToCoherencyDegreeImageFilter.cxx
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx
rename to Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToCoherencyDegreeImageFilterNew.cxx
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx
rename to Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToReciprocalCoherencyImageFilter.cxx
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx
rename to Modules/Filtering/Polarimetry/test/otbReciprocalCovarianceToReciprocalCoherencyImageFilterNew.cxx
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalHAlphaImageFilter.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalHAlphaImageFilter.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbReciprocalHAlphaImageFilter.cxx
rename to Modules/Filtering/Polarimetry/test/otbReciprocalHAlphaImageFilter.cxx
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalHAlphaImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalHAlphaImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbReciprocalHAlphaImageFilterNew.cxx
rename to Modules/Filtering/Polarimetry/test/otbReciprocalHAlphaImageFilterNew.cxx
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.cxx
rename to Modules/Filtering/Polarimetry/test/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilter.cxx
diff --git a/Testing/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew.cxx b/Modules/Filtering/Polarimetry/test/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew.cxx
rename to Modules/Filtering/Polarimetry/test/otbReciprocalLinearCovarianceToReciprocalCircularCovarianceImageFilterNew.cxx
diff --git a/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx b/Modules/Filtering/Polarimetry/test/otbSinclairImageFilter.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx
rename to Modules/Filtering/Polarimetry/test/otbSinclairImageFilter.cxx
diff --git a/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx b/Modules/Filtering/Polarimetry/test/otbSinclairReciprocalImageFilter.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx
rename to Modules/Filtering/Polarimetry/test/otbSinclairReciprocalImageFilter.cxx
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToCircularCovarianceMatrixFunctor.cxx b/Modules/Filtering/Polarimetry/test/otbSinclairToCircularCovarianceMatrixFunctor.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbSinclairToCircularCovarianceMatrixFunctor.cxx
rename to Modules/Filtering/Polarimetry/test/otbSinclairToCircularCovarianceMatrixFunctor.cxx
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToCoherencyMatrixFunctor.cxx b/Modules/Filtering/Polarimetry/test/otbSinclairToCoherencyMatrixFunctor.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbSinclairToCoherencyMatrixFunctor.cxx
rename to Modules/Filtering/Polarimetry/test/otbSinclairToCoherencyMatrixFunctor.cxx
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToCovarianceMatrixFunctor.cxx b/Modules/Filtering/Polarimetry/test/otbSinclairToCovarianceMatrixFunctor.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbSinclairToCovarianceMatrixFunctor.cxx
rename to Modules/Filtering/Polarimetry/test/otbSinclairToCovarianceMatrixFunctor.cxx
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToMuellerMatrixFunctor.cxx b/Modules/Filtering/Polarimetry/test/otbSinclairToMuellerMatrixFunctor.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbSinclairToMuellerMatrixFunctor.cxx
rename to Modules/Filtering/Polarimetry/test/otbSinclairToMuellerMatrixFunctor.cxx
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.cxx b/Modules/Filtering/Polarimetry/test/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.cxx
rename to Modules/Filtering/Polarimetry/test/otbSinclairToReciprocalCircularCovarianceMatrixFunctor.cxx
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCoherencyMatrixFunctor.cxx b/Modules/Filtering/Polarimetry/test/otbSinclairToReciprocalCoherencyMatrixFunctor.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbSinclairToReciprocalCoherencyMatrixFunctor.cxx
rename to Modules/Filtering/Polarimetry/test/otbSinclairToReciprocalCoherencyMatrixFunctor.cxx
diff --git a/Testing/Code/SARPolarimetry/otbSinclairToReciprocalCovarianceMatrixFunctor.cxx b/Modules/Filtering/Polarimetry/test/otbSinclairToReciprocalCovarianceMatrixFunctor.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbSinclairToReciprocalCovarianceMatrixFunctor.cxx
rename to Modules/Filtering/Polarimetry/test/otbSinclairToReciprocalCovarianceMatrixFunctor.cxx
diff --git a/Testing/Code/SARPolarimetry/otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx b/Modules/Filtering/Polarimetry/test/otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx
similarity index 100%
rename from Testing/Code/SARPolarimetry/otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx
rename to Modules/Filtering/Polarimetry/test/otbVectorMultiChannelsPolarimetricSynthesisFilter.cxx
diff --git a/Code/Projections/otbEckert4MapProjection.h b/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
similarity index 100%
rename from Code/Projections/otbEckert4MapProjection.h
rename to Modules/Filtering/Projection/include/otbEckert4MapProjection.h
diff --git a/Code/Projections/otbEckert4MapProjection.txx b/Modules/Filtering/Projection/include/otbEckert4MapProjection.txx
similarity index 100%
rename from Code/Projections/otbEckert4MapProjection.txx
rename to Modules/Filtering/Projection/include/otbEckert4MapProjection.txx
diff --git a/Code/Projections/otbGCPsToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
similarity index 100%
rename from Code/Projections/otbGCPsToRPCSensorModelImageFilter.h
rename to Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
diff --git a/Code/Projections/otbGCPsToRPCSensorModelImageFilter.txx b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.txx
similarity index 100%
rename from Code/Projections/otbGCPsToRPCSensorModelImageFilter.txx
rename to Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.txx
diff --git a/Code/Projections/otbGenericRSResampleImageFilter.h b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
similarity index 100%
rename from Code/Projections/otbGenericRSResampleImageFilter.h
rename to Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
diff --git a/Code/Projections/otbGenericRSResampleImageFilter.txx b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.txx
similarity index 100%
rename from Code/Projections/otbGenericRSResampleImageFilter.txx
rename to Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.txx
diff --git a/Code/Projections/otbGeographicalDistance.h b/Modules/Filtering/Projection/include/otbGeographicalDistance.h
similarity index 100%
rename from Code/Projections/otbGeographicalDistance.h
rename to Modules/Filtering/Projection/include/otbGeographicalDistance.h
diff --git a/Code/Projections/otbGeographicalDistance.txx b/Modules/Filtering/Projection/include/otbGeographicalDistance.txx
similarity index 100%
rename from Code/Projections/otbGeographicalDistance.txx
rename to Modules/Filtering/Projection/include/otbGeographicalDistance.txx
diff --git a/Code/Projections/otbGeometriesProjectionFilter.h b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
similarity index 100%
rename from Code/Projections/otbGeometriesProjectionFilter.h
rename to Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
diff --git a/Code/Projections/otbGeometriesProjectionFilter.txx b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.txx
similarity index 100%
rename from Code/Projections/otbGeometriesProjectionFilter.txx
rename to Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.txx
diff --git a/Code/Projections/otbGroundSpacingImageFunction.h b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
similarity index 100%
rename from Code/Projections/otbGroundSpacingImageFunction.h
rename to Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
diff --git a/Code/Projections/otbGroundSpacingImageFunction.txx b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.txx
similarity index 100%
rename from Code/Projections/otbGroundSpacingImageFunction.txx
rename to Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.txx
diff --git a/Code/Projections/otbImageToEnvelopeVectorDataFilter.h b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
similarity index 100%
rename from Code/Projections/otbImageToEnvelopeVectorDataFilter.h
rename to Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
diff --git a/Code/Projections/otbImageToEnvelopeVectorDataFilter.txx b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.txx
similarity index 100%
rename from Code/Projections/otbImageToEnvelopeVectorDataFilter.txx
rename to Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.txx
diff --git a/Code/BasicFilters/otbImportGeoInformationImageFilter.h b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbImportGeoInformationImageFilter.h
rename to Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
diff --git a/Code/BasicFilters/otbImportGeoInformationImageFilter.txx b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbImportGeoInformationImageFilter.txx
rename to Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.txx
diff --git a/Code/Projections/otbLambert2EtenduProjection.h b/Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h
similarity index 100%
rename from Code/Projections/otbLambert2EtenduProjection.h
rename to Modules/Filtering/Projection/include/otbLambert2EtenduProjection.h
diff --git a/Code/Projections/otbLambert3CartoSudProjection.h b/Modules/Filtering/Projection/include/otbLambert3CartoSudProjection.h
similarity index 100%
rename from Code/Projections/otbLambert3CartoSudProjection.h
rename to Modules/Filtering/Projection/include/otbLambert3CartoSudProjection.h
diff --git a/Code/Projections/otbLambert93Projection.h b/Modules/Filtering/Projection/include/otbLambert93Projection.h
similarity index 100%
rename from Code/Projections/otbLambert93Projection.h
rename to Modules/Filtering/Projection/include/otbLambert93Projection.h
diff --git a/Code/Projections/otbLambertConformalConicMapProjection.h b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
similarity index 100%
rename from Code/Projections/otbLambertConformalConicMapProjection.h
rename to Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
diff --git a/Code/Projections/otbLambertConformalConicMapProjection.txx b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.txx
similarity index 100%
rename from Code/Projections/otbLambertConformalConicMapProjection.txx
rename to Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.txx
diff --git a/Code/Projections/otbLeastSquareAffineTransformEstimator.h b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
similarity index 100%
rename from Code/Projections/otbLeastSquareAffineTransformEstimator.h
rename to Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
diff --git a/Code/Projections/otbLeastSquareAffineTransformEstimator.txx b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.txx
similarity index 100%
rename from Code/Projections/otbLeastSquareAffineTransformEstimator.txx
rename to Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.txx
diff --git a/Code/Projections/otbMapProjectionDeprecated.h b/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.h
similarity index 100%
rename from Code/Projections/otbMapProjectionDeprecated.h
rename to Modules/Filtering/Projection/include/otbMapProjectionDeprecated.h
diff --git a/Code/Projections/otbMapProjectionDeprecated.txx b/Modules/Filtering/Projection/include/otbMapProjectionDeprecated.txx
similarity index 100%
rename from Code/Projections/otbMapProjectionDeprecated.txx
rename to Modules/Filtering/Projection/include/otbMapProjectionDeprecated.txx
diff --git a/Code/Projections/otbMapProjections.h b/Modules/Filtering/Projection/include/otbMapProjections.h
similarity index 100%
rename from Code/Projections/otbMapProjections.h
rename to Modules/Filtering/Projection/include/otbMapProjections.h
diff --git a/Code/Projections/otbMollweidMapProjection.h b/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
similarity index 100%
rename from Code/Projections/otbMollweidMapProjection.h
rename to Modules/Filtering/Projection/include/otbMollweidMapProjection.h
diff --git a/Code/Projections/otbMollweidMapProjection.txx b/Modules/Filtering/Projection/include/otbMollweidMapProjection.txx
similarity index 100%
rename from Code/Projections/otbMollweidMapProjection.txx
rename to Modules/Filtering/Projection/include/otbMollweidMapProjection.txx
diff --git a/Code/Projections/otbOrthoRectificationFilter.h b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
similarity index 100%
rename from Code/Projections/otbOrthoRectificationFilter.h
rename to Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
diff --git a/Code/Projections/otbOrthoRectificationFilter.txx b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.txx
similarity index 100%
rename from Code/Projections/otbOrthoRectificationFilter.txx
rename to Modules/Filtering/Projection/include/otbOrthoRectificationFilter.txx
diff --git a/Code/Projections/otbPhysicalToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
similarity index 100%
rename from Code/Projections/otbPhysicalToRPCSensorModelImageFilter.h
rename to Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
diff --git a/Code/Projections/otbPhysicalToRPCSensorModelImageFilter.txx b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.txx
similarity index 100%
rename from Code/Projections/otbPhysicalToRPCSensorModelImageFilter.txx
rename to Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.txx
diff --git a/Code/Projections/otbPleiadesPToXSAffineTransformCalculator.h b/Modules/Filtering/Projection/include/otbPleiadesPToXSAffineTransformCalculator.h
similarity index 100%
rename from Code/Projections/otbPleiadesPToXSAffineTransformCalculator.h
rename to Modules/Filtering/Projection/include/otbPleiadesPToXSAffineTransformCalculator.h
diff --git a/Code/BasicFilters/otbProjectiveProjectionImageFilter.h b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbProjectiveProjectionImageFilter.h
rename to Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
diff --git a/Code/BasicFilters/otbProjectiveProjectionImageFilter.txx b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbProjectiveProjectionImageFilter.txx
rename to Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.txx
diff --git a/Code/Learning/otbROIdataConversion.h b/Modules/Filtering/Projection/include/otbROIdataConversion.h
similarity index 100%
rename from Code/Learning/otbROIdataConversion.h
rename to Modules/Filtering/Projection/include/otbROIdataConversion.h
diff --git a/Code/Learning/otbROIdataConversion.txx b/Modules/Filtering/Projection/include/otbROIdataConversion.txx
similarity index 100%
rename from Code/Learning/otbROIdataConversion.txx
rename to Modules/Filtering/Projection/include/otbROIdataConversion.txx
diff --git a/Code/Projections/otbRationalTransform.h b/Modules/Filtering/Projection/include/otbRationalTransform.h
similarity index 100%
rename from Code/Projections/otbRationalTransform.h
rename to Modules/Filtering/Projection/include/otbRationalTransform.h
diff --git a/Code/Projections/otbSVY21MapProjection.h b/Modules/Filtering/Projection/include/otbSVY21MapProjection.h
similarity index 100%
rename from Code/Projections/otbSVY21MapProjection.h
rename to Modules/Filtering/Projection/include/otbSVY21MapProjection.h
diff --git a/Code/Projections/otbSinusoidalMapProjection.h b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
similarity index 100%
rename from Code/Projections/otbSinusoidalMapProjection.h
rename to Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
diff --git a/Code/Projections/otbSinusoidalMapProjection.txx b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.txx
similarity index 100%
rename from Code/Projections/otbSinusoidalMapProjection.txx
rename to Modules/Filtering/Projection/include/otbSinusoidalMapProjection.txx
diff --git a/Code/Projections/otbTileMapTransform.h b/Modules/Filtering/Projection/include/otbTileMapTransform.h
similarity index 100%
rename from Code/Projections/otbTileMapTransform.h
rename to Modules/Filtering/Projection/include/otbTileMapTransform.h
diff --git a/Code/Projections/otbTileMapTransform.txx b/Modules/Filtering/Projection/include/otbTileMapTransform.txx
similarity index 100%
rename from Code/Projections/otbTileMapTransform.txx
rename to Modules/Filtering/Projection/include/otbTileMapTransform.txx
diff --git a/Code/Projections/otbTransMercatorMapProjection.h b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
similarity index 100%
rename from Code/Projections/otbTransMercatorMapProjection.h
rename to Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
diff --git a/Code/Projections/otbTransMercatorMapProjection.txx b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.txx
similarity index 100%
rename from Code/Projections/otbTransMercatorMapProjection.txx
rename to Modules/Filtering/Projection/include/otbTransMercatorMapProjection.txx
diff --git a/Code/Projections/otbUtmMapProjection.h b/Modules/Filtering/Projection/include/otbUtmMapProjection.h
similarity index 100%
rename from Code/Projections/otbUtmMapProjection.h
rename to Modules/Filtering/Projection/include/otbUtmMapProjection.h
diff --git a/Code/Projections/otbUtmMapProjection.txx b/Modules/Filtering/Projection/include/otbUtmMapProjection.txx
similarity index 100%
rename from Code/Projections/otbUtmMapProjection.txx
rename to Modules/Filtering/Projection/include/otbUtmMapProjection.txx
diff --git a/Code/Projections/otbVectorDataIntoImageProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
similarity index 100%
rename from Code/Projections/otbVectorDataIntoImageProjectionFilter.h
rename to Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
diff --git a/Code/Projections/otbVectorDataIntoImageProjectionFilter.txx b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.txx
similarity index 100%
rename from Code/Projections/otbVectorDataIntoImageProjectionFilter.txx
rename to Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.txx
diff --git a/Code/Projections/otbVectorDataProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
similarity index 100%
rename from Code/Projections/otbVectorDataProjectionFilter.h
rename to Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
diff --git a/Code/Projections/otbVectorDataProjectionFilter.txx b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx
similarity index 100%
rename from Code/Projections/otbVectorDataProjectionFilter.txx
rename to Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.txx
diff --git a/Code/Projections/otbVectorDataTransformFilter.h b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
similarity index 100%
rename from Code/Projections/otbVectorDataTransformFilter.h
rename to Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
diff --git a/Code/Projections/otbVectorDataTransformFilter.txx b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.txx
similarity index 100%
rename from Code/Projections/otbVectorDataTransformFilter.txx
rename to Modules/Filtering/Projection/include/otbVectorDataTransformFilter.txx
diff --git a/Code/Projections/otbGeometriesProjectionFilter.cxx b/Modules/Filtering/Projection/src/otbGeometriesProjectionFilter.cxx
similarity index 100%
rename from Code/Projections/otbGeometriesProjectionFilter.cxx
rename to Modules/Filtering/Projection/src/otbGeometriesProjectionFilter.cxx
diff --git a/Code/Projections/otbPleiadesPToXSAffineTransformCalculator.cxx b/Modules/Filtering/Projection/src/otbPleiadesPToXSAffineTransformCalculator.cxx
similarity index 100%
rename from Code/Projections/otbPleiadesPToXSAffineTransformCalculator.cxx
rename to Modules/Filtering/Projection/src/otbPleiadesPToXSAffineTransformCalculator.cxx
diff --git a/Testing/Code/Projections/otbCompositeTransform.cxx b/Modules/Filtering/Projection/test/otbCompositeTransform.cxx
similarity index 100%
rename from Testing/Code/Projections/otbCompositeTransform.cxx
rename to Modules/Filtering/Projection/test/otbCompositeTransform.cxx
diff --git a/Testing/Code/Projections/otbCompositeTransformNew.cxx b/Modules/Filtering/Projection/test/otbCompositeTransformNew.cxx
similarity index 100%
rename from Testing/Code/Projections/otbCompositeTransformNew.cxx
rename to Modules/Filtering/Projection/test/otbCompositeTransformNew.cxx
diff --git a/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterAndOrtho.cxx b/Modules/Filtering/Projection/test/otbGCPsToRPCSensorModelImageFilterAndOrtho.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterAndOrtho.cxx
rename to Modules/Filtering/Projection/test/otbGCPsToRPCSensorModelImageFilterAndOrtho.cxx
diff --git a/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx b/Modules/Filtering/Projection/test/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
rename to Modules/Filtering/Projection/test/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
diff --git a/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterNew.cxx b/Modules/Filtering/Projection/test/otbGCPsToRPCSensorModelImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterNew.cxx
rename to Modules/Filtering/Projection/test/otbGCPsToRPCSensorModelImageFilterNew.cxx
diff --git a/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterWithoutDEM.cxx b/Modules/Filtering/Projection/test/otbGCPsToRPCSensorModelImageFilterWithoutDEM.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterWithoutDEM.cxx
rename to Modules/Filtering/Projection/test/otbGCPsToRPCSensorModelImageFilterWithoutDEM.cxx
diff --git a/Testing/Code/Projections/otbGenericRSResampleImageFilter.cxx b/Modules/Filtering/Projection/test/otbGenericRSResampleImageFilter.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGenericRSResampleImageFilter.cxx
rename to Modules/Filtering/Projection/test/otbGenericRSResampleImageFilter.cxx
diff --git a/Testing/Code/Projections/otbGenericRSTransformFromImage.cxx b/Modules/Filtering/Projection/test/otbGenericRSTransformFromImage.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGenericRSTransformFromImage.cxx
rename to Modules/Filtering/Projection/test/otbGenericRSTransformFromImage.cxx
diff --git a/Testing/Code/Projections/otbGenericRSTransformGenericConversionCheckingFromGCP.cxx b/Modules/Filtering/Projection/test/otbGenericRSTransformGenericConversionCheckingFromGCP.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGenericRSTransformGenericConversionCheckingFromGCP.cxx
rename to Modules/Filtering/Projection/test/otbGenericRSTransformGenericConversionCheckingFromGCP.cxx
diff --git a/Testing/Code/Projections/otbGenericRSTransformGenericTest.cxx b/Modules/Filtering/Projection/test/otbGenericRSTransformGenericTest.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGenericRSTransformGenericTest.cxx
rename to Modules/Filtering/Projection/test/otbGenericRSTransformGenericTest.cxx
diff --git a/Testing/Code/Projections/otbGeographicalDistance.cxx b/Modules/Filtering/Projection/test/otbGeographicalDistance.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGeographicalDistance.cxx
rename to Modules/Filtering/Projection/test/otbGeographicalDistance.cxx
diff --git a/Testing/Code/Projections/otbGeometriesProjectionFilter.cxx b/Modules/Filtering/Projection/test/otbGeometriesProjectionFilter.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGeometriesProjectionFilter.cxx
rename to Modules/Filtering/Projection/test/otbGeometriesProjectionFilter.cxx
diff --git a/Testing/Code/Projections/otbGeometriesProjectionFilterFromGeoToMap.cxx b/Modules/Filtering/Projection/test/otbGeometriesProjectionFilterFromGeoToMap.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGeometriesProjectionFilterFromGeoToMap.cxx
rename to Modules/Filtering/Projection/test/otbGeometriesProjectionFilterFromGeoToMap.cxx
diff --git a/Testing/Code/Projections/otbGeometriesProjectionFilterFromMapToEPSG.cxx b/Modules/Filtering/Projection/test/otbGeometriesProjectionFilterFromMapToEPSG.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGeometriesProjectionFilterFromMapToEPSG.cxx
rename to Modules/Filtering/Projection/test/otbGeometriesProjectionFilterFromMapToEPSG.cxx
diff --git a/Testing/Code/Projections/otbGeometriesProjectionFilterFromMapToGeo.cxx b/Modules/Filtering/Projection/test/otbGeometriesProjectionFilterFromMapToGeo.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGeometriesProjectionFilterFromMapToGeo.cxx
rename to Modules/Filtering/Projection/test/otbGeometriesProjectionFilterFromMapToGeo.cxx
diff --git a/Testing/Code/Projections/otbGeometriesProjectionFilterFromMapToImage.cxx b/Modules/Filtering/Projection/test/otbGeometriesProjectionFilterFromMapToImage.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGeometriesProjectionFilterFromMapToImage.cxx
rename to Modules/Filtering/Projection/test/otbGeometriesProjectionFilterFromMapToImage.cxx
diff --git a/Testing/Code/Projections/otbGeometriesProjectionFilterFromMapToSensor.cxx b/Modules/Filtering/Projection/test/otbGeometriesProjectionFilterFromMapToSensor.cxx
similarity index 100%
rename from Testing/Code/Projections/otbGeometriesProjectionFilterFromMapToSensor.cxx
rename to Modules/Filtering/Projection/test/otbGeometriesProjectionFilterFromMapToSensor.cxx
diff --git a/Testing/Code/Projections/otbImageToEnvelopeVectorDataFilter.cxx b/Modules/Filtering/Projection/test/otbImageToEnvelopeVectorDataFilter.cxx
similarity index 100%
rename from Testing/Code/Projections/otbImageToEnvelopeVectorDataFilter.cxx
rename to Modules/Filtering/Projection/test/otbImageToEnvelopeVectorDataFilter.cxx
diff --git a/Testing/Code/Projections/otbImageToGenericRSOutputParameters.cxx b/Modules/Filtering/Projection/test/otbImageToGenericRSOutputParameters.cxx
similarity index 100%
rename from Testing/Code/Projections/otbImageToGenericRSOutputParameters.cxx
rename to Modules/Filtering/Projection/test/otbImageToGenericRSOutputParameters.cxx
diff --git a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilter.cxx b/Modules/Filtering/Projection/test/otbImportGeoInformationImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbImportGeoInformationImageFilter.cxx
rename to Modules/Filtering/Projection/test/otbImportGeoInformationImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterNew.cxx b/Modules/Filtering/Projection/test/otbImportGeoInformationImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbImportGeoInformationImageFilterNew.cxx
rename to Modules/Filtering/Projection/test/otbImportGeoInformationImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterWithKeywordList.cxx b/Modules/Filtering/Projection/test/otbImportGeoInformationImageFilterWithKeywordList.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbImportGeoInformationImageFilterWithKeywordList.cxx
rename to Modules/Filtering/Projection/test/otbImportGeoInformationImageFilterWithKeywordList.cxx
diff --git a/Testing/Code/Projections/otbLeastSquareAffineTransformEstimator.cxx b/Modules/Filtering/Projection/test/otbLeastSquareAffineTransformEstimator.cxx
similarity index 100%
rename from Testing/Code/Projections/otbLeastSquareAffineTransformEstimator.cxx
rename to Modules/Filtering/Projection/test/otbLeastSquareAffineTransformEstimator.cxx
diff --git a/Testing/Code/Projections/otbLeastSquareAffineTransformEstimatorNew.cxx b/Modules/Filtering/Projection/test/otbLeastSquareAffineTransformEstimatorNew.cxx
similarity index 100%
rename from Testing/Code/Projections/otbLeastSquareAffineTransformEstimatorNew.cxx
rename to Modules/Filtering/Projection/test/otbLeastSquareAffineTransformEstimatorNew.cxx
diff --git a/Testing/Code/Projections/otbMapProjection.cxx b/Modules/Filtering/Projection/test/otbMapProjection.cxx
similarity index 100%
rename from Testing/Code/Projections/otbMapProjection.cxx
rename to Modules/Filtering/Projection/test/otbMapProjection.cxx
diff --git a/Testing/Code/Projections/otbMapProjectionsNew.cxx b/Modules/Filtering/Projection/test/otbMapProjectionsNew.cxx
similarity index 100%
rename from Testing/Code/Projections/otbMapProjectionsNew.cxx
rename to Modules/Filtering/Projection/test/otbMapProjectionsNew.cxx
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilter.cxx b/Modules/Filtering/Projection/test/otbOrthoRectificationFilter.cxx
similarity index 100%
rename from Testing/Code/Projections/otbOrthoRectificationFilter.cxx
rename to Modules/Filtering/Projection/test/otbOrthoRectificationFilter.cxx
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx b/Modules/Filtering/Projection/test/otbOrthoRectificationFilterNew.cxx
similarity index 100%
rename from Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx
rename to Modules/Filtering/Projection/test/otbOrthoRectificationFilterNew.cxx
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx b/Modules/Filtering/Projection/test/otbOrthoRectificationFilterWithDEM.cxx
similarity index 100%
rename from Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
rename to Modules/Filtering/Projection/test/otbOrthoRectificationFilterWithDEM.cxx
diff --git a/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx b/Modules/Filtering/Projection/test/otbOrthoRectificationMonoThreadFilter.cxx
similarity index 100%
rename from Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
rename to Modules/Filtering/Projection/test/otbOrthoRectificationMonoThreadFilter.cxx
diff --git a/Testing/Code/Projections/otbPhysicalToRPCSensorModelImageFilter.cxx b/Modules/Filtering/Projection/test/otbPhysicalToRPCSensorModelImageFilter.cxx
similarity index 100%
rename from Testing/Code/Projections/otbPhysicalToRPCSensorModelImageFilter.cxx
rename to Modules/Filtering/Projection/test/otbPhysicalToRPCSensorModelImageFilter.cxx
diff --git a/Testing/Code/Projections/otbProjectionBaseNew.cxx b/Modules/Filtering/Projection/test/otbProjectionBaseNew.cxx
similarity index 100%
rename from Testing/Code/Projections/otbProjectionBaseNew.cxx
rename to Modules/Filtering/Projection/test/otbProjectionBaseNew.cxx
diff --git a/Testing/Code/Learning/otbROIdataConversion.cxx b/Modules/Filtering/Projection/test/otbROIdataConversion.cxx
similarity index 100%
rename from Testing/Code/Learning/otbROIdataConversion.cxx
rename to Modules/Filtering/Projection/test/otbROIdataConversion.cxx
diff --git a/Testing/Code/Learning/otbROIdataConversionNew.cxx b/Modules/Filtering/Projection/test/otbROIdataConversionNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbROIdataConversionNew.cxx
rename to Modules/Filtering/Projection/test/otbROIdataConversionNew.cxx
diff --git a/Testing/Code/BasicFilters/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.cxx b/Modules/Filtering/Projection/test/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.cxx
rename to Modules/Filtering/Projection/test/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.cxx
diff --git a/Testing/Code/Projections/otbRationalTransform.cxx b/Modules/Filtering/Projection/test/otbRationalTransform.cxx
similarity index 100%
rename from Testing/Code/Projections/otbRationalTransform.cxx
rename to Modules/Filtering/Projection/test/otbRationalTransform.cxx
diff --git a/Testing/Code/Projections/otbRationalTransformToDisplacementFieldSource.cxx b/Modules/Filtering/Projection/test/otbRationalTransformToDisplacementFieldSource.cxx
similarity index 100%
rename from Testing/Code/Projections/otbRationalTransformToDisplacementFieldSource.cxx
rename to Modules/Filtering/Projection/test/otbRationalTransformToDisplacementFieldSource.cxx
diff --git a/Testing/Code/BasicFilters/otbSpectralAngleDataNodeFeatureFunction.cxx b/Modules/Filtering/Projection/test/otbSpectralAngleDataNodeFeatureFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbSpectralAngleDataNodeFeatureFunction.cxx
rename to Modules/Filtering/Projection/test/otbSpectralAngleDataNodeFeatureFunction.cxx
diff --git a/Testing/Code/Projections/otbTileImageFilterRSTransformTest.cxx b/Modules/Filtering/Projection/test/otbTileImageFilterRSTransformTest.cxx
similarity index 100%
rename from Testing/Code/Projections/otbTileImageFilterRSTransformTest.cxx
rename to Modules/Filtering/Projection/test/otbTileImageFilterRSTransformTest.cxx
diff --git a/Testing/Code/Projections/otbTileMapTransform.cxx b/Modules/Filtering/Projection/test/otbTileMapTransform.cxx
similarity index 100%
rename from Testing/Code/Projections/otbTileMapTransform.cxx
rename to Modules/Filtering/Projection/test/otbTileMapTransform.cxx
diff --git a/Testing/Code/Projections/otbUtmMapProjection.cxx b/Modules/Filtering/Projection/test/otbUtmMapProjection.cxx
similarity index 100%
rename from Testing/Code/Projections/otbUtmMapProjection.cxx
rename to Modules/Filtering/Projection/test/otbUtmMapProjection.cxx
diff --git a/Testing/Code/Projections/otbVectorDataExtractROIandProjection.cxx b/Modules/Filtering/Projection/test/otbVectorDataExtractROIandProjection.cxx
similarity index 100%
rename from Testing/Code/Projections/otbVectorDataExtractROIandProjection.cxx
rename to Modules/Filtering/Projection/test/otbVectorDataExtractROIandProjection.cxx
diff --git a/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx b/Modules/Filtering/Projection/test/otbVectorDataIntoImageProjectionFilterTest.cxx
similarity index 100%
rename from Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx
rename to Modules/Filtering/Projection/test/otbVectorDataIntoImageProjectionFilterTest.cxx
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilter.cxx b/Modules/Filtering/Projection/test/otbVectorDataProjectionFilter.cxx
similarity index 100%
rename from Testing/Code/Projections/otbVectorDataProjectionFilter.cxx
rename to Modules/Filtering/Projection/test/otbVectorDataProjectionFilter.cxx
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterFromGeoToMap.cxx b/Modules/Filtering/Projection/test/otbVectorDataProjectionFilterFromGeoToMap.cxx
similarity index 100%
rename from Testing/Code/Projections/otbVectorDataProjectionFilterFromGeoToMap.cxx
rename to Modules/Filtering/Projection/test/otbVectorDataProjectionFilterFromGeoToMap.cxx
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToGeo.cxx b/Modules/Filtering/Projection/test/otbVectorDataProjectionFilterFromMapToGeo.cxx
similarity index 100%
rename from Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToGeo.cxx
rename to Modules/Filtering/Projection/test/otbVectorDataProjectionFilterFromMapToGeo.cxx
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToImage.cxx b/Modules/Filtering/Projection/test/otbVectorDataProjectionFilterFromMapToImage.cxx
similarity index 100%
rename from Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToImage.cxx
rename to Modules/Filtering/Projection/test/otbVectorDataProjectionFilterFromMapToImage.cxx
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToSensor.cxx b/Modules/Filtering/Projection/test/otbVectorDataProjectionFilterFromMapToSensor.cxx
similarity index 100%
rename from Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToSensor.cxx
rename to Modules/Filtering/Projection/test/otbVectorDataProjectionFilterFromMapToSensor.cxx
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterNew.cxx b/Modules/Filtering/Projection/test/otbVectorDataProjectionFilterNew.cxx
similarity index 100%
rename from Testing/Code/Projections/otbVectorDataProjectionFilterNew.cxx
rename to Modules/Filtering/Projection/test/otbVectorDataProjectionFilterNew.cxx
diff --git a/Testing/Code/Projections/otbVectorDataTransformFilter.cxx b/Modules/Filtering/Projection/test/otbVectorDataTransformFilter.cxx
similarity index 100%
rename from Testing/Code/Projections/otbVectorDataTransformFilter.cxx
rename to Modules/Filtering/Projection/test/otbVectorDataTransformFilter.cxx
diff --git a/Code/MultiTemporal/otbEnvelopeSavitzkyGolayInterpolationFunctor.h b/Modules/Filtering/Smoothing/include/otbEnvelopeSavitzkyGolayInterpolationFunctor.h
similarity index 100%
rename from Code/MultiTemporal/otbEnvelopeSavitzkyGolayInterpolationFunctor.h
rename to Modules/Filtering/Smoothing/include/otbEnvelopeSavitzkyGolayInterpolationFunctor.h
diff --git a/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.h b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbMeanShiftSmoothingImageFilter.h
rename to Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
diff --git a/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.txx b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbMeanShiftSmoothingImageFilter.txx
rename to Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.txx
diff --git a/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctor.h b/Modules/Filtering/Smoothing/include/otbSavitzkyGolayInterpolationFunctor.h
similarity index 100%
rename from Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctor.h
rename to Modules/Filtering/Smoothing/include/otbSavitzkyGolayInterpolationFunctor.h
diff --git a/Code/MultiTemporal/otbTimeSeries.h b/Modules/Filtering/Smoothing/include/otbTimeSeries.h
similarity index 100%
rename from Code/MultiTemporal/otbTimeSeries.h
rename to Modules/Filtering/Smoothing/include/otbTimeSeries.h
diff --git a/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctor.h b/Modules/Filtering/Smoothing/include/otbTimeSeriesLeastSquareFittingFunctor.h
similarity index 100%
rename from Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctor.h
rename to Modules/Filtering/Smoothing/include/otbTimeSeriesLeastSquareFittingFunctor.h
diff --git a/Testing/Code/MultiTemporal/otbEnvelopeSavitzkyGolayInterpolationFunctorTest.cxx b/Modules/Filtering/Smoothing/test/otbEnvelopeSavitzkyGolayInterpolationFunctorTest.cxx
similarity index 100%
rename from Testing/Code/MultiTemporal/otbEnvelopeSavitzkyGolayInterpolationFunctorTest.cxx
rename to Modules/Filtering/Smoothing/test/otbEnvelopeSavitzkyGolayInterpolationFunctorTest.cxx
diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx b/Modules/Filtering/Smoothing/test/otbMeanShiftSmoothingImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx
rename to Modules/Filtering/Smoothing/test/otbMeanShiftSmoothingImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterNew.cxx b/Modules/Filtering/Smoothing/test/otbMeanShiftSmoothingImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterNew.cxx
rename to Modules/Filtering/Smoothing/test/otbMeanShiftSmoothingImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx b/Modules/Filtering/Smoothing/test/otbMeanShiftSmoothingImageFilterSpatialStability.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx
rename to Modules/Filtering/Smoothing/test/otbMeanShiftSmoothingImageFilterSpatialStability.cxx
diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx b/Modules/Filtering/Smoothing/test/otbMeanShiftSmoothingImageFilterThreading.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx
rename to Modules/Filtering/Smoothing/test/otbMeanShiftSmoothingImageFilterThreading.cxx
diff --git a/Testing/Code/MultiTemporal/otbPolynomialTimeSeriesTest.cxx b/Modules/Filtering/Smoothing/test/otbPolynomialTimeSeriesTest.cxx
similarity index 100%
rename from Testing/Code/MultiTemporal/otbPolynomialTimeSeriesTest.cxx
rename to Modules/Filtering/Smoothing/test/otbPolynomialTimeSeriesTest.cxx
diff --git a/Testing/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctorNew.cxx b/Modules/Filtering/Smoothing/test/otbSavitzkyGolayInterpolationFunctorNew.cxx
similarity index 100%
rename from Testing/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctorNew.cxx
rename to Modules/Filtering/Smoothing/test/otbSavitzkyGolayInterpolationFunctorNew.cxx
diff --git a/Testing/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctorTest.cxx b/Modules/Filtering/Smoothing/test/otbSavitzkyGolayInterpolationFunctorTest.cxx
similarity index 100%
rename from Testing/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctorTest.cxx
rename to Modules/Filtering/Smoothing/test/otbSavitzkyGolayInterpolationFunctorTest.cxx
diff --git a/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorNew.cxx b/Modules/Filtering/Smoothing/test/otbTimeSeriesLeastSquareFittingFunctorNew.cxx
similarity index 100%
rename from Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorNew.cxx
rename to Modules/Filtering/Smoothing/test/otbTimeSeriesLeastSquareFittingFunctorNew.cxx
diff --git a/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorTest.cxx b/Modules/Filtering/Smoothing/test/otbTimeSeriesLeastSquareFittingFunctorTest.cxx
similarity index 100%
rename from Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorTest.cxx
rename to Modules/Filtering/Smoothing/test/otbTimeSeriesLeastSquareFittingFunctorTest.cxx
diff --git a/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorWeightsTest.cxx b/Modules/Filtering/Smoothing/test/otbTimeSeriesLeastSquareFittingFunctorWeightsTest.cxx
similarity index 100%
rename from Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorWeightsTest.cxx
rename to Modules/Filtering/Smoothing/test/otbTimeSeriesLeastSquareFittingFunctorWeightsTest.cxx
diff --git a/Code/OBIA/otbBandsStatisticsAttributesLabelMapFilter.h b/Modules/Filtering/Statistics/include/otbBandsStatisticsAttributesLabelMapFilter.h
similarity index 100%
rename from Code/OBIA/otbBandsStatisticsAttributesLabelMapFilter.h
rename to Modules/Filtering/Statistics/include/otbBandsStatisticsAttributesLabelMapFilter.h
diff --git a/Code/OBIA/otbBandsStatisticsAttributesLabelMapFilter.txx b/Modules/Filtering/Statistics/include/otbBandsStatisticsAttributesLabelMapFilter.txx
similarity index 100%
rename from Code/OBIA/otbBandsStatisticsAttributesLabelMapFilter.txx
rename to Modules/Filtering/Statistics/include/otbBandsStatisticsAttributesLabelMapFilter.txx
diff --git a/Code/Learning/otbConcatenateSampleListFilter.h b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
similarity index 100%
rename from Code/Learning/otbConcatenateSampleListFilter.h
rename to Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
diff --git a/Code/Learning/otbConcatenateSampleListFilter.txx b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.txx
similarity index 100%
rename from Code/Learning/otbConcatenateSampleListFilter.txx
rename to Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.txx
diff --git a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.h b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
similarity index 100%
rename from Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.h
rename to Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
diff --git a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.txx
similarity index 100%
rename from Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx
rename to Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.txx
diff --git a/Code/Radiometry/otbDEMCaracteristicsExtractor.h b/Modules/Filtering/Statistics/include/otbDEMCaracteristicsExtractor.h
similarity index 100%
rename from Code/Radiometry/otbDEMCaracteristicsExtractor.h
rename to Modules/Filtering/Statistics/include/otbDEMCaracteristicsExtractor.h
diff --git a/Code/Radiometry/otbDEMCaracteristicsExtractor.txx b/Modules/Filtering/Statistics/include/otbDEMCaracteristicsExtractor.txx
similarity index 100%
rename from Code/Radiometry/otbDEMCaracteristicsExtractor.txx
rename to Modules/Filtering/Statistics/include/otbDEMCaracteristicsExtractor.txx
diff --git a/Code/Learning/otbGaussianAdditiveNoiseSampleListFilter.h b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
similarity index 100%
rename from Code/Learning/otbGaussianAdditiveNoiseSampleListFilter.h
rename to Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
diff --git a/Code/Learning/otbGaussianAdditiveNoiseSampleListFilter.txx b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.txx
similarity index 100%
rename from Code/Learning/otbGaussianAdditiveNoiseSampleListFilter.txx
rename to Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.txx
diff --git a/Code/Common/otbHistogramStatisticsFunction.h b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
similarity index 100%
rename from Code/Common/otbHistogramStatisticsFunction.h
rename to Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
diff --git a/Code/Common/otbHistogramStatisticsFunction.txx b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.txx
similarity index 100%
rename from Code/Common/otbHistogramStatisticsFunction.txx
rename to Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.txx
diff --git a/Code/Learning/otbListSampleGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
similarity index 100%
rename from Code/Learning/otbListSampleGenerator.h
rename to Modules/Filtering/Statistics/include/otbListSampleGenerator.h
diff --git a/Code/Learning/otbListSampleGenerator.txx b/Modules/Filtering/Statistics/include/otbListSampleGenerator.txx
similarity index 100%
rename from Code/Learning/otbListSampleGenerator.txx
rename to Modules/Filtering/Statistics/include/otbListSampleGenerator.txx
diff --git a/Code/Learning/otbListSampleSource.h b/Modules/Filtering/Statistics/include/otbListSampleSource.h
similarity index 100%
rename from Code/Learning/otbListSampleSource.h
rename to Modules/Filtering/Statistics/include/otbListSampleSource.h
diff --git a/Code/Learning/otbListSampleSource.txx b/Modules/Filtering/Statistics/include/otbListSampleSource.txx
similarity index 100%
rename from Code/Learning/otbListSampleSource.txx
rename to Modules/Filtering/Statistics/include/otbListSampleSource.txx
diff --git a/Code/Learning/otbListSampleToBalancedListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
similarity index 100%
rename from Code/Learning/otbListSampleToBalancedListSampleFilter.h
rename to Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
diff --git a/Code/Learning/otbListSampleToBalancedListSampleFilter.txx b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.txx
similarity index 100%
rename from Code/Learning/otbListSampleToBalancedListSampleFilter.txx
rename to Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.txx
diff --git a/Code/BasicFilters/otbListSampleToHistogramListGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
similarity index 100%
rename from Code/BasicFilters/otbListSampleToHistogramListGenerator.h
rename to Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
diff --git a/Code/BasicFilters/otbListSampleToHistogramListGenerator.txx b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.txx
similarity index 100%
rename from Code/BasicFilters/otbListSampleToHistogramListGenerator.txx
rename to Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.txx
diff --git a/Code/Learning/otbListSampleToListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
similarity index 100%
rename from Code/Learning/otbListSampleToListSampleFilter.h
rename to Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
diff --git a/Code/Learning/otbListSampleToListSampleFilter.txx b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.txx
similarity index 100%
rename from Code/Learning/otbListSampleToListSampleFilter.txx
rename to Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.txx
diff --git a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
similarity index 100%
rename from Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h
rename to Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
diff --git a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.txx b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.txx
similarity index 100%
rename from Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.txx
rename to Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.txx
diff --git a/Code/FeatureExtraction/otbLocalHistogramImageFunction.h b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
similarity index 100%
rename from Code/FeatureExtraction/otbLocalHistogramImageFunction.h
rename to Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
diff --git a/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.txx
similarity index 100%
rename from Code/FeatureExtraction/otbLocalHistogramImageFunction.txx
rename to Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.txx
diff --git a/Code/BasicFilters/otbNormalizeVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbNormalizeVectorImageFilter.h
rename to Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
diff --git a/Code/BasicFilters/otbNormalizeVectorImageFilter.txx b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbNormalizeVectorImageFilter.txx
rename to Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.txx
diff --git a/Code/Learning/otbShiftScaleSampleListFilter.h b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
similarity index 100%
rename from Code/Learning/otbShiftScaleSampleListFilter.h
rename to Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
diff --git a/Code/Learning/otbShiftScaleSampleListFilter.txx b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.txx
similarity index 100%
rename from Code/Learning/otbShiftScaleSampleListFilter.txx
rename to Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.txx
diff --git a/Code/BasicFilters/otbStreamingCompareImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbStreamingCompareImageFilter.h
rename to Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
diff --git a/Code/BasicFilters/otbStreamingCompareImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbStreamingCompareImageFilter.txx
rename to Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.txx
diff --git a/Code/BasicFilters/otbStreamingHistogramVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbStreamingHistogramVectorImageFilter.h
rename to Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
diff --git a/Code/BasicFilters/otbStreamingHistogramVectorImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbStreamingHistogramVectorImageFilter.txx
rename to Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbStreamingMinMaxImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbStreamingMinMaxImageFilter.h
rename to Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
diff --git a/Code/BasicFilters/otbStreamingMinMaxImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbStreamingMinMaxImageFilter.txx
rename to Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.txx
diff --git a/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h
rename to Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
diff --git a/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.txx
rename to Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbStreamingStatisticsImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbStreamingStatisticsImageFilter.h
rename to Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
diff --git a/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
rename to Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.txx
diff --git a/Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilter.h
rename to Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
diff --git a/Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilter.txx
rename to Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.txx
diff --git a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
rename to Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
diff --git a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
rename to Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.txx
diff --git a/Code/BasicFilters/otbVarianceImageFilter.h b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbVarianceImageFilter.h
rename to Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
diff --git a/Code/BasicFilters/otbVarianceImageFilter.txx b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbVarianceImageFilter.txx
rename to Modules/Filtering/Statistics/include/otbVarianceImageFilter.txx
diff --git a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbVectorImageToIntensityImageFilter.h
rename to Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
diff --git a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
rename to Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.txx
diff --git a/Code/BasicFilters/otbVectorImageToMatrixImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbVectorImageToMatrixImageFilter.h
rename to Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
diff --git a/Code/BasicFilters/otbVectorImageToMatrixImageFilter.txx b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbVectorImageToMatrixImageFilter.txx
rename to Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.txx
diff --git a/Testing/Fa/StreamingStat.cxx b/Modules/Filtering/Statistics/test/StreamingStat.cxx
similarity index 100%
rename from Testing/Fa/StreamingStat.cxx
rename to Modules/Filtering/Statistics/test/StreamingStat.cxx
diff --git a/Testing/Code/OBIA/otbBandsStatisticsAttributesLabelMapFilter.cxx b/Modules/Filtering/Statistics/test/otbBandsStatisticsAttributesLabelMapFilter.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbBandsStatisticsAttributesLabelMapFilter.cxx
rename to Modules/Filtering/Statistics/test/otbBandsStatisticsAttributesLabelMapFilter.cxx
diff --git a/Testing/Code/Learning/otbConcatenateSampleListFilter.cxx b/Modules/Filtering/Statistics/test/otbConcatenateSampleListFilter.cxx
similarity index 100%
rename from Testing/Code/Learning/otbConcatenateSampleListFilter.cxx
rename to Modules/Filtering/Statistics/test/otbConcatenateSampleListFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorNew.cxx b/Modules/Filtering/Statistics/test/otbContinuousMinimumMaximumImageCalculatorNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorNew.cxx
rename to Modules/Filtering/Statistics/test/otbContinuousMinimumMaximumImageCalculatorNew.cxx
diff --git a/Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx b/Modules/Filtering/Statistics/test/otbContinuousMinimumMaximumImageCalculatorTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculatorTest.cxx
rename to Modules/Filtering/Statistics/test/otbContinuousMinimumMaximumImageCalculatorTest.cxx
diff --git a/Testing/Code/Radiometry/otbDEMCaracteristicsExtractor.cxx b/Modules/Filtering/Statistics/test/otbDEMCaracteristicsExtractor.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbDEMCaracteristicsExtractor.cxx
rename to Modules/Filtering/Statistics/test/otbDEMCaracteristicsExtractor.cxx
diff --git a/Testing/Code/Radiometry/otbDEMCaracteristicsExtractorNew.cxx b/Modules/Filtering/Statistics/test/otbDEMCaracteristicsExtractorNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbDEMCaracteristicsExtractorNew.cxx
rename to Modules/Filtering/Statistics/test/otbDEMCaracteristicsExtractorNew.cxx
diff --git a/Testing/Code/Learning/otbGaussianAdditiveNoiseSampleListFilter.cxx b/Modules/Filtering/Statistics/test/otbGaussianAdditiveNoiseSampleListFilter.cxx
similarity index 100%
rename from Testing/Code/Learning/otbGaussianAdditiveNoiseSampleListFilter.cxx
rename to Modules/Filtering/Statistics/test/otbGaussianAdditiveNoiseSampleListFilter.cxx
diff --git a/Testing/Code/Common/otbHistogramStatisticsFunction.cxx b/Modules/Filtering/Statistics/test/otbHistogramStatisticsFunction.cxx
similarity index 100%
rename from Testing/Code/Common/otbHistogramStatisticsFunction.cxx
rename to Modules/Filtering/Statistics/test/otbHistogramStatisticsFunction.cxx
diff --git a/Testing/Code/BasicFilters/otbImaginaryImageToComplexImageFilterTest.cxx b/Modules/Filtering/Statistics/test/otbImaginaryImageToComplexImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbImaginaryImageToComplexImageFilterTest.cxx
rename to Modules/Filtering/Statistics/test/otbImaginaryImageToComplexImageFilterTest.cxx
diff --git a/Testing/Code/Learning/otbListSampleGeneratorTest.cxx b/Modules/Filtering/Statistics/test/otbListSampleGeneratorTest.cxx
similarity index 100%
rename from Testing/Code/Learning/otbListSampleGeneratorTest.cxx
rename to Modules/Filtering/Statistics/test/otbListSampleGeneratorTest.cxx
diff --git a/Testing/Code/Learning/otbListSampleToBalancedListSampleFilter.cxx b/Modules/Filtering/Statistics/test/otbListSampleToBalancedListSampleFilter.cxx
similarity index 100%
rename from Testing/Code/Learning/otbListSampleToBalancedListSampleFilter.cxx
rename to Modules/Filtering/Statistics/test/otbListSampleToBalancedListSampleFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx b/Modules/Filtering/Statistics/test/otbListSampleToHistogramListGenerator.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbListSampleToHistogramListGenerator.cxx
rename to Modules/Filtering/Statistics/test/otbListSampleToHistogramListGenerator.cxx
diff --git a/Testing/Code/BasicFilters/otbListSampleToHistogramListGeneratorNew.cxx b/Modules/Filtering/Statistics/test/otbListSampleToHistogramListGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbListSampleToHistogramListGeneratorNew.cxx
rename to Modules/Filtering/Statistics/test/otbListSampleToHistogramListGeneratorNew.cxx
diff --git a/Testing/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.cxx b/Modules/Filtering/Statistics/test/otbListSampleToVariableDimensionHistogramGenerator.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.cxx
rename to Modules/Filtering/Statistics/test/otbListSampleToVariableDimensionHistogramGenerator.cxx
diff --git a/Testing/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGeneratorNew.cxx b/Modules/Filtering/Statistics/test/otbListSampleToVariableDimensionHistogramGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGeneratorNew.cxx
rename to Modules/Filtering/Statistics/test/otbListSampleToVariableDimensionHistogramGeneratorNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLocalHistogramImageFunctionNew.cxx b/Modules/Filtering/Statistics/test/otbLocalHistogramImageFunctionNew.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLocalHistogramImageFunctionNew.cxx
rename to Modules/Filtering/Statistics/test/otbLocalHistogramImageFunctionNew.cxx
diff --git a/Testing/Code/FeatureExtraction/otbLocalHistogramImageFunctionTest.cxx b/Modules/Filtering/Statistics/test/otbLocalHistogramImageFunctionTest.cxx
similarity index 100%
rename from Testing/Code/FeatureExtraction/otbLocalHistogramImageFunctionTest.cxx
rename to Modules/Filtering/Statistics/test/otbLocalHistogramImageFunctionTest.cxx
diff --git a/Testing/Code/BasicFilters/otbNormalizeVectorImageFilter.cxx b/Modules/Filtering/Statistics/test/otbNormalizeVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbNormalizeVectorImageFilter.cxx
rename to Modules/Filtering/Statistics/test/otbNormalizeVectorImageFilter.cxx
diff --git a/Testing/Code/Common/otbPipelineMemoryPrintCalculatorTest.cxx b/Modules/Filtering/Statistics/test/otbPipelineMemoryPrintCalculatorTest.cxx
similarity index 100%
rename from Testing/Code/Common/otbPipelineMemoryPrintCalculatorTest.cxx
rename to Modules/Filtering/Statistics/test/otbPipelineMemoryPrintCalculatorTest.cxx
diff --git a/Testing/Code/BasicFilters/otbProjectiveProjection.cxx b/Modules/Filtering/Statistics/test/otbProjectiveProjection.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbProjectiveProjection.cxx
rename to Modules/Filtering/Statistics/test/otbProjectiveProjection.cxx
diff --git a/Testing/Code/BasicFilters/otbRealAndImaginaryImageToComplexImageFilterTest.cxx b/Modules/Filtering/Statistics/test/otbRealAndImaginaryImageToComplexImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbRealAndImaginaryImageToComplexImageFilterTest.cxx
rename to Modules/Filtering/Statistics/test/otbRealAndImaginaryImageToComplexImageFilterTest.cxx
diff --git a/Testing/Code/BasicFilters/otbRealImageToComplexImageFilterTest.cxx b/Modules/Filtering/Statistics/test/otbRealImageToComplexImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbRealImageToComplexImageFilterTest.cxx
rename to Modules/Filtering/Statistics/test/otbRealImageToComplexImageFilterTest.cxx
diff --git a/Testing/Code/BasicFilters/otbResampleSLCImage.cxx b/Modules/Filtering/Statistics/test/otbResampleSLCImage.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbResampleSLCImage.cxx
rename to Modules/Filtering/Statistics/test/otbResampleSLCImage.cxx
diff --git a/Testing/Code/Learning/otbShiftScaleSampleListFilter.cxx b/Modules/Filtering/Statistics/test/otbShiftScaleSampleListFilter.cxx
similarity index 100%
rename from Testing/Code/Learning/otbShiftScaleSampleListFilter.cxx
rename to Modules/Filtering/Statistics/test/otbShiftScaleSampleListFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterTest.cxx b/Modules/Filtering/Statistics/test/otbShiftScaleVectorImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbShiftScaleVectorImageFilterTest.cxx
rename to Modules/Filtering/Statistics/test/otbShiftScaleVectorImageFilterTest.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingCompareImageFilter.cxx b/Modules/Filtering/Statistics/test/otbStreamingCompareImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingCompareImageFilter.cxx
rename to Modules/Filtering/Statistics/test/otbStreamingCompareImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingHistogramVectorImageFilter.cxx b/Modules/Filtering/Statistics/test/otbStreamingHistogramVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingHistogramVectorImageFilter.cxx
rename to Modules/Filtering/Statistics/test/otbStreamingHistogramVectorImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx b/Modules/Filtering/Statistics/test/otbStreamingMinMaxImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx
rename to Modules/Filtering/Statistics/test/otbStreamingMinMaxImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilterNew.cxx b/Modules/Filtering/Statistics/test/otbStreamingMinMaxImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingMinMaxImageFilterNew.cxx
rename to Modules/Filtering/Statistics/test/otbStreamingMinMaxImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx b/Modules/Filtering/Statistics/test/otbStreamingMinMaxVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
rename to Modules/Filtering/Statistics/test/otbStreamingMinMaxVectorImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilterNew.cxx b/Modules/Filtering/Statistics/test/otbStreamingMinMaxVectorImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilterNew.cxx
rename to Modules/Filtering/Statistics/test/otbStreamingMinMaxVectorImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx b/Modules/Filtering/Statistics/test/otbStreamingStatisticsImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx
rename to Modules/Filtering/Statistics/test/otbStreamingStatisticsImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilterNew.cxx b/Modules/Filtering/Statistics/test/otbStreamingStatisticsImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingStatisticsImageFilterNew.cxx
rename to Modules/Filtering/Statistics/test/otbStreamingStatisticsImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilterTest.cxx b/Modules/Filtering/Statistics/test/otbStreamingStatisticsMapFromLabelImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilterTest.cxx
rename to Modules/Filtering/Statistics/test/otbStreamingStatisticsMapFromLabelImageFilterTest.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx b/Modules/Filtering/Statistics/test/otbStreamingStatisticsVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx
rename to Modules/Filtering/Statistics/test/otbStreamingStatisticsVectorImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilterNew.cxx b/Modules/Filtering/Statistics/test/otbStreamingStatisticsVectorImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilterNew.cxx
rename to Modules/Filtering/Statistics/test/otbStreamingStatisticsVectorImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbVarianceImageFilter.cxx b/Modules/Filtering/Statistics/test/otbVarianceImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVarianceImageFilter.cxx
rename to Modules/Filtering/Statistics/test/otbVarianceImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbVarianceImageFilterNew.cxx b/Modules/Filtering/Statistics/test/otbVarianceImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVarianceImageFilterNew.cxx
rename to Modules/Filtering/Statistics/test/otbVarianceImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilter.cxx b/Modules/Filtering/Statistics/test/otbVectorImageToIntensityImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilter.cxx
rename to Modules/Filtering/Statistics/test/otbVectorImageToIntensityImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilterNew.cxx b/Modules/Filtering/Statistics/test/otbVectorImageToIntensityImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVectorImageToIntensityImageFilterNew.cxx
rename to Modules/Filtering/Statistics/test/otbVectorImageToIntensityImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbVectorImageToMatrixImageFilter.cxx b/Modules/Filtering/Statistics/test/otbVectorImageToMatrixImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVectorImageToMatrixImageFilter.cxx
rename to Modules/Filtering/Statistics/test/otbVectorImageToMatrixImageFilter.cxx
diff --git a/Code/BasicFilters/otbConcatenateVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
similarity index 100%
rename from Code/BasicFilters/otbConcatenateVectorDataFilter.h
rename to Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
diff --git a/Code/BasicFilters/otbConcatenateVectorDataFilter.txx b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbConcatenateVectorDataFilter.txx
rename to Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.txx
diff --git a/Code/BasicFilters/otbCorrectPolygonFunctor.h b/Modules/Filtering/VectorDataManipulation/include/otbCorrectPolygonFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbCorrectPolygonFunctor.h
rename to Modules/Filtering/VectorDataManipulation/include/otbCorrectPolygonFunctor.h
diff --git a/Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
similarity index 100%
rename from Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.h
rename to Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
diff --git a/Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.txx b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.txx
rename to Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.txx
diff --git a/Code/Common/otbGISTableToGISTableFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbGISTableToGISTableFilter.h
similarity index 100%
rename from Code/Common/otbGISTableToGISTableFilter.h
rename to Modules/Filtering/VectorDataManipulation/include/otbGISTableToGISTableFilter.h
diff --git a/Code/Common/otbGISTableToGISTableFilter.txx b/Modules/Filtering/VectorDataManipulation/include/otbGISTableToGISTableFilter.txx
similarity index 100%
rename from Code/Common/otbGISTableToGISTableFilter.txx
rename to Modules/Filtering/VectorDataManipulation/include/otbGISTableToGISTableFilter.txx
diff --git a/Code/BasicFilters/otbPolygonCompacityFunctor.h b/Modules/Filtering/VectorDataManipulation/include/otbPolygonCompacityFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbPolygonCompacityFunctor.h
rename to Modules/Filtering/VectorDataManipulation/include/otbPolygonCompacityFunctor.h
diff --git a/Code/BasicFilters/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
similarity index 100%
rename from Code/BasicFilters/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
rename to Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
diff --git a/Code/BasicFilters/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.txx b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.txx
rename to Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.txx
diff --git a/Code/BasicFilters/otbSimplifyPathFunctor.h b/Modules/Filtering/VectorDataManipulation/include/otbSimplifyPathFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbSimplifyPathFunctor.h
rename to Modules/Filtering/VectorDataManipulation/include/otbSimplifyPathFunctor.h
diff --git a/Code/BasicFilters/otbSpectralAngleDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
similarity index 100%
rename from Code/BasicFilters/otbSpectralAngleDataNodeFeatureFunction.h
rename to Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
diff --git a/Code/BasicFilters/otbSpectralAngleDataNodeFeatureFunction.txx b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbSpectralAngleDataNodeFeatureFunction.txx
rename to Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.txx
diff --git a/Code/IO/otbVectorDataAdapter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
similarity index 100%
rename from Code/IO/otbVectorDataAdapter.h
rename to Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
diff --git a/Code/IO/otbVectorDataAdapter.txx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.txx
similarity index 100%
rename from Code/IO/otbVectorDataAdapter.txx
rename to Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.txx
diff --git a/Code/Common/otbVectorDataExtractROI.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
similarity index 100%
rename from Code/Common/otbVectorDataExtractROI.h
rename to Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
diff --git a/Code/Common/otbVectorDataExtractROI.txx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.txx
similarity index 100%
rename from Code/Common/otbVectorDataExtractROI.txx
rename to Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.txx
diff --git a/Code/BasicFilters/otbVectorDataToRandomLineGenerator.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
similarity index 100%
rename from Code/BasicFilters/otbVectorDataToRandomLineGenerator.h
rename to Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
diff --git a/Code/BasicFilters/otbVectorDataToRandomLineGenerator.txx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.txx
similarity index 100%
rename from Code/BasicFilters/otbVectorDataToRandomLineGenerator.txx
rename to Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.txx
diff --git a/Code/Fuzzy/otbVectorDataToSpecificDescriptionFilterBase.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
similarity index 100%
rename from Code/Fuzzy/otbVectorDataToSpecificDescriptionFilterBase.h
rename to Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
diff --git a/Code/Fuzzy/otbVectorDataToSpecificDescriptionFilterBase.txx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.txx
similarity index 100%
rename from Code/Fuzzy/otbVectorDataToSpecificDescriptionFilterBase.txx
rename to Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.txx
diff --git a/Code/Common/otbVectorDataToVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
similarity index 100%
rename from Code/Common/otbVectorDataToVectorDataFilter.h
rename to Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
diff --git a/Code/Common/otbVectorDataToVectorDataFilter.txx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.txx
similarity index 100%
rename from Code/Common/otbVectorDataToVectorDataFilter.txx
rename to Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.txx
diff --git a/Testing/Code/BasicFilters/otbConcatenateVectorDataFilter.cxx b/Modules/Filtering/VectorDataManipulation/test/otbConcatenateVectorDataFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbConcatenateVectorDataFilter.cxx
rename to Modules/Filtering/VectorDataManipulation/test/otbConcatenateVectorDataFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.cxx b/Modules/Filtering/VectorDataManipulation/test/otbDBOverlapDataNodeFeatureFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.cxx
rename to Modules/Filtering/VectorDataManipulation/test/otbDBOverlapDataNodeFeatureFunction.cxx
diff --git a/Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx b/Modules/Filtering/VectorDataManipulation/test/otbPolygonCompacityFunctor.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbPolygonCompacityFunctor.cxx
rename to Modules/Filtering/VectorDataManipulation/test/otbPolygonCompacityFunctor.cxx
diff --git a/Testing/Code/Common/otbVectorDataExtractROI.cxx b/Modules/Filtering/VectorDataManipulation/test/otbVectorDataExtractROI.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataExtractROI.cxx
rename to Modules/Filtering/VectorDataManipulation/test/otbVectorDataExtractROI.cxx
diff --git a/Testing/Code/Common/otbVectorDataExtractROINew.cxx b/Modules/Filtering/VectorDataManipulation/test/otbVectorDataExtractROINew.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataExtractROINew.cxx
rename to Modules/Filtering/VectorDataManipulation/test/otbVectorDataExtractROINew.cxx
diff --git a/Testing/Code/BasicFilters/otbVectorDataToRandomLineGenerator.cxx b/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToRandomLineGenerator.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbVectorDataToRandomLineGenerator.cxx
rename to Modules/Filtering/VectorDataManipulation/test/otbVectorDataToRandomLineGenerator.cxx
diff --git a/Testing/Code/Fuzzy/otbVectorDataToSpecificDescriptionFilterBase.cxx b/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToSpecificDescriptionFilterBase.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbVectorDataToSpecificDescriptionFilterBase.cxx
rename to Modules/Filtering/VectorDataManipulation/test/otbVectorDataToSpecificDescriptionFilterBase.cxx
diff --git a/Testing/Code/Common/otbVectorDataToVectorDataFilterNew.cxx b/Modules/Filtering/VectorDataManipulation/test/otbVectorDataToVectorDataFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataToVectorDataFilterNew.cxx
rename to Modules/Filtering/VectorDataManipulation/test/otbVectorDataToVectorDataFilterNew.cxx
diff --git a/Code/Common/otbMapnikAdapter.h b/Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h
similarity index 100%
rename from Code/Common/otbMapnikAdapter.h
rename to Modules/Filtering/VectorDataRendering/include/otbMapnikAdapter.h
diff --git a/Code/Common/otbVectorDataStyle.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h
similarity index 100%
rename from Code/Common/otbVectorDataStyle.h
rename to Modules/Filtering/VectorDataRendering/include/otbVectorDataStyle.h
diff --git a/Code/Common/otbVectorDataToImageFilter.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h
similarity index 100%
rename from Code/Common/otbVectorDataToImageFilter.h
rename to Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.h
diff --git a/Code/Common/otbVectorDataToImageFilter.txx b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.txx
similarity index 100%
rename from Code/Common/otbVectorDataToImageFilter.txx
rename to Modules/Filtering/VectorDataRendering/include/otbVectorDataToImageFilter.txx
diff --git a/Code/Common/otbVectorDataToMapFilter.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
similarity index 100%
rename from Code/Common/otbVectorDataToMapFilter.h
rename to Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
diff --git a/Code/Common/otbVectorDataToMapFilter.txx b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.txx
similarity index 100%
rename from Code/Common/otbVectorDataToMapFilter.txx
rename to Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.txx
diff --git a/Code/Common/otbVectorDataStyle.cxx b/Modules/Filtering/VectorDataRendering/src/otbVectorDataStyle.cxx
similarity index 100%
rename from Code/Common/otbVectorDataStyle.cxx
rename to Modules/Filtering/VectorDataRendering/src/otbVectorDataStyle.cxx
diff --git a/Testing/Code/Common/otbVectorDataToImageFilter.cxx b/Modules/Filtering/VectorDataRendering/test/otbVectorDataToImageFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataToImageFilter.cxx
rename to Modules/Filtering/VectorDataRendering/test/otbVectorDataToImageFilter.cxx
diff --git a/Testing/Code/Common/otbVectorDataToMapFilter.cxx b/Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataToMapFilter.cxx
rename to Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilter.cxx
diff --git a/Testing/Code/Common/otbVectorDataToMapFilterNew.cxx b/Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataToMapFilterNew.cxx
rename to Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilterNew.cxx
diff --git a/Testing/Code/Common/otbVectorDataToMapFilterNoFonts.cxx b/Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilterNoFonts.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataToMapFilterNoFonts.cxx
rename to Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilterNoFonts.cxx
diff --git a/Testing/Code/Common/otbVectorDataToMapFilterSensorModel.cxx b/Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilterSensorModel.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataToMapFilterSensorModel.cxx
rename to Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilterSensorModel.cxx
diff --git a/Testing/Code/Common/otbVectorDataToMapFilterWorld.cxx b/Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilterWorld.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataToMapFilterWorld.cxx
rename to Modules/Filtering/VectorDataRendering/test/otbVectorDataToMapFilterWorld.cxx
diff --git a/Code/MultiScale/otbSubsampleImageFilter.h b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
similarity index 100%
rename from Code/MultiScale/otbSubsampleImageFilter.h
rename to Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
diff --git a/Code/MultiScale/otbSubsampleImageFilter.txx b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.txx
similarity index 100%
rename from Code/MultiScale/otbSubsampleImageFilter.txx
rename to Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.txx
diff --git a/Code/MultiScale/otbWaveletFilterBank.h b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
similarity index 100%
rename from Code/MultiScale/otbWaveletFilterBank.h
rename to Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
diff --git a/Code/MultiScale/otbWaveletFilterBank.txx b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx
similarity index 100%
rename from Code/MultiScale/otbWaveletFilterBank.txx
rename to Modules/Filtering/Wavelet/include/otbWaveletFilterBank.txx
diff --git a/Code/MultiScale/otbWaveletGenerator.h b/Modules/Filtering/Wavelet/include/otbWaveletGenerator.h
similarity index 100%
rename from Code/MultiScale/otbWaveletGenerator.h
rename to Modules/Filtering/Wavelet/include/otbWaveletGenerator.h
diff --git a/Code/MultiScale/otbWaveletHighPassOperator.h b/Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h
similarity index 100%
rename from Code/MultiScale/otbWaveletHighPassOperator.h
rename to Modules/Filtering/Wavelet/include/otbWaveletHighPassOperator.h
diff --git a/Code/MultiScale/otbWaveletLowPassOperator.h b/Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h
similarity index 100%
rename from Code/MultiScale/otbWaveletLowPassOperator.h
rename to Modules/Filtering/Wavelet/include/otbWaveletLowPassOperator.h
diff --git a/Code/MultiScale/otbWaveletOperator.h b/Modules/Filtering/Wavelet/include/otbWaveletOperator.h
similarity index 100%
rename from Code/MultiScale/otbWaveletOperator.h
rename to Modules/Filtering/Wavelet/include/otbWaveletOperator.h
diff --git a/Code/MultiScale/otbWaveletOperatorBase.h b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
similarity index 100%
rename from Code/MultiScale/otbWaveletOperatorBase.h
rename to Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
diff --git a/Code/MultiScale/otbWaveletOperatorBase.txx b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.txx
similarity index 100%
rename from Code/MultiScale/otbWaveletOperatorBase.txx
rename to Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.txx
diff --git a/Code/MultiScale/otbWaveletPacketDecompositionCosts.h b/Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h
similarity index 100%
rename from Code/MultiScale/otbWaveletPacketDecompositionCosts.h
rename to Modules/Filtering/Wavelet/include/otbWaveletPacketDecompositionCosts.h
diff --git a/Code/MultiScale/otbWaveletPacketTransform.h b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
similarity index 100%
rename from Code/MultiScale/otbWaveletPacketTransform.h
rename to Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
diff --git a/Code/MultiScale/otbWaveletPacketTransform.txx b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.txx
similarity index 100%
rename from Code/MultiScale/otbWaveletPacketTransform.txx
rename to Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.txx
diff --git a/Code/MultiScale/otbWaveletTransform.h b/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
similarity index 100%
rename from Code/MultiScale/otbWaveletTransform.h
rename to Modules/Filtering/Wavelet/include/otbWaveletTransform.h
diff --git a/Code/MultiScale/otbWaveletTransform.txx b/Modules/Filtering/Wavelet/include/otbWaveletTransform.txx
similarity index 100%
rename from Code/MultiScale/otbWaveletTransform.txx
rename to Modules/Filtering/Wavelet/include/otbWaveletTransform.txx
diff --git a/Code/MultiScale/otbWaveletGenerator.cxx b/Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx
similarity index 100%
rename from Code/MultiScale/otbWaveletGenerator.cxx
rename to Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx
diff --git a/Testing/Code/MultiScale/otbSubsampleImageFilter.cxx b/Modules/Filtering/Wavelet/test/otbSubsampleImageFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbSubsampleImageFilter.cxx
rename to Modules/Filtering/Wavelet/test/otbSubsampleImageFilter.cxx
diff --git a/Testing/Code/MultiScale/otbSubsampleImageFilterNew.cxx b/Modules/Filtering/Wavelet/test/otbSubsampleImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbSubsampleImageFilterNew.cxx
rename to Modules/Filtering/Wavelet/test/otbSubsampleImageFilterNew.cxx
diff --git a/Testing/Code/MultiScale/otbWaveletFilterBank.cxx b/Modules/Filtering/Wavelet/test/otbWaveletFilterBank.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbWaveletFilterBank.cxx
rename to Modules/Filtering/Wavelet/test/otbWaveletFilterBank.cxx
diff --git a/Testing/Code/MultiScale/otbWaveletFilterBankNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletFilterBankNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbWaveletFilterBankNew.cxx
rename to Modules/Filtering/Wavelet/test/otbWaveletFilterBankNew.cxx
diff --git a/Testing/Code/MultiScale/otbWaveletInverseFilterBankNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletInverseFilterBankNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbWaveletInverseFilterBankNew.cxx
rename to Modules/Filtering/Wavelet/test/otbWaveletInverseFilterBankNew.cxx
diff --git a/Testing/Code/MultiScale/otbWaveletInverseTransformNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletInverseTransformNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbWaveletInverseTransformNew.cxx
rename to Modules/Filtering/Wavelet/test/otbWaveletInverseTransformNew.cxx
diff --git a/Testing/Code/MultiScale/otbWaveletOperator.cxx b/Modules/Filtering/Wavelet/test/otbWaveletOperator.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbWaveletOperator.cxx
rename to Modules/Filtering/Wavelet/test/otbWaveletOperator.cxx
diff --git a/Testing/Code/MultiScale/otbWaveletOperatorNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletOperatorNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbWaveletOperatorNew.cxx
rename to Modules/Filtering/Wavelet/test/otbWaveletOperatorNew.cxx
diff --git a/Testing/Code/MultiScale/otbWaveletPacketInverseTransformNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletPacketInverseTransformNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbWaveletPacketInverseTransformNew.cxx
rename to Modules/Filtering/Wavelet/test/otbWaveletPacketInverseTransformNew.cxx
diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx b/Modules/Filtering/Wavelet/test/otbWaveletPacketTransform.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
rename to Modules/Filtering/Wavelet/test/otbWaveletPacketTransform.cxx
diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletPacketTransformNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
rename to Modules/Filtering/Wavelet/test/otbWaveletPacketTransformNew.cxx
diff --git a/Testing/Code/MultiScale/otbWaveletTransform.cxx b/Modules/Filtering/Wavelet/test/otbWaveletTransform.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbWaveletTransform.cxx
rename to Modules/Filtering/Wavelet/test/otbWaveletTransform.cxx
diff --git a/Testing/Code/MultiScale/otbWaveletTransformNew.cxx b/Modules/Filtering/Wavelet/test/otbWaveletTransformNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbWaveletTransformNew.cxx
rename to Modules/Filtering/Wavelet/test/otbWaveletTransformNew.cxx
diff --git a/Code/Fuzzy/otbFuzzyDescriptorsModelManager.h b/Modules/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h
similarity index 100%
rename from Code/Fuzzy/otbFuzzyDescriptorsModelManager.h
rename to Modules/Fusion/Fuzzy/include/otbFuzzyDescriptorsModelManager.h
diff --git a/Code/Fuzzy/otbFuzzyVariable.h b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
similarity index 100%
rename from Code/Fuzzy/otbFuzzyVariable.h
rename to Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
diff --git a/Code/Fuzzy/otbFuzzyVariable.txx b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.txx
similarity index 100%
rename from Code/Fuzzy/otbFuzzyVariable.txx
rename to Modules/Fusion/Fuzzy/include/otbFuzzyVariable.txx
diff --git a/Code/Fuzzy/otbFuzzyDescriptorsModelManager.cxx b/Modules/Fusion/Fuzzy/src/otbFuzzyDescriptorsModelManager.cxx
similarity index 100%
rename from Code/Fuzzy/otbFuzzyDescriptorsModelManager.cxx
rename to Modules/Fusion/Fuzzy/src/otbFuzzyDescriptorsModelManager.cxx
diff --git a/Testing/Code/Fuzzy/otbFuzzyDescriptorsModelManager.cxx b/Modules/Fusion/Fuzzy/test/otbFuzzyDescriptorsModelManager.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbFuzzyDescriptorsModelManager.cxx
rename to Modules/Fusion/Fuzzy/test/otbFuzzyDescriptorsModelManager.cxx
diff --git a/Testing/Code/Fuzzy/otbFuzzyVariable2Values.cxx b/Modules/Fusion/Fuzzy/test/otbFuzzyVariable2Values.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbFuzzyVariable2Values.cxx
rename to Modules/Fusion/Fuzzy/test/otbFuzzyVariable2Values.cxx
diff --git a/Testing/Code/Fuzzy/otbFuzzyVariableDSApplied.cxx b/Modules/Fusion/Fuzzy/test/otbFuzzyVariableDSApplied.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbFuzzyVariableDSApplied.cxx
rename to Modules/Fusion/Fuzzy/test/otbFuzzyVariableDSApplied.cxx
diff --git a/Testing/Code/Fuzzy/otbFuzzyVariableGetMaxVar.cxx b/Modules/Fusion/Fuzzy/test/otbFuzzyVariableGetMaxVar.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbFuzzyVariableGetMaxVar.cxx
rename to Modules/Fusion/Fuzzy/test/otbFuzzyVariableGetMaxVar.cxx
diff --git a/Testing/Code/Fuzzy/otbFuzzyVariableNew.cxx b/Modules/Fusion/Fuzzy/test/otbFuzzyVariableNew.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbFuzzyVariableNew.cxx
rename to Modules/Fusion/Fuzzy/test/otbFuzzyVariableNew.cxx
diff --git a/Testing/Code/Fuzzy/otbFuzzyVariableSetValue.cxx b/Modules/Fusion/Fuzzy/test/otbFuzzyVariableSetValue.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbFuzzyVariableSetValue.cxx
rename to Modules/Fusion/Fuzzy/test/otbFuzzyVariableSetValue.cxx
diff --git a/Code/Learning/otbNeighborhoodMajorityVotingImageFilter.h b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
similarity index 100%
rename from Code/Learning/otbNeighborhoodMajorityVotingImageFilter.h
rename to Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
diff --git a/Code/Learning/otbNeighborhoodMajorityVotingImageFilter.txx b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.txx
similarity index 100%
rename from Code/Learning/otbNeighborhoodMajorityVotingImageFilter.txx
rename to Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.txx
diff --git a/Testing/Code/Learning/otbNeighborhoodMajorityVotingImageFilterNew.cxx b/Modules/Fusion/MajorityVoting/test/otbNeighborhoodMajorityVotingImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbNeighborhoodMajorityVotingImageFilterNew.cxx
rename to Modules/Fusion/MajorityVoting/test/otbNeighborhoodMajorityVotingImageFilterNew.cxx
diff --git a/Testing/Code/Learning/otbNeighborhoodMajorityVotingImageFilterTest.cxx b/Modules/Fusion/MajorityVoting/test/otbNeighborhoodMajorityVotingImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/Learning/otbNeighborhoodMajorityVotingImageFilterTest.cxx
rename to Modules/Fusion/MajorityVoting/test/otbNeighborhoodMajorityVotingImageFilterTest.cxx
diff --git a/Code/Fusion/otbBayesianFusionFilter.h b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
similarity index 100%
rename from Code/Fusion/otbBayesianFusionFilter.h
rename to Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
diff --git a/Code/Fusion/otbBayesianFusionFilter.txx b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.txx
similarity index 100%
rename from Code/Fusion/otbBayesianFusionFilter.txx
rename to Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.txx
diff --git a/Code/Fusion/otbFusionImageBase.h b/Modules/Fusion/PanSharpening/include/otbFusionImageBase.h
similarity index 100%
rename from Code/Fusion/otbFusionImageBase.h
rename to Modules/Fusion/PanSharpening/include/otbFusionImageBase.h
diff --git a/Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
similarity index 100%
rename from Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.h
rename to Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
diff --git a/Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.txx b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.txx
similarity index 100%
rename from Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.txx
rename to Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.txx
diff --git a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
similarity index 100%
rename from Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
rename to Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
diff --git a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.txx b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.txx
similarity index 100%
rename from Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.txx
rename to Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.txx
diff --git a/Testing/Code/Fusion/otbBayesianFusionFilter.cxx b/Modules/Fusion/PanSharpening/test/otbBayesianFusionFilter.cxx
similarity index 100%
rename from Testing/Code/Fusion/otbBayesianFusionFilter.cxx
rename to Modules/Fusion/PanSharpening/test/otbBayesianFusionFilter.cxx
diff --git a/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx b/Modules/Fusion/PanSharpening/test/otbBayesianFusionFilterNew.cxx
similarity index 100%
rename from Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx
rename to Modules/Fusion/PanSharpening/test/otbBayesianFusionFilterNew.cxx
diff --git a/Testing/Code/Fusion/otbFusionImageBaseNew.cxx b/Modules/Fusion/PanSharpening/test/otbFusionImageBaseNew.cxx
similarity index 100%
rename from Testing/Code/Fusion/otbFusionImageBaseNew.cxx
rename to Modules/Fusion/PanSharpening/test/otbFusionImageBaseNew.cxx
diff --git a/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.cxx b/Modules/Fusion/PanSharpening/test/otbLmvmPanSharpeningFusionImageFilter.cxx
similarity index 100%
rename from Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.cxx
rename to Modules/Fusion/PanSharpening/test/otbLmvmPanSharpeningFusionImageFilter.cxx
diff --git a/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilterNew.cxx b/Modules/Fusion/PanSharpening/test/otbLmvmPanSharpeningFusionImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilterNew.cxx
rename to Modules/Fusion/PanSharpening/test/otbLmvmPanSharpeningFusionImageFilterNew.cxx
diff --git a/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.cxx b/Modules/Fusion/PanSharpening/test/otbSimpleRcsPanSharpeningFusionImageFilter.cxx
similarity index 100%
rename from Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.cxx
rename to Modules/Fusion/PanSharpening/test/otbSimpleRcsPanSharpeningFusionImageFilter.cxx
diff --git a/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx b/Modules/Fusion/PanSharpening/test/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
rename to Modules/Fusion/PanSharpening/test/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
diff --git a/Code/Hyperspectral/otbLocalRxDetectorFilter.h b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
similarity index 100%
rename from Code/Hyperspectral/otbLocalRxDetectorFilter.h
rename to Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
diff --git a/Code/Hyperspectral/otbLocalRxDetectorFilter.txx b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.txx
similarity index 100%
rename from Code/Hyperspectral/otbLocalRxDetectorFilter.txx
rename to Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.txx
diff --git a/Code/Hyperspectral/otbLocalRxDetectorNonThreadFilter.h b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
similarity index 100%
rename from Code/Hyperspectral/otbLocalRxDetectorNonThreadFilter.h
rename to Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
diff --git a/Code/Hyperspectral/otbLocalRxDetectorNonThreadFilter.txx b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.txx
similarity index 100%
rename from Code/Hyperspectral/otbLocalRxDetectorNonThreadFilter.txx
rename to Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.txx
diff --git a/Testing/Code/Hyperspectral/otbLocalRxDetectorRoiTest.cxx b/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorRoiTest.cxx
similarity index 100%
rename from Testing/Code/Hyperspectral/otbLocalRxDetectorRoiTest.cxx
rename to Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorRoiTest.cxx
diff --git a/Testing/Code/Hyperspectral/otbLocalRxDetectorTest.cxx b/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorTest.cxx
similarity index 100%
rename from Testing/Code/Hyperspectral/otbLocalRxDetectorTest.cxx
rename to Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorTest.cxx
diff --git a/Code/Hyperspectral/otbEigenvalueLikelihoodMaximisation.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
similarity index 100%
rename from Code/Hyperspectral/otbEigenvalueLikelihoodMaximisation.h
rename to Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
diff --git a/Code/Hyperspectral/otbEigenvalueLikelihoodMaximisation.txx b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.txx
similarity index 100%
rename from Code/Hyperspectral/otbEigenvalueLikelihoodMaximisation.txx
rename to Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.txx
diff --git a/Code/Hyperspectral/otbVcaImageFilter.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
similarity index 100%
rename from Code/Hyperspectral/otbVcaImageFilter.h
rename to Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
diff --git a/Code/Hyperspectral/otbVcaImageFilter.txx b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.txx
similarity index 100%
rename from Code/Hyperspectral/otbVcaImageFilter.txx
rename to Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.txx
diff --git a/Code/Hyperspectral/otbVirtualDimensionality.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
similarity index 100%
rename from Code/Hyperspectral/otbVirtualDimensionality.h
rename to Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
diff --git a/Code/Hyperspectral/otbVirtualDimensionality.txx b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.txx
similarity index 100%
rename from Code/Hyperspectral/otbVirtualDimensionality.txx
rename to Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.txx
diff --git a/Testing/Code/Hyperspectral/otbEigenvalueLikelihoodMaximization.cxx b/Modules/Hyperspectral/EndmembersExtraction/test/otbEigenvalueLikelihoodMaximization.cxx
similarity index 100%
rename from Testing/Code/Hyperspectral/otbEigenvalueLikelihoodMaximization.cxx
rename to Modules/Hyperspectral/EndmembersExtraction/test/otbEigenvalueLikelihoodMaximization.cxx
diff --git a/Testing/Code/Hyperspectral/otbVCAImageFilter.cxx b/Modules/Hyperspectral/EndmembersExtraction/test/otbVCAImageFilter.cxx
similarity index 100%
rename from Testing/Code/Hyperspectral/otbVCAImageFilter.cxx
rename to Modules/Hyperspectral/EndmembersExtraction/test/otbVCAImageFilter.cxx
diff --git a/Testing/Code/Hyperspectral/otbVirtualDimensionality.cxx b/Modules/Hyperspectral/EndmembersExtraction/test/otbVirtualDimensionality.cxx
similarity index 100%
rename from Testing/Code/Hyperspectral/otbVirtualDimensionality.cxx
rename to Modules/Hyperspectral/EndmembersExtraction/test/otbVirtualDimensionality.cxx
diff --git a/Code/Hyperspectral/otbISRAUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
similarity index 100%
rename from Code/Hyperspectral/otbISRAUnmixingImageFilter.h
rename to Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
diff --git a/Code/Hyperspectral/otbISRAUnmixingImageFilter.txx b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.txx
similarity index 100%
rename from Code/Hyperspectral/otbISRAUnmixingImageFilter.txx
rename to Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.txx
diff --git a/Code/Hyperspectral/otbMDMDNMFImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
similarity index 100%
rename from Code/Hyperspectral/otbMDMDNMFImageFilter.h
rename to Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
diff --git a/Code/Hyperspectral/otbMDMDNMFImageFilter.txx b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.txx
similarity index 100%
rename from Code/Hyperspectral/otbMDMDNMFImageFilter.txx
rename to Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.txx
diff --git a/Code/Hyperspectral/otbNCLSUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
similarity index 100%
rename from Code/Hyperspectral/otbNCLSUnmixingImageFilter.h
rename to Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
diff --git a/Code/Hyperspectral/otbNCLSUnmixingImageFilter.txx b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.txx
similarity index 100%
rename from Code/Hyperspectral/otbNCLSUnmixingImageFilter.txx
rename to Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.txx
diff --git a/Code/Hyperspectral/otbSparseUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
similarity index 100%
rename from Code/Hyperspectral/otbSparseUnmixingImageFilter.h
rename to Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
diff --git a/Code/Hyperspectral/otbSparseUnmixingImageFilter.txx b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.txx
similarity index 100%
rename from Code/Hyperspectral/otbSparseUnmixingImageFilter.txx
rename to Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.txx
diff --git a/Code/Hyperspectral/otbUnConstrainedLeastSquareImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
similarity index 100%
rename from Code/Hyperspectral/otbUnConstrainedLeastSquareImageFilter.h
rename to Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
diff --git a/Code/Hyperspectral/otbUnConstrainedLeastSquareImageFilter.txx b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.txx
similarity index 100%
rename from Code/Hyperspectral/otbUnConstrainedLeastSquareImageFilter.txx
rename to Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.txx
diff --git a/Testing/Code/Hyperspectral/otbISRAUnmixingImageFilter.cxx b/Modules/Hyperspectral/Unmixing/test/otbISRAUnmixingImageFilter.cxx
similarity index 100%
rename from Testing/Code/Hyperspectral/otbISRAUnmixingImageFilter.cxx
rename to Modules/Hyperspectral/Unmixing/test/otbISRAUnmixingImageFilter.cxx
diff --git a/Testing/Code/Hyperspectral/otbMDMDNMFImageFilter.cxx b/Modules/Hyperspectral/Unmixing/test/otbMDMDNMFImageFilter.cxx
similarity index 100%
rename from Testing/Code/Hyperspectral/otbMDMDNMFImageFilter.cxx
rename to Modules/Hyperspectral/Unmixing/test/otbMDMDNMFImageFilter.cxx
diff --git a/Testing/Code/Hyperspectral/otbNCLSUnmixingImageFilter.cxx b/Modules/Hyperspectral/Unmixing/test/otbNCLSUnmixingImageFilter.cxx
similarity index 100%
rename from Testing/Code/Hyperspectral/otbNCLSUnmixingImageFilter.cxx
rename to Modules/Hyperspectral/Unmixing/test/otbNCLSUnmixingImageFilter.cxx
diff --git a/Testing/Code/Hyperspectral/otbSparseUnmixingImageFilter.cxx b/Modules/Hyperspectral/Unmixing/test/otbSparseUnmixingImageFilter.cxx
similarity index 100%
rename from Testing/Code/Hyperspectral/otbSparseUnmixingImageFilter.cxx
rename to Modules/Hyperspectral/Unmixing/test/otbSparseUnmixingImageFilter.cxx
diff --git a/Testing/Code/Hyperspectral/otbSparseUnmixingImageFilterNew.cxx b/Modules/Hyperspectral/Unmixing/test/otbSparseUnmixingImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Hyperspectral/otbSparseUnmixingImageFilterNew.cxx
rename to Modules/Hyperspectral/Unmixing/test/otbSparseUnmixingImageFilterNew.cxx
diff --git a/Testing/Code/Hyperspectral/otbUnConstrainedLeastSquareImageFilter.cxx b/Modules/Hyperspectral/Unmixing/test/otbUnConstrainedLeastSquareImageFilter.cxx
similarity index 100%
rename from Testing/Code/Hyperspectral/otbUnConstrainedLeastSquareImageFilter.cxx
rename to Modules/Hyperspectral/Unmixing/test/otbUnConstrainedLeastSquareImageFilter.cxx
diff --git a/Code/IO/otbCoordinateToName.h b/Modules/IO/Carto/include/otbCoordinateToName.h
similarity index 100%
rename from Code/IO/otbCoordinateToName.h
rename to Modules/IO/Carto/include/otbCoordinateToName.h
diff --git a/Code/IO/otbImageToOSMVectorDataGenerator.h b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
similarity index 100%
rename from Code/IO/otbImageToOSMVectorDataGenerator.h
rename to Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
diff --git a/Code/IO/otbImageToOSMVectorDataGenerator.txx b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.txx
similarity index 100%
rename from Code/IO/otbImageToOSMVectorDataGenerator.txx
rename to Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.txx
diff --git a/Code/IO/otbMapFileProductWriter.h b/Modules/IO/Carto/include/otbMapFileProductWriter.h
similarity index 100%
rename from Code/IO/otbMapFileProductWriter.h
rename to Modules/IO/Carto/include/otbMapFileProductWriter.h
diff --git a/Code/IO/otbMapFileProductWriter.txx b/Modules/IO/Carto/include/otbMapFileProductWriter.txx
similarity index 100%
rename from Code/IO/otbMapFileProductWriter.txx
rename to Modules/IO/Carto/include/otbMapFileProductWriter.txx
diff --git a/Code/IO/otbOSMDataToVectorDataGenerator.h b/Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
similarity index 100%
rename from Code/IO/otbOSMDataToVectorDataGenerator.h
rename to Modules/IO/Carto/include/otbOSMDataToVectorDataGenerator.h
diff --git a/Code/IO/otbPlaceNameToLonLat.h b/Modules/IO/Carto/include/otbPlaceNameToLonLat.h
similarity index 100%
rename from Code/IO/otbPlaceNameToLonLat.h
rename to Modules/IO/Carto/include/otbPlaceNameToLonLat.h
diff --git a/Code/IO/otbWorldFile.h b/Modules/IO/Carto/include/otbWorldFile.h
similarity index 100%
rename from Code/IO/otbWorldFile.h
rename to Modules/IO/Carto/include/otbWorldFile.h
diff --git a/Code/IO/otbCoordinateToName.cxx b/Modules/IO/Carto/src/otbCoordinateToName.cxx
similarity index 100%
rename from Code/IO/otbCoordinateToName.cxx
rename to Modules/IO/Carto/src/otbCoordinateToName.cxx
diff --git a/Code/IO/otbOSMDataToVectorDataGenerator.cxx b/Modules/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx
similarity index 100%
rename from Code/IO/otbOSMDataToVectorDataGenerator.cxx
rename to Modules/IO/Carto/src/otbOSMDataToVectorDataGenerator.cxx
diff --git a/Code/IO/otbPlaceNameToLonLat.cxx b/Modules/IO/Carto/src/otbPlaceNameToLonLat.cxx
similarity index 100%
rename from Code/IO/otbPlaceNameToLonLat.cxx
rename to Modules/IO/Carto/src/otbPlaceNameToLonLat.cxx
diff --git a/Testing/Code/IO/otbCoordinateToNameTest.cxx b/Modules/IO/Carto/test/otbCoordinateToNameTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbCoordinateToNameTest.cxx
rename to Modules/IO/Carto/test/otbCoordinateToNameTest.cxx
diff --git a/Testing/Code/IO/otbImageToOSMVectorDataGenerator.cxx b/Modules/IO/Carto/test/otbImageToOSMVectorDataGenerator.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageToOSMVectorDataGenerator.cxx
rename to Modules/IO/Carto/test/otbImageToOSMVectorDataGenerator.cxx
diff --git a/Testing/Code/IO/otbMapFileProductWriter.cxx b/Modules/IO/Carto/test/otbMapFileProductWriter.cxx
similarity index 100%
rename from Testing/Code/IO/otbMapFileProductWriter.cxx
rename to Modules/IO/Carto/test/otbMapFileProductWriter.cxx
diff --git a/Testing/Code/IO/otbMapFileProductWriterNew.cxx b/Modules/IO/Carto/test/otbMapFileProductWriterNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbMapFileProductWriterNew.cxx
rename to Modules/IO/Carto/test/otbMapFileProductWriterNew.cxx
diff --git a/Testing/Code/IO/otbOSMDataToVectorDataTests.cxx b/Modules/IO/Carto/test/otbOSMDataToVectorDataTests.cxx
similarity index 100%
rename from Testing/Code/IO/otbOSMDataToVectorDataTests.cxx
rename to Modules/IO/Carto/test/otbOSMDataToVectorDataTests.cxx
diff --git a/Code/IO/otbExtendedFilenameHelper.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h
similarity index 100%
rename from Code/IO/otbExtendedFilenameHelper.h
rename to Modules/IO/ExtendedFilename/include/otbExtendedFilenameHelper.h
diff --git a/Code/IO/otbExtendedFilenameToReaderOptions.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
similarity index 100%
rename from Code/IO/otbExtendedFilenameToReaderOptions.h
rename to Modules/IO/ExtendedFilename/include/otbExtendedFilenameToReaderOptions.h
diff --git a/Code/IO/otbExtendedFilenameToWriterOptions.h b/Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
similarity index 100%
rename from Code/IO/otbExtendedFilenameToWriterOptions.h
rename to Modules/IO/ExtendedFilename/include/otbExtendedFilenameToWriterOptions.h
diff --git a/Code/IO/otbExtendedFilenameHelper.cxx b/Modules/IO/ExtendedFilename/src/otbExtendedFilenameHelper.cxx
similarity index 100%
rename from Code/IO/otbExtendedFilenameHelper.cxx
rename to Modules/IO/ExtendedFilename/src/otbExtendedFilenameHelper.cxx
diff --git a/Code/IO/otbExtendedFilenameToReaderOptions.cxx b/Modules/IO/ExtendedFilename/src/otbExtendedFilenameToReaderOptions.cxx
similarity index 100%
rename from Code/IO/otbExtendedFilenameToReaderOptions.cxx
rename to Modules/IO/ExtendedFilename/src/otbExtendedFilenameToReaderOptions.cxx
diff --git a/Code/IO/otbExtendedFilenameToWriterOptions.cxx b/Modules/IO/ExtendedFilename/src/otbExtendedFilenameToWriterOptions.cxx
similarity index 100%
rename from Code/IO/otbExtendedFilenameToWriterOptions.cxx
rename to Modules/IO/ExtendedFilename/src/otbExtendedFilenameToWriterOptions.cxx
diff --git a/Testing/Code/IO/otbExtendedFilenameTest.cxx b/Modules/IO/ExtendedFilename/test/otbExtendedFilenameTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbExtendedFilenameTest.cxx
rename to Modules/IO/ExtendedFilename/test/otbExtendedFilenameTest.cxx
diff --git a/Testing/Code/IO/otbExtendedFilenameToReaderOptionsTest.cxx b/Modules/IO/ExtendedFilename/test/otbExtendedFilenameToReaderOptionsTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbExtendedFilenameToReaderOptionsTest.cxx
rename to Modules/IO/ExtendedFilename/test/otbExtendedFilenameToReaderOptionsTest.cxx
diff --git a/Testing/Code/IO/otbExtendedFilenameToWriterOptionsTest.cxx b/Modules/IO/ExtendedFilename/test/otbExtendedFilenameToWriterOptionsTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbExtendedFilenameToWriterOptionsTest.cxx
rename to Modules/IO/ExtendedFilename/test/otbExtendedFilenameToWriterOptionsTest.cxx
diff --git a/Code/IO/otbBSQImageIO.h b/Modules/IO/IOBSQ/include/otbBSQImageIO.h
similarity index 100%
rename from Code/IO/otbBSQImageIO.h
rename to Modules/IO/IOBSQ/include/otbBSQImageIO.h
diff --git a/Code/IO/otbBSQImageIOFactory.h b/Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h
similarity index 100%
rename from Code/IO/otbBSQImageIOFactory.h
rename to Modules/IO/IOBSQ/include/otbBSQImageIOFactory.h
diff --git a/Code/IO/otbBSQImageIO.cxx b/Modules/IO/IOBSQ/src/otbBSQImageIO.cxx
similarity index 100%
rename from Code/IO/otbBSQImageIO.cxx
rename to Modules/IO/IOBSQ/src/otbBSQImageIO.cxx
diff --git a/Code/IO/otbBSQImageIOFactory.cxx b/Modules/IO/IOBSQ/src/otbBSQImageIOFactory.cxx
similarity index 100%
rename from Code/IO/otbBSQImageIOFactory.cxx
rename to Modules/IO/IOBSQ/src/otbBSQImageIOFactory.cxx
diff --git a/Testing/Code/IO/otbBSQImageIOTestCanRead.cxx b/Modules/IO/IOBSQ/test/otbBSQImageIOTestCanRead.cxx
similarity index 100%
rename from Testing/Code/IO/otbBSQImageIOTestCanRead.cxx
rename to Modules/IO/IOBSQ/test/otbBSQImageIOTestCanRead.cxx
diff --git a/Testing/Code/IO/otbBSQImageIOTestCanWrite.cxx b/Modules/IO/IOBSQ/test/otbBSQImageIOTestCanWrite.cxx
similarity index 100%
rename from Testing/Code/IO/otbBSQImageIOTestCanWrite.cxx
rename to Modules/IO/IOBSQ/test/otbBSQImageIOTestCanWrite.cxx
diff --git a/Code/IO/otbGDALDriverManagerWrapper.h b/Modules/IO/IOGDAL/include/otbGDALDriverManagerWrapper.h
similarity index 100%
rename from Code/IO/otbGDALDriverManagerWrapper.h
rename to Modules/IO/IOGDAL/include/otbGDALDriverManagerWrapper.h
diff --git a/Code/IO/otbGDALImageIO.h b/Modules/IO/IOGDAL/include/otbGDALImageIO.h
similarity index 100%
rename from Code/IO/otbGDALImageIO.h
rename to Modules/IO/IOGDAL/include/otbGDALImageIO.h
diff --git a/Code/IO/otbGDALImageIOFactory.h b/Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h
similarity index 100%
rename from Code/IO/otbGDALImageIOFactory.h
rename to Modules/IO/IOGDAL/include/otbGDALImageIOFactory.h
diff --git a/Code/IO/otbOGRIOHelper.h b/Modules/IO/IOGDAL/include/otbOGRIOHelper.h
similarity index 100%
rename from Code/IO/otbOGRIOHelper.h
rename to Modules/IO/IOGDAL/include/otbOGRIOHelper.h
diff --git a/Code/IO/otbOGRVectorDataIO.h b/Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h
similarity index 100%
rename from Code/IO/otbOGRVectorDataIO.h
rename to Modules/IO/IOGDAL/include/otbOGRVectorDataIO.h
diff --git a/Code/IO/otbOGRVectorDataIOFactory.h b/Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h
similarity index 100%
rename from Code/IO/otbOGRVectorDataIOFactory.h
rename to Modules/IO/IOGDAL/include/otbOGRVectorDataIOFactory.h
diff --git a/Code/IO/otbGDALDriverManagerWrapper.cxx b/Modules/IO/IOGDAL/src/otbGDALDriverManagerWrapper.cxx
similarity index 100%
rename from Code/IO/otbGDALDriverManagerWrapper.cxx
rename to Modules/IO/IOGDAL/src/otbGDALDriverManagerWrapper.cxx
diff --git a/Code/IO/otbGDALImageIO.cxx b/Modules/IO/IOGDAL/src/otbGDALImageIO.cxx
similarity index 100%
rename from Code/IO/otbGDALImageIO.cxx
rename to Modules/IO/IOGDAL/src/otbGDALImageIO.cxx
diff --git a/Code/IO/otbGDALImageIOFactory.cxx b/Modules/IO/IOGDAL/src/otbGDALImageIOFactory.cxx
similarity index 100%
rename from Code/IO/otbGDALImageIOFactory.cxx
rename to Modules/IO/IOGDAL/src/otbGDALImageIOFactory.cxx
diff --git a/Code/IO/otbOGRIOHelper.cxx b/Modules/IO/IOGDAL/src/otbOGRIOHelper.cxx
similarity index 100%
rename from Code/IO/otbOGRIOHelper.cxx
rename to Modules/IO/IOGDAL/src/otbOGRIOHelper.cxx
diff --git a/Code/IO/otbOGRVectorDataIO.cxx b/Modules/IO/IOGDAL/src/otbOGRVectorDataIO.cxx
similarity index 100%
rename from Code/IO/otbOGRVectorDataIO.cxx
rename to Modules/IO/IOGDAL/src/otbOGRVectorDataIO.cxx
diff --git a/Code/IO/otbOGRVectorDataIOFactory.cxx b/Modules/IO/IOGDAL/src/otbOGRVectorDataIOFactory.cxx
similarity index 100%
rename from Code/IO/otbOGRVectorDataIOFactory.cxx
rename to Modules/IO/IOGDAL/src/otbOGRVectorDataIOFactory.cxx
diff --git a/Testing/Code/IO/otbGDALImageIOTest.cxx b/Modules/IO/IOGDAL/test/otbGDALImageIOTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbGDALImageIOTest.cxx
rename to Modules/IO/IOGDAL/test/otbGDALImageIOTest.cxx
diff --git a/Testing/Code/IO/otbGDALImageIOTestCanRead.cxx b/Modules/IO/IOGDAL/test/otbGDALImageIOTestCanRead.cxx
similarity index 100%
rename from Testing/Code/IO/otbGDALImageIOTestCanRead.cxx
rename to Modules/IO/IOGDAL/test/otbGDALImageIOTestCanRead.cxx
diff --git a/Testing/Code/IO/otbGDALImageIOTestCanWrite.cxx b/Modules/IO/IOGDAL/test/otbGDALImageIOTestCanWrite.cxx
similarity index 100%
rename from Testing/Code/IO/otbGDALImageIOTestCanWrite.cxx
rename to Modules/IO/IOGDAL/test/otbGDALImageIOTestCanWrite.cxx
diff --git a/Testing/Code/IO/otbGDALImageIOTestWriteMetadata.cxx b/Modules/IO/IOGDAL/test/otbGDALImageIOTestWriteMetadata.cxx
similarity index 100%
rename from Testing/Code/IO/otbGDALImageIOTestWriteMetadata.cxx
rename to Modules/IO/IOGDAL/test/otbGDALImageIOTestWriteMetadata.cxx
diff --git a/Testing/Code/IO/otbGDALOverviewsBuilder.cxx b/Modules/IO/IOGDAL/test/otbGDALOverviewsBuilder.cxx
similarity index 100%
rename from Testing/Code/IO/otbGDALOverviewsBuilder.cxx
rename to Modules/IO/IOGDAL/test/otbGDALOverviewsBuilder.cxx
diff --git a/Testing/Code/IO/otbGDALReadPxlComplex.cxx b/Modules/IO/IOGDAL/test/otbGDALReadPxlComplex.cxx
similarity index 100%
rename from Testing/Code/IO/otbGDALReadPxlComplex.cxx
rename to Modules/IO/IOGDAL/test/otbGDALReadPxlComplex.cxx
diff --git a/Testing/Code/IO/otbMultiDatasetReadingInfo.cxx b/Modules/IO/IOGDAL/test/otbMultiDatasetReadingInfo.cxx
similarity index 100%
rename from Testing/Code/IO/otbMultiDatasetReadingInfo.cxx
rename to Modules/IO/IOGDAL/test/otbMultiDatasetReadingInfo.cxx
diff --git a/Testing/Code/IO/otbOGRVectorDataIOCanRead.cxx b/Modules/IO/IOGDAL/test/otbOGRVectorDataIOCanRead.cxx
similarity index 100%
rename from Testing/Code/IO/otbOGRVectorDataIOCanRead.cxx
rename to Modules/IO/IOGDAL/test/otbOGRVectorDataIOCanRead.cxx
diff --git a/Testing/Code/IO/otbOGRVectorDataIOCanWrite.cxx b/Modules/IO/IOGDAL/test/otbOGRVectorDataIOCanWrite.cxx
similarity index 100%
rename from Testing/Code/IO/otbOGRVectorDataIOCanWrite.cxx
rename to Modules/IO/IOGDAL/test/otbOGRVectorDataIOCanWrite.cxx
diff --git a/Testing/Code/IO/otbOGRVectorDataIONew.cxx b/Modules/IO/IOGDAL/test/otbOGRVectorDataIONew.cxx
similarity index 100%
rename from Testing/Code/IO/otbOGRVectorDataIONew.cxx
rename to Modules/IO/IOGDAL/test/otbOGRVectorDataIONew.cxx
diff --git a/Code/IO/otbJPEG2000ImageIO.h b/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIO.h
similarity index 100%
rename from Code/IO/otbJPEG2000ImageIO.h
rename to Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIO.h
diff --git a/Code/IO/otbJPEG2000ImageIOFactory.h b/Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIOFactory.h
similarity index 100%
rename from Code/IO/otbJPEG2000ImageIOFactory.h
rename to Modules/IO/IOJPEG2000/include/otbJPEG2000ImageIOFactory.h
diff --git a/Code/IO/otbJPEG2000ImageIO.cxx b/Modules/IO/IOJPEG2000/src/otbJPEG2000ImageIO.cxx
similarity index 100%
rename from Code/IO/otbJPEG2000ImageIO.cxx
rename to Modules/IO/IOJPEG2000/src/otbJPEG2000ImageIO.cxx
diff --git a/Code/IO/otbJPEG2000ImageIOFactory.cxx b/Modules/IO/IOJPEG2000/src/otbJPEG2000ImageIOFactory.cxx
similarity index 100%
rename from Code/IO/otbJPEG2000ImageIOFactory.cxx
rename to Modules/IO/IOJPEG2000/src/otbJPEG2000ImageIOFactory.cxx
diff --git a/Testing/Code/IO/otbGenerateClassicalQLWithJPEG2000.cxx b/Modules/IO/IOJPEG2000/test/otbGenerateClassicalQLWithJPEG2000.cxx
similarity index 100%
rename from Testing/Code/IO/otbGenerateClassicalQLWithJPEG2000.cxx
rename to Modules/IO/IOJPEG2000/test/otbGenerateClassicalQLWithJPEG2000.cxx
diff --git a/Testing/Code/IO/otbJPEG2000ImageIOTestCanRead.cxx b/Modules/IO/IOJPEG2000/test/otbJPEG2000ImageIOTestCanRead.cxx
similarity index 100%
rename from Testing/Code/IO/otbJPEG2000ImageIOTestCanRead.cxx
rename to Modules/IO/IOJPEG2000/test/otbJPEG2000ImageIOTestCanRead.cxx
diff --git a/Testing/Code/IO/otbJPEG2000ImageIOTestCanWrite.cxx b/Modules/IO/IOJPEG2000/test/otbJPEG2000ImageIOTestCanWrite.cxx
similarity index 100%
rename from Testing/Code/IO/otbJPEG2000ImageIOTestCanWrite.cxx
rename to Modules/IO/IOJPEG2000/test/otbJPEG2000ImageIOTestCanWrite.cxx
diff --git a/Code/IO/otbKMLVectorDataIO.h b/Modules/IO/IOKML/include/otbKMLVectorDataIO.h
similarity index 100%
rename from Code/IO/otbKMLVectorDataIO.h
rename to Modules/IO/IOKML/include/otbKMLVectorDataIO.h
diff --git a/Code/IO/otbKMLVectorDataIOFactory.h b/Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h
similarity index 100%
rename from Code/IO/otbKMLVectorDataIOFactory.h
rename to Modules/IO/IOKML/include/otbKMLVectorDataIOFactory.h
diff --git a/Code/IO/otbKMLVectorDataIO.cxx b/Modules/IO/IOKML/src/otbKMLVectorDataIO.cxx
similarity index 100%
rename from Code/IO/otbKMLVectorDataIO.cxx
rename to Modules/IO/IOKML/src/otbKMLVectorDataIO.cxx
diff --git a/Code/IO/otbKMLVectorDataIOFactory.cxx b/Modules/IO/IOKML/src/otbKMLVectorDataIOFactory.cxx
similarity index 100%
rename from Code/IO/otbKMLVectorDataIOFactory.cxx
rename to Modules/IO/IOKML/src/otbKMLVectorDataIOFactory.cxx
diff --git a/Testing/Code/IO/otbKMLVectorDataIONew.cxx b/Modules/IO/IOKML/test/otbKMLVectorDataIONew.cxx
similarity index 100%
rename from Testing/Code/IO/otbKMLVectorDataIONew.cxx
rename to Modules/IO/IOKML/test/otbKMLVectorDataIONew.cxx
diff --git a/Testing/Code/IO/otbKMLVectorDataIOTestCanRead.cxx b/Modules/IO/IOKML/test/otbKMLVectorDataIOTestCanRead.cxx
similarity index 100%
rename from Testing/Code/IO/otbKMLVectorDataIOTestCanRead.cxx
rename to Modules/IO/IOKML/test/otbKMLVectorDataIOTestCanRead.cxx
diff --git a/Testing/Code/IO/otbKMLVectorDataIOTestCanWrite.cxx b/Modules/IO/IOKML/test/otbKMLVectorDataIOTestCanWrite.cxx
similarity index 100%
rename from Testing/Code/IO/otbKMLVectorDataIOTestCanWrite.cxx
rename to Modules/IO/IOKML/test/otbKMLVectorDataIOTestCanWrite.cxx
diff --git a/Testing/Code/IO/otbKMLVectorDataIOTestFileReader.cxx b/Modules/IO/IOKML/test/otbKMLVectorDataIOTestFileReader.cxx
similarity index 100%
rename from Testing/Code/IO/otbKMLVectorDataIOTestFileReader.cxx
rename to Modules/IO/IOKML/test/otbKMLVectorDataIOTestFileReader.cxx
diff --git a/Code/IO/otbLUMImageIO.h b/Modules/IO/IOLUM/include/otbLUMImageIO.h
similarity index 100%
rename from Code/IO/otbLUMImageIO.h
rename to Modules/IO/IOLUM/include/otbLUMImageIO.h
diff --git a/Code/IO/otbLUMImageIOFactory.h b/Modules/IO/IOLUM/include/otbLUMImageIOFactory.h
similarity index 100%
rename from Code/IO/otbLUMImageIOFactory.h
rename to Modules/IO/IOLUM/include/otbLUMImageIOFactory.h
diff --git a/Code/IO/otbLUMImageIO.cxx b/Modules/IO/IOLUM/src/otbLUMImageIO.cxx
similarity index 100%
rename from Code/IO/otbLUMImageIO.cxx
rename to Modules/IO/IOLUM/src/otbLUMImageIO.cxx
diff --git a/Code/IO/otbLUMImageIOFactory.cxx b/Modules/IO/IOLUM/src/otbLUMImageIOFactory.cxx
similarity index 100%
rename from Code/IO/otbLUMImageIOFactory.cxx
rename to Modules/IO/IOLUM/src/otbLUMImageIOFactory.cxx
diff --git a/Testing/Code/IO/otbLUMImageIOTestCanRead.cxx b/Modules/IO/IOLUM/test/otbLUMImageIOTestCanRead.cxx
similarity index 100%
rename from Testing/Code/IO/otbLUMImageIOTestCanRead.cxx
rename to Modules/IO/IOLUM/test/otbLUMImageIOTestCanRead.cxx
diff --git a/Testing/Code/IO/otbLUMImageIOTestCanWrite.cxx b/Modules/IO/IOLUM/test/otbLUMImageIOTestCanWrite.cxx
similarity index 100%
rename from Testing/Code/IO/otbLUMImageIOTestCanWrite.cxx
rename to Modules/IO/IOLUM/test/otbLUMImageIOTestCanWrite.cxx
diff --git a/Code/IO/otbMSTARImageIO.h b/Modules/IO/IOMSTAR/include/otbMSTARImageIO.h
similarity index 100%
rename from Code/IO/otbMSTARImageIO.h
rename to Modules/IO/IOMSTAR/include/otbMSTARImageIO.h
diff --git a/Code/IO/otbMSTARImageIOFactory.h b/Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h
similarity index 100%
rename from Code/IO/otbMSTARImageIOFactory.h
rename to Modules/IO/IOMSTAR/include/otbMSTARImageIOFactory.h
diff --git a/Code/IO/otbMSTARImageIO.cxx b/Modules/IO/IOMSTAR/src/otbMSTARImageIO.cxx
similarity index 100%
rename from Code/IO/otbMSTARImageIO.cxx
rename to Modules/IO/IOMSTAR/src/otbMSTARImageIO.cxx
diff --git a/Code/IO/otbMSTARImageIOFactory.cxx b/Modules/IO/IOMSTAR/src/otbMSTARImageIOFactory.cxx
similarity index 100%
rename from Code/IO/otbMSTARImageIOFactory.cxx
rename to Modules/IO/IOMSTAR/src/otbMSTARImageIOFactory.cxx
diff --git a/Testing/Code/IO/otbMSTARImageIOTestCanRead.cxx b/Modules/IO/IOMSTAR/test/otbMSTARImageIOTestCanRead.cxx
similarity index 100%
rename from Testing/Code/IO/otbMSTARImageIOTestCanRead.cxx
rename to Modules/IO/IOMSTAR/test/otbMSTARImageIOTestCanRead.cxx
diff --git a/Code/IO/otbMWImageIO.h b/Modules/IO/IOMW/include/otbMWImageIO.h
similarity index 100%
rename from Code/IO/otbMWImageIO.h
rename to Modules/IO/IOMW/include/otbMWImageIO.h
diff --git a/Code/IO/otbMWImageIOFactory.h b/Modules/IO/IOMW/include/otbMWImageIOFactory.h
similarity index 100%
rename from Code/IO/otbMWImageIOFactory.h
rename to Modules/IO/IOMW/include/otbMWImageIOFactory.h
diff --git a/Code/IO/otbMWImageIO.cxx b/Modules/IO/IOMW/src/otbMWImageIO.cxx
similarity index 100%
rename from Code/IO/otbMWImageIO.cxx
rename to Modules/IO/IOMW/src/otbMWImageIO.cxx
diff --git a/Code/IO/otbMWImageIOFactory.cxx b/Modules/IO/IOMW/src/otbMWImageIOFactory.cxx
similarity index 100%
rename from Code/IO/otbMWImageIOFactory.cxx
rename to Modules/IO/IOMW/src/otbMWImageIOFactory.cxx
diff --git a/Testing/Code/IO/otbMWImageIOTestCanRead.cxx b/Modules/IO/IOMW/test/otbMWImageIOTestCanRead.cxx
similarity index 100%
rename from Testing/Code/IO/otbMWImageIOTestCanRead.cxx
rename to Modules/IO/IOMW/test/otbMWImageIOTestCanRead.cxx
diff --git a/Testing/Code/IO/otbMWImageIOTestCanWrite.cxx b/Modules/IO/IOMW/test/otbMWImageIOTestCanWrite.cxx
similarity index 100%
rename from Testing/Code/IO/otbMWImageIOTestCanWrite.cxx
rename to Modules/IO/IOMW/test/otbMWImageIOTestCanWrite.cxx
diff --git a/Code/IO/otbONERAImageIO.h b/Modules/IO/IOONERA/include/otbONERAImageIO.h
similarity index 100%
rename from Code/IO/otbONERAImageIO.h
rename to Modules/IO/IOONERA/include/otbONERAImageIO.h
diff --git a/Code/IO/otbONERAImageIOFactory.h b/Modules/IO/IOONERA/include/otbONERAImageIOFactory.h
similarity index 100%
rename from Code/IO/otbONERAImageIOFactory.h
rename to Modules/IO/IOONERA/include/otbONERAImageIOFactory.h
diff --git a/Code/IO/otbONERAImageIO.cxx b/Modules/IO/IOONERA/src/otbONERAImageIO.cxx
similarity index 100%
rename from Code/IO/otbONERAImageIO.cxx
rename to Modules/IO/IOONERA/src/otbONERAImageIO.cxx
diff --git a/Code/IO/otbONERAImageIOFactory.cxx b/Modules/IO/IOONERA/src/otbONERAImageIOFactory.cxx
similarity index 100%
rename from Code/IO/otbONERAImageIOFactory.cxx
rename to Modules/IO/IOONERA/src/otbONERAImageIOFactory.cxx
diff --git a/Testing/Code/IO/otbONERAImageIOTestCanRead.cxx b/Modules/IO/IOONERA/test/otbONERAImageIOTestCanRead.cxx
similarity index 100%
rename from Testing/Code/IO/otbONERAImageIOTestCanRead.cxx
rename to Modules/IO/IOONERA/test/otbONERAImageIOTestCanRead.cxx
diff --git a/Code/IO/otbRADImageIO.h b/Modules/IO/IORAD/include/otbRADImageIO.h
similarity index 100%
rename from Code/IO/otbRADImageIO.h
rename to Modules/IO/IORAD/include/otbRADImageIO.h
diff --git a/Code/IO/otbRADImageIOFactory.h b/Modules/IO/IORAD/include/otbRADImageIOFactory.h
similarity index 100%
rename from Code/IO/otbRADImageIOFactory.h
rename to Modules/IO/IORAD/include/otbRADImageIOFactory.h
diff --git a/Code/IO/otbRADImageIO.cxx b/Modules/IO/IORAD/src/otbRADImageIO.cxx
similarity index 100%
rename from Code/IO/otbRADImageIO.cxx
rename to Modules/IO/IORAD/src/otbRADImageIO.cxx
diff --git a/Code/IO/otbRADImageIOFactory.cxx b/Modules/IO/IORAD/src/otbRADImageIOFactory.cxx
similarity index 100%
rename from Code/IO/otbRADImageIOFactory.cxx
rename to Modules/IO/IORAD/src/otbRADImageIOFactory.cxx
diff --git a/Testing/Code/IO/otbRADImageIOTestCanRead.cxx b/Modules/IO/IORAD/test/otbRADImageIOTestCanRead.cxx
similarity index 100%
rename from Testing/Code/IO/otbRADImageIOTestCanRead.cxx
rename to Modules/IO/IORAD/test/otbRADImageIOTestCanRead.cxx
diff --git a/Code/IO/otbTileMapImageIO.h b/Modules/IO/IOTileMap/include/otbTileMapImageIO.h
similarity index 100%
rename from Code/IO/otbTileMapImageIO.h
rename to Modules/IO/IOTileMap/include/otbTileMapImageIO.h
diff --git a/Code/IO/otbTileMapImageIOFactory.h b/Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h
similarity index 100%
rename from Code/IO/otbTileMapImageIOFactory.h
rename to Modules/IO/IOTileMap/include/otbTileMapImageIOFactory.h
diff --git a/Code/IO/otbTileMapImageIOHelper.h b/Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h
similarity index 100%
rename from Code/IO/otbTileMapImageIOHelper.h
rename to Modules/IO/IOTileMap/include/otbTileMapImageIOHelper.h
diff --git a/Code/IO/otbLogo.inc b/Modules/IO/IOTileMap/src/otbLogo.inc
similarity index 100%
rename from Code/IO/otbLogo.inc
rename to Modules/IO/IOTileMap/src/otbLogo.inc
diff --git a/Code/IO/otbTileMapImageIO.cxx b/Modules/IO/IOTileMap/src/otbTileMapImageIO.cxx
similarity index 100%
rename from Code/IO/otbTileMapImageIO.cxx
rename to Modules/IO/IOTileMap/src/otbTileMapImageIO.cxx
diff --git a/Code/IO/otbTileMapImageIOFactory.cxx b/Modules/IO/IOTileMap/src/otbTileMapImageIOFactory.cxx
similarity index 100%
rename from Code/IO/otbTileMapImageIOFactory.cxx
rename to Modules/IO/IOTileMap/src/otbTileMapImageIOFactory.cxx
diff --git a/Code/IO/otbTileMapImageIOHelper.cxx b/Modules/IO/IOTileMap/src/otbTileMapImageIOHelper.cxx
similarity index 100%
rename from Code/IO/otbTileMapImageIOHelper.cxx
rename to Modules/IO/IOTileMap/src/otbTileMapImageIOHelper.cxx
diff --git a/Testing/Code/IO/otbTileMapImageIOHelperTest.cxx b/Modules/IO/IOTileMap/test/otbTileMapImageIOHelperTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbTileMapImageIOHelperTest.cxx
rename to Modules/IO/IOTileMap/test/otbTileMapImageIOHelperTest.cxx
diff --git a/Testing/Code/IO/otbTileMapImageIOTest.cxx b/Modules/IO/IOTileMap/test/otbTileMapImageIOTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbTileMapImageIOTest.cxx
rename to Modules/IO/IOTileMap/test/otbTileMapImageIOTest.cxx
diff --git a/Testing/Code/IO/otbTileMapWriter.cxx b/Modules/IO/IOTileMap/test/otbTileMapWriter.cxx
similarity index 100%
rename from Testing/Code/IO/otbTileMapWriter.cxx
rename to Modules/IO/IOTileMap/test/otbTileMapWriter.cxx
diff --git a/Code/ObjectDetection/otbStatisticsXMLFileReader.h b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
similarity index 100%
rename from Code/ObjectDetection/otbStatisticsXMLFileReader.h
rename to Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
diff --git a/Code/ObjectDetection/otbStatisticsXMLFileReader.txx b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.txx
similarity index 100%
rename from Code/ObjectDetection/otbStatisticsXMLFileReader.txx
rename to Modules/IO/IOXML/include/otbStatisticsXMLFileReader.txx
diff --git a/Code/ObjectDetection/otbStatisticsXMLFileWriter.h b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
similarity index 100%
rename from Code/ObjectDetection/otbStatisticsXMLFileWriter.h
rename to Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
diff --git a/Code/ObjectDetection/otbStatisticsXMLFileWriter.txx b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.txx
similarity index 100%
rename from Code/ObjectDetection/otbStatisticsXMLFileWriter.txx
rename to Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.txx
diff --git a/Code/IO/otbImageFileReader.h b/Modules/IO/ImageIO/include/otbImageFileReader.h
similarity index 100%
rename from Code/IO/otbImageFileReader.h
rename to Modules/IO/ImageIO/include/otbImageFileReader.h
diff --git a/Code/IO/otbImageFileReader.txx b/Modules/IO/ImageIO/include/otbImageFileReader.txx
similarity index 100%
rename from Code/IO/otbImageFileReader.txx
rename to Modules/IO/ImageIO/include/otbImageFileReader.txx
diff --git a/Code/IO/otbImageFileWriter.h b/Modules/IO/ImageIO/include/otbImageFileWriter.h
similarity index 100%
rename from Code/IO/otbImageFileWriter.h
rename to Modules/IO/ImageIO/include/otbImageFileWriter.h
diff --git a/Code/IO/otbImageFileWriter.txx b/Modules/IO/ImageIO/include/otbImageFileWriter.txx
similarity index 100%
rename from Code/IO/otbImageFileWriter.txx
rename to Modules/IO/ImageIO/include/otbImageFileWriter.txx
diff --git a/Code/IO/otbImageIOFactory.h b/Modules/IO/ImageIO/include/otbImageIOFactory.h
similarity index 100%
rename from Code/IO/otbImageIOFactory.h
rename to Modules/IO/ImageIO/include/otbImageIOFactory.h
diff --git a/Code/IO/otbImageSeriesFileReader.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
similarity index 100%
rename from Code/IO/otbImageSeriesFileReader.h
rename to Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
diff --git a/Code/IO/otbImageSeriesFileReader.txx b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.txx
similarity index 100%
rename from Code/IO/otbImageSeriesFileReader.txx
rename to Modules/IO/ImageIO/include/otbImageSeriesFileReader.txx
diff --git a/Code/IO/otbImageSeriesFileReaderBase.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
similarity index 100%
rename from Code/IO/otbImageSeriesFileReaderBase.h
rename to Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
diff --git a/Code/IO/otbImageSeriesFileReaderBase.txx b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.txx
similarity index 100%
rename from Code/IO/otbImageSeriesFileReaderBase.txx
rename to Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.txx
diff --git a/Code/IO/otbScalarBufferToImageFileWriter.h b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
similarity index 100%
rename from Code/IO/otbScalarBufferToImageFileWriter.h
rename to Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
diff --git a/Code/IO/otbScalarBufferToImageFileWriter.txx b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.txx
similarity index 100%
rename from Code/IO/otbScalarBufferToImageFileWriter.txx
rename to Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.txx
diff --git a/Code/IO/otbStreamingImageFileWriter.h b/Modules/IO/ImageIO/include/otbStreamingImageFileWriter.h
similarity index 100%
rename from Code/IO/otbStreamingImageFileWriter.h
rename to Modules/IO/ImageIO/include/otbStreamingImageFileWriter.h
diff --git a/Code/IO/otbImageIOFactory.cxx b/Modules/IO/ImageIO/src/otbImageIOFactory.cxx
similarity index 100%
rename from Code/IO/otbImageIOFactory.cxx
rename to Modules/IO/ImageIO/src/otbImageIOFactory.cxx
diff --git a/Testing/Fa/0000437-WriteImageCentOS.cxx b/Modules/IO/ImageIO/test/0000437-WriteImageCentOS.cxx
similarity index 100%
rename from Testing/Fa/0000437-WriteImageCentOS.cxx
rename to Modules/IO/ImageIO/test/0000437-WriteImageCentOS.cxx
diff --git a/Testing/Fa/0000479-WriteInt8Image.cxx b/Modules/IO/ImageIO/test/0000479-WriteInt8Image.cxx
similarity index 100%
rename from Testing/Fa/0000479-WriteInt8Image.cxx
rename to Modules/IO/ImageIO/test/0000479-WriteInt8Image.cxx
diff --git a/Testing/Fa/0000495-StreamingImageFileWriterProgressReporting.cxx b/Modules/IO/ImageIO/test/0000495-StreamingImageFileWriterProgressReporting.cxx
similarity index 100%
rename from Testing/Fa/0000495-StreamingImageFileWriterProgressReporting.cxx
rename to Modules/IO/ImageIO/test/0000495-StreamingImageFileWriterProgressReporting.cxx
diff --git a/Testing/Fa/WriteUnsignedLong.cxx b/Modules/IO/ImageIO/test/WriteUnsignedLong.cxx
similarity index 100%
rename from Testing/Fa/WriteUnsignedLong.cxx
rename to Modules/IO/ImageIO/test/WriteUnsignedLong.cxx
diff --git a/Testing/Code/IO/otbCompareWritingComplexImage.cxx b/Modules/IO/ImageIO/test/otbCompareWritingComplexImage.cxx
similarity index 100%
rename from Testing/Code/IO/otbCompareWritingComplexImage.cxx
rename to Modules/IO/ImageIO/test/otbCompareWritingComplexImage.cxx
diff --git a/Testing/Code/IO/otbComplexImageManipulationTest.cxx b/Modules/IO/ImageIO/test/otbComplexImageManipulationTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbComplexImageManipulationTest.cxx
rename to Modules/IO/ImageIO/test/otbComplexImageManipulationTest.cxx
diff --git a/Testing/Code/IO/otbComplexImageTests.cxx b/Modules/IO/ImageIO/test/otbComplexImageTests.cxx
similarity index 100%
rename from Testing/Code/IO/otbComplexImageTests.cxx
rename to Modules/IO/ImageIO/test/otbComplexImageTests.cxx
diff --git a/Testing/Code/IO/otbDoubleImageIOTest.cxx b/Modules/IO/ImageIO/test/otbDoubleImageIOTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbDoubleImageIOTest.cxx
rename to Modules/IO/ImageIO/test/otbDoubleImageIOTest.cxx
diff --git a/Testing/Code/IO/otbFloatImageIOTest.cxx b/Modules/IO/ImageIO/test/otbFloatImageIOTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbFloatImageIOTest.cxx
rename to Modules/IO/ImageIO/test/otbFloatImageIOTest.cxx
diff --git a/Testing/Code/IO/otbGDALDriverDoubleWritingTest.cxx b/Modules/IO/ImageIO/test/otbGDALDriverDoubleWritingTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbGDALDriverDoubleWritingTest.cxx
rename to Modules/IO/ImageIO/test/otbGDALDriverDoubleWritingTest.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderMSTAR.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderMSTAR.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderMSTAR.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderMSTAR.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderONERA.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderONERA.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderONERA.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderONERA.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderONERAComplex.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderONERAComplex.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderONERAComplex.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderRADChar.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderRADChar.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderRADChar.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderRADChar.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderRADComplexDouble.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderRADComplexDouble.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderRADComplexFloat.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderRADComplexFloat.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderRADComplexFloatExtract.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderRADComplexFloatExtract.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderRADComplexInt.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderRADComplexInt.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderRADFloat.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderRADFloat.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderRADFloat.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderRADFloat.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderRADInt.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderRADInt.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderRADInt.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderRADInt.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderRGBTest.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderRGBTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderRGBTest.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderRGBTest.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderServerName.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderServerName.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderServerName.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderServerName.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderTest.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderTest.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderTest.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderTestFloat.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderTestFloat.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderTestFloat.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderTestFloat.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderTestSensorPixelValue.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderTestSensorPixelValue.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderTestSensorPixelValue.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderTestSensorPixelValue.cxx
diff --git a/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderWithComplexPixel.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx
rename to Modules/IO/ImageIO/test/otbImageFileReaderWithComplexPixel.cxx
diff --git a/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx b/Modules/IO/ImageIO/test/otbImageFileWriterONERAComplex.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileWriterONERAComplex.cxx
rename to Modules/IO/ImageIO/test/otbImageFileWriterONERAComplex.cxx
diff --git a/Testing/Code/IO/otbImageFileWriterRGBTest.cxx b/Modules/IO/ImageIO/test/otbImageFileWriterRGBTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileWriterRGBTest.cxx
rename to Modules/IO/ImageIO/test/otbImageFileWriterRGBTest.cxx
diff --git a/Testing/Code/IO/otbImageFileWriterStreamingONERAComplex.cxx b/Modules/IO/ImageIO/test/otbImageFileWriterStreamingONERAComplex.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileWriterStreamingONERAComplex.cxx
rename to Modules/IO/ImageIO/test/otbImageFileWriterStreamingONERAComplex.cxx
diff --git a/Testing/Code/IO/otbImageFileWriterTest.cxx b/Modules/IO/ImageIO/test/otbImageFileWriterTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileWriterTest.cxx
rename to Modules/IO/ImageIO/test/otbImageFileWriterTest.cxx
diff --git a/Testing/Code/IO/otbImageFileWriterTestWithoutInput.cxx b/Modules/IO/ImageIO/test/otbImageFileWriterTestWithoutInput.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileWriterTestWithoutInput.cxx
rename to Modules/IO/ImageIO/test/otbImageFileWriterTestWithoutInput.cxx
diff --git a/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx b/Modules/IO/ImageIO/test/otbImageFileWriterWithExtendedOptionBox.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx
rename to Modules/IO/ImageIO/test/otbImageFileWriterWithExtendedOptionBox.cxx
diff --git a/Testing/Code/IO/otbImageIOFactoryNew.cxx b/Modules/IO/ImageIO/test/otbImageIOFactoryNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageIOFactoryNew.cxx
rename to Modules/IO/ImageIO/test/otbImageIOFactoryNew.cxx
diff --git a/Testing/Code/IO/otbImageMetadataFileWriterTest.cxx b/Modules/IO/ImageIO/test/otbImageMetadataFileWriterTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageMetadataFileWriterTest.cxx
rename to Modules/IO/ImageIO/test/otbImageMetadataFileWriterTest.cxx
diff --git a/Testing/Code/IO/otbImageMetadataStreamingFileWriterTest.cxx b/Modules/IO/ImageIO/test/otbImageMetadataStreamingFileWriterTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageMetadataStreamingFileWriterTest.cxx
rename to Modules/IO/ImageIO/test/otbImageMetadataStreamingFileWriterTest.cxx
diff --git a/Testing/Code/IO/otbImageSeriesFileReader.cxx b/Modules/IO/ImageIO/test/otbImageSeriesFileReader.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageSeriesFileReader.cxx
rename to Modules/IO/ImageIO/test/otbImageSeriesFileReader.cxx
diff --git a/Testing/Code/IO/otbImageStreamingFileWriterTestWithoutInput.cxx b/Modules/IO/ImageIO/test/otbImageStreamingFileWriterTestWithoutInput.cxx
similarity index 100%
rename from Testing/Code/IO/otbImageStreamingFileWriterTestWithoutInput.cxx
rename to Modules/IO/ImageIO/test/otbImageStreamingFileWriterTestWithoutInput.cxx
diff --git a/Testing/Code/IO/otbIntImageIOTest.cxx b/Modules/IO/ImageIO/test/otbIntImageIOTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbIntImageIOTest.cxx
rename to Modules/IO/ImageIO/test/otbIntImageIOTest.cxx
diff --git a/Testing/Code/IO/otbMultiResolutionReadingInfo.cxx b/Modules/IO/ImageIO/test/otbMultiResolutionReadingInfo.cxx
similarity index 100%
rename from Testing/Code/IO/otbMultiResolutionReadingInfo.cxx
rename to Modules/IO/ImageIO/test/otbMultiResolutionReadingInfo.cxx
diff --git a/Testing/Code/IO/otbPNGIndexedNbBandsTest.cxx b/Modules/IO/ImageIO/test/otbPNGIndexedNbBandsTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbPNGIndexedNbBandsTest.cxx
rename to Modules/IO/ImageIO/test/otbPNGIndexedNbBandsTest.cxx
diff --git a/Testing/Code/IO/otbPipeline.cxx b/Modules/IO/ImageIO/test/otbPipeline.cxx
similarity index 100%
rename from Testing/Code/IO/otbPipeline.cxx
rename to Modules/IO/ImageIO/test/otbPipeline.cxx
diff --git a/Testing/Code/IO/otbPipelineMetadataHandlingTest.cxx b/Modules/IO/ImageIO/test/otbPipelineMetadataHandlingTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbPipelineMetadataHandlingTest.cxx
rename to Modules/IO/ImageIO/test/otbPipelineMetadataHandlingTest.cxx
diff --git a/Testing/Code/IO/otbPipelineMetadataHandlingWithUFFilterTest.cxx b/Modules/IO/ImageIO/test/otbPipelineMetadataHandlingWithUFFilterTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbPipelineMetadataHandlingWithUFFilterTest.cxx
rename to Modules/IO/ImageIO/test/otbPipelineMetadataHandlingWithUFFilterTest.cxx
diff --git a/Testing/Code/IO/otbReadingComplexDataIntoComplexImageTest.cxx b/Modules/IO/ImageIO/test/otbReadingComplexDataIntoComplexImageTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbReadingComplexDataIntoComplexImageTest.cxx
rename to Modules/IO/ImageIO/test/otbReadingComplexDataIntoComplexImageTest.cxx
diff --git a/Testing/Code/IO/otbScalarBufferToImageFileWriterNew.cxx b/Modules/IO/ImageIO/test/otbScalarBufferToImageFileWriterNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbScalarBufferToImageFileWriterNew.cxx
rename to Modules/IO/ImageIO/test/otbScalarBufferToImageFileWriterNew.cxx
diff --git a/Testing/Code/IO/otbScalarBufferToImageFileWriterTest.cxx b/Modules/IO/ImageIO/test/otbScalarBufferToImageFileWriterTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbScalarBufferToImageFileWriterTest.cxx
rename to Modules/IO/ImageIO/test/otbScalarBufferToImageFileWriterTest.cxx
diff --git a/Testing/Code/IO/otbShortImageIOTest.cxx b/Modules/IO/ImageIO/test/otbShortImageIOTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbShortImageIOTest.cxx
rename to Modules/IO/ImageIO/test/otbShortImageIOTest.cxx
diff --git a/Testing/Code/IO/otbShortRGBImageIOTest.cxx b/Modules/IO/ImageIO/test/otbShortRGBImageIOTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbShortRGBImageIOTest.cxx
rename to Modules/IO/ImageIO/test/otbShortRGBImageIOTest.cxx
diff --git a/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx b/Modules/IO/ImageIO/test/otbStreamingImageFileWriterTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbStreamingImageFileWriterTest.cxx
rename to Modules/IO/ImageIO/test/otbStreamingImageFileWriterTest.cxx
diff --git a/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx b/Modules/IO/ImageIO/test/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx
similarity index 100%
rename from Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx
rename to Modules/IO/ImageIO/test/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx
diff --git a/Testing/Code/IO/otbStreamingImageFileWriterWithFilterTest.cxx b/Modules/IO/ImageIO/test/otbStreamingImageFileWriterWithFilterTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbStreamingImageFileWriterWithFilterTest.cxx
rename to Modules/IO/ImageIO/test/otbStreamingImageFileWriterWithFilterTest.cxx
diff --git a/Testing/Code/IO/otbStreamingImageFilterTest.cxx b/Modules/IO/ImageIO/test/otbStreamingImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbStreamingImageFilterTest.cxx
rename to Modules/IO/ImageIO/test/otbStreamingImageFilterTest.cxx
diff --git a/Testing/Code/IO/otbStreamingShortImageFileWriterTest.cxx b/Modules/IO/ImageIO/test/otbStreamingShortImageFileWriterTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbStreamingShortImageFileWriterTest.cxx
rename to Modules/IO/ImageIO/test/otbStreamingShortImageFileWriterTest.cxx
diff --git a/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx b/Modules/IO/ImageIO/test/otbVectorImageFileReaderWriterTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx
rename to Modules/IO/ImageIO/test/otbVectorImageFileReaderWriterTest.cxx
diff --git a/Testing/Code/IO/otbVectorImageFileWriterTestWithoutInput.cxx b/Modules/IO/ImageIO/test/otbVectorImageFileWriterTestWithoutInput.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorImageFileWriterTestWithoutInput.cxx
rename to Modules/IO/ImageIO/test/otbVectorImageFileWriterTestWithoutInput.cxx
diff --git a/Testing/Code/IO/otbVectorImageStreamingFileWriterTestWithoutInput.cxx b/Modules/IO/ImageIO/test/otbVectorImageStreamingFileWriterTestWithoutInput.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorImageStreamingFileWriterTestWithoutInput.cxx
rename to Modules/IO/ImageIO/test/otbVectorImageStreamingFileWriterTestWithoutInput.cxx
diff --git a/Testing/Code/IO/otbWritingComplexDataWithComplexImageTest.cxx b/Modules/IO/ImageIO/test/otbWritingComplexDataWithComplexImageTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbWritingComplexDataWithComplexImageTest.cxx
rename to Modules/IO/ImageIO/test/otbWritingComplexDataWithComplexImageTest.cxx
diff --git a/Code/IO/otbKmzProductWriter.h b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
similarity index 100%
rename from Code/IO/otbKmzProductWriter.h
rename to Modules/IO/KMZWriter/include/otbKmzProductWriter.h
diff --git a/Code/IO/otbKmzProductWriter.txx b/Modules/IO/KMZWriter/include/otbKmzProductWriter.txx
similarity index 100%
rename from Code/IO/otbKmzProductWriter.txx
rename to Modules/IO/KMZWriter/include/otbKmzProductWriter.txx
diff --git a/Testing/Code/IO/otbKmzProductWriter.cxx b/Modules/IO/KMZWriter/test/otbKmzProductWriter.cxx
similarity index 100%
rename from Testing/Code/IO/otbKmzProductWriter.cxx
rename to Modules/IO/KMZWriter/test/otbKmzProductWriter.cxx
diff --git a/Code/Common/otbDifferenceImageFilter.h b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
similarity index 100%
rename from Code/Common/otbDifferenceImageFilter.h
rename to Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
diff --git a/Code/Common/otbDifferenceImageFilter.txx b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.txx
similarity index 100%
rename from Code/Common/otbDifferenceImageFilter.txx
rename to Modules/IO/TestKernel/include/otbDifferenceImageFilter.txx
diff --git a/Code/Testing/otbTestHelper.h b/Modules/IO/TestKernel/include/otbTestHelper.h
similarity index 100%
rename from Code/Testing/otbTestHelper.h
rename to Modules/IO/TestKernel/include/otbTestHelper.h
diff --git a/Code/Testing/otbTestMain.h b/Modules/IO/TestKernel/include/otbTestMain.h
similarity index 100%
rename from Code/Testing/otbTestMain.h
rename to Modules/IO/TestKernel/include/otbTestMain.h
diff --git a/Code/Testing/otbTestDriver.cxx b/Modules/IO/TestKernel/src/otbTestDriver.cxx
similarity index 100%
rename from Code/Testing/otbTestDriver.cxx
rename to Modules/IO/TestKernel/src/otbTestDriver.cxx
diff --git a/Code/Testing/otbTestHelper.cxx b/Modules/IO/TestKernel/src/otbTestHelper.cxx
similarity index 100%
rename from Code/Testing/otbTestHelper.cxx
rename to Modules/IO/TestKernel/src/otbTestHelper.cxx
diff --git a/Code/IO/otbVectorDataFileReader.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
similarity index 100%
rename from Code/IO/otbVectorDataFileReader.h
rename to Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
diff --git a/Code/IO/otbVectorDataFileReader.txx b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.txx
similarity index 100%
rename from Code/IO/otbVectorDataFileReader.txx
rename to Modules/IO/VectorDataIO/include/otbVectorDataFileReader.txx
diff --git a/Code/IO/otbVectorDataFileWriter.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
similarity index 100%
rename from Code/IO/otbVectorDataFileWriter.h
rename to Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
diff --git a/Code/IO/otbVectorDataFileWriter.txx b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.txx
similarity index 100%
rename from Code/IO/otbVectorDataFileWriter.txx
rename to Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.txx
diff --git a/Code/IO/otbVectorDataIOFactory.h b/Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h
similarity index 100%
rename from Code/IO/otbVectorDataIOFactory.h
rename to Modules/IO/VectorDataIO/include/otbVectorDataIOFactory.h
diff --git a/Code/IO/otbVectorDataIOFactory.cxx b/Modules/IO/VectorDataIO/src/otbVectorDataIOFactory.cxx
similarity index 100%
rename from Code/IO/otbVectorDataIOFactory.cxx
rename to Modules/IO/VectorDataIO/src/otbVectorDataIOFactory.cxx
diff --git a/Testing/Code/IO/otbVectorDataFileGeoReaderWriter.cxx b/Modules/IO/VectorDataIO/test/otbVectorDataFileGeoReaderWriter.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorDataFileGeoReaderWriter.cxx
rename to Modules/IO/VectorDataIO/test/otbVectorDataFileGeoReaderWriter.cxx
diff --git a/Testing/Code/IO/otbVectorDataFileReader.cxx b/Modules/IO/VectorDataIO/test/otbVectorDataFileReader.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorDataFileReader.cxx
rename to Modules/IO/VectorDataIO/test/otbVectorDataFileReader.cxx
diff --git a/Testing/Code/IO/otbVectorDataFileReaderNew.cxx b/Modules/IO/VectorDataIO/test/otbVectorDataFileReaderNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorDataFileReaderNew.cxx
rename to Modules/IO/VectorDataIO/test/otbVectorDataFileReaderNew.cxx
diff --git a/Testing/Code/IO/otbVectorDataFileReaderWriter.cxx b/Modules/IO/VectorDataIO/test/otbVectorDataFileReaderWriter.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorDataFileReaderWriter.cxx
rename to Modules/IO/VectorDataIO/test/otbVectorDataFileReaderWriter.cxx
diff --git a/Testing/Code/IO/otbVectorDataFileWriter.cxx b/Modules/IO/VectorDataIO/test/otbVectorDataFileWriter.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorDataFileWriter.cxx
rename to Modules/IO/VectorDataIO/test/otbVectorDataFileWriter.cxx
diff --git a/Testing/Code/IO/otbVectorDataFileWriterMultiPolygons.cxx b/Modules/IO/VectorDataIO/test/otbVectorDataFileWriterMultiPolygons.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorDataFileWriterMultiPolygons.cxx
rename to Modules/IO/VectorDataIO/test/otbVectorDataFileWriterMultiPolygons.cxx
diff --git a/Testing/Code/IO/otbVectorDataFileWriterNew.cxx b/Modules/IO/VectorDataIO/test/otbVectorDataFileWriterNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorDataFileWriterNew.cxx
rename to Modules/IO/VectorDataIO/test/otbVectorDataFileWriterNew.cxx
diff --git a/Testing/Code/IO/otbVectorDataFileWriterPolygons.cxx b/Modules/IO/VectorDataIO/test/otbVectorDataFileWriterPolygons.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorDataFileWriterPolygons.cxx
rename to Modules/IO/VectorDataIO/test/otbVectorDataFileWriterPolygons.cxx
diff --git a/Testing/Code/IO/otbVectorDataIOFactory.cxx b/Modules/IO/VectorDataIO/test/otbVectorDataIOFactory.cxx
similarity index 100%
rename from Testing/Code/IO/otbVectorDataIOFactory.cxx
rename to Modules/IO/VectorDataIO/test/otbVectorDataIOFactory.cxx
diff --git a/Code/Fuzzy/otbConfusionMatrixToMassOfBelief.h b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
similarity index 100%
rename from Code/Fuzzy/otbConfusionMatrixToMassOfBelief.h
rename to Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
diff --git a/Code/Fuzzy/otbConfusionMatrixToMassOfBelief.txx b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.txx
similarity index 100%
rename from Code/Fuzzy/otbConfusionMatrixToMassOfBelief.txx
rename to Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.txx
diff --git a/Code/Fuzzy/otbDSFusionOfClassifiersImageFilter.h b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
similarity index 100%
rename from Code/Fuzzy/otbDSFusionOfClassifiersImageFilter.h
rename to Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
diff --git a/Code/Fuzzy/otbDSFusionOfClassifiersImageFilter.txx b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.txx
similarity index 100%
rename from Code/Fuzzy/otbDSFusionOfClassifiersImageFilter.txx
rename to Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.txx
diff --git a/Code/Fuzzy/otbJointMassOfBeliefFilter.h b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
similarity index 100%
rename from Code/Fuzzy/otbJointMassOfBeliefFilter.h
rename to Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
diff --git a/Code/Fuzzy/otbJointMassOfBeliefFilter.txx b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.txx
similarity index 100%
rename from Code/Fuzzy/otbJointMassOfBeliefFilter.txx
rename to Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.txx
diff --git a/Code/Fuzzy/otbMassOfBelief.h b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
similarity index 100%
rename from Code/Fuzzy/otbMassOfBelief.h
rename to Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
diff --git a/Code/Fuzzy/otbMassOfBelief.txx b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.txx
similarity index 100%
rename from Code/Fuzzy/otbMassOfBelief.txx
rename to Modules/Learning/DempsterShafer/include/otbMassOfBelief.txx
diff --git a/Code/Fuzzy/otbStandardDSCostFunction.h b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
similarity index 100%
rename from Code/Fuzzy/otbStandardDSCostFunction.h
rename to Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
diff --git a/Code/Fuzzy/otbStandardDSCostFunction.txx b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.txx
similarity index 100%
rename from Code/Fuzzy/otbStandardDSCostFunction.txx
rename to Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.txx
diff --git a/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.h b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
similarity index 100%
rename from Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.h
rename to Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
diff --git a/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.txx b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.txx
similarity index 100%
rename from Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.txx
rename to Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.txx
diff --git a/Testing/Code/Fuzzy/otbConfusionMatrixToMassOfBeliefTest.cxx b/Modules/Learning/DempsterShafer/test/otbConfusionMatrixToMassOfBeliefTest.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbConfusionMatrixToMassOfBeliefTest.cxx
rename to Modules/Learning/DempsterShafer/test/otbConfusionMatrixToMassOfBeliefTest.cxx
diff --git a/Testing/Code/Fuzzy/otbDSFusionOfClassifiersImageFilterTest.cxx b/Modules/Learning/DempsterShafer/test/otbDSFusionOfClassifiersImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbDSFusionOfClassifiersImageFilterTest.cxx
rename to Modules/Learning/DempsterShafer/test/otbDSFusionOfClassifiersImageFilterTest.cxx
diff --git a/Testing/Code/Fuzzy/otbDempsterShaferFusionTests.cxx b/Modules/Learning/DempsterShafer/test/otbDempsterShaferFusionTests.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbDempsterShaferFusionTests.cxx
rename to Modules/Learning/DempsterShafer/test/otbDempsterShaferFusionTests.cxx
diff --git a/Testing/Code/Fuzzy/otbJointMassOfBeliefFilter.cxx b/Modules/Learning/DempsterShafer/test/otbJointMassOfBeliefFilter.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbJointMassOfBeliefFilter.cxx
rename to Modules/Learning/DempsterShafer/test/otbJointMassOfBeliefFilter.cxx
diff --git a/Testing/Code/Fuzzy/otbMassOfBelief.cxx b/Modules/Learning/DempsterShafer/test/otbMassOfBelief.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbMassOfBelief.cxx
rename to Modules/Learning/DempsterShafer/test/otbMassOfBelief.cxx
diff --git a/Testing/Code/Fuzzy/otbMassOfBeliefDSApplied.cxx b/Modules/Learning/DempsterShafer/test/otbMassOfBeliefDSApplied.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbMassOfBeliefDSApplied.cxx
rename to Modules/Learning/DempsterShafer/test/otbMassOfBeliefDSApplied.cxx
diff --git a/Testing/Code/Fuzzy/otbStandardDSCostFunction.cxx b/Modules/Learning/DempsterShafer/test/otbStandardDSCostFunction.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbStandardDSCostFunction.cxx
rename to Modules/Learning/DempsterShafer/test/otbStandardDSCostFunction.cxx
diff --git a/Testing/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.cxx b/Modules/Learning/DempsterShafer/test/otbVectorDataToDSValidatedVectorDataFilter.cxx
similarity index 100%
rename from Testing/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.cxx
rename to Modules/Learning/DempsterShafer/test/otbVectorDataToDSValidatedVectorDataFilter.cxx
diff --git a/Code/Learning/otbConfusionMatrixCalculator.h b/Modules/Learning/LearningBase/include/otbConfusionMatrixCalculator.h
similarity index 100%
rename from Code/Learning/otbConfusionMatrixCalculator.h
rename to Modules/Learning/LearningBase/include/otbConfusionMatrixCalculator.h
diff --git a/Code/Learning/otbConfusionMatrixCalculator.txx b/Modules/Learning/LearningBase/include/otbConfusionMatrixCalculator.txx
similarity index 100%
rename from Code/Learning/otbConfusionMatrixCalculator.txx
rename to Modules/Learning/LearningBase/include/otbConfusionMatrixCalculator.txx
diff --git a/Code/Learning/otbConfusionMatrixMeasurements.h b/Modules/Learning/LearningBase/include/otbConfusionMatrixMeasurements.h
similarity index 100%
rename from Code/Learning/otbConfusionMatrixMeasurements.h
rename to Modules/Learning/LearningBase/include/otbConfusionMatrixMeasurements.h
diff --git a/Code/Learning/otbConfusionMatrixMeasurements.txx b/Modules/Learning/LearningBase/include/otbConfusionMatrixMeasurements.txx
similarity index 100%
rename from Code/Learning/otbConfusionMatrixMeasurements.txx
rename to Modules/Learning/LearningBase/include/otbConfusionMatrixMeasurements.txx
diff --git a/Code/Learning/otbDecisionTree.h b/Modules/Learning/LearningBase/include/otbDecisionTree.h
similarity index 100%
rename from Code/Learning/otbDecisionTree.h
rename to Modules/Learning/LearningBase/include/otbDecisionTree.h
diff --git a/Code/Learning/otbDecisionTree.txx b/Modules/Learning/LearningBase/include/otbDecisionTree.txx
similarity index 100%
rename from Code/Learning/otbDecisionTree.txx
rename to Modules/Learning/LearningBase/include/otbDecisionTree.txx
diff --git a/Code/Learning/otbGaussianModelComponent.h b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
similarity index 100%
rename from Code/Learning/otbGaussianModelComponent.h
rename to Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
diff --git a/Code/Learning/otbGaussianModelComponent.txx b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.txx
similarity index 100%
rename from Code/Learning/otbGaussianModelComponent.txx
rename to Modules/Learning/LearningBase/include/otbGaussianModelComponent.txx
diff --git a/Code/Learning/otbImageClassificationFilter.h b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
similarity index 100%
rename from Code/Learning/otbImageClassificationFilter.h
rename to Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
diff --git a/Code/Learning/otbImageClassificationFilter.txx b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.txx
similarity index 100%
rename from Code/Learning/otbImageClassificationFilter.txx
rename to Modules/Learning/LearningBase/include/otbImageClassificationFilter.txx
diff --git a/Code/Learning/otbKMeansImageClassificationFilter.h b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
similarity index 100%
rename from Code/Learning/otbKMeansImageClassificationFilter.h
rename to Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
diff --git a/Code/Learning/otbKMeansImageClassificationFilter.txx b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.txx
similarity index 100%
rename from Code/Learning/otbKMeansImageClassificationFilter.txx
rename to Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.txx
diff --git a/Code/Learning/otbMachineLearningModelFactory.h b/Modules/Learning/LearningBase/include/otbMachineLearningModelFactory.h
similarity index 100%
rename from Code/Learning/otbMachineLearningModelFactory.h
rename to Modules/Learning/LearningBase/include/otbMachineLearningModelFactory.h
diff --git a/Code/Learning/otbMachineLearningModelFactory.txx b/Modules/Learning/LearningBase/include/otbMachineLearningModelFactory.txx
similarity index 100%
rename from Code/Learning/otbMachineLearningModelFactory.txx
rename to Modules/Learning/LearningBase/include/otbMachineLearningModelFactory.txx
diff --git a/Code/Learning/otbMachineLearningModelFactoryBase.h b/Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h
similarity index 100%
rename from Code/Learning/otbMachineLearningModelFactoryBase.h
rename to Modules/Learning/LearningBase/include/otbMachineLearningModelFactoryBase.h
diff --git a/Code/Learning/otbSEMClassifier.h b/Modules/Learning/LearningBase/include/otbSEMClassifier.h
similarity index 100%
rename from Code/Learning/otbSEMClassifier.h
rename to Modules/Learning/LearningBase/include/otbSEMClassifier.h
diff --git a/Code/Learning/otbSEMClassifier.txx b/Modules/Learning/LearningBase/include/otbSEMClassifier.txx
similarity index 100%
rename from Code/Learning/otbSEMClassifier.txx
rename to Modules/Learning/LearningBase/include/otbSEMClassifier.txx
diff --git a/Code/Learning/otbMachineLearningModelFactoryBase.cxx b/Modules/Learning/LearningBase/src/otbMachineLearningModelFactoryBase.cxx
similarity index 100%
rename from Code/Learning/otbMachineLearningModelFactoryBase.cxx
rename to Modules/Learning/LearningBase/src/otbMachineLearningModelFactoryBase.cxx
diff --git a/Testing/Fa/0000209-SVMValidationLinearlySeparableProbEstimation.cxx b/Modules/Learning/LearningBase/test/0000209-SVMValidationLinearlySeparableProbEstimation.cxx
similarity index 100%
rename from Testing/Fa/0000209-SVMValidationLinearlySeparableProbEstimation.cxx
rename to Modules/Learning/LearningBase/test/0000209-SVMValidationLinearlySeparableProbEstimation.cxx
diff --git a/Testing/Code/Learning/otbConfusionMatrixCalculatorTest.cxx b/Modules/Learning/LearningBase/test/otbConfusionMatrixCalculatorTest.cxx
similarity index 100%
rename from Testing/Code/Learning/otbConfusionMatrixCalculatorTest.cxx
rename to Modules/Learning/LearningBase/test/otbConfusionMatrixCalculatorTest.cxx
diff --git a/Testing/Code/Learning/otbConfusionMatrixMeasurementsTest.cxx b/Modules/Learning/LearningBase/test/otbConfusionMatrixMeasurementsTest.cxx
similarity index 100%
rename from Testing/Code/Learning/otbConfusionMatrixMeasurementsTest.cxx
rename to Modules/Learning/LearningBase/test/otbConfusionMatrixMeasurementsTest.cxx
diff --git a/Testing/Code/Learning/otbDecisionTreeBuild.cxx b/Modules/Learning/LearningBase/test/otbDecisionTreeBuild.cxx
similarity index 100%
rename from Testing/Code/Learning/otbDecisionTreeBuild.cxx
rename to Modules/Learning/LearningBase/test/otbDecisionTreeBuild.cxx
diff --git a/Testing/Code/Learning/otbDecisionTreeNew.cxx b/Modules/Learning/LearningBase/test/otbDecisionTreeNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbDecisionTreeNew.cxx
rename to Modules/Learning/LearningBase/test/otbDecisionTreeNew.cxx
diff --git a/Testing/Code/Learning/otbDecisionTreeWithRealValues.cxx b/Modules/Learning/LearningBase/test/otbDecisionTreeWithRealValues.cxx
similarity index 100%
rename from Testing/Code/Learning/otbDecisionTreeWithRealValues.cxx
rename to Modules/Learning/LearningBase/test/otbDecisionTreeWithRealValues.cxx
diff --git a/Testing/Code/Learning/otbGaussianModelComponent.cxx b/Modules/Learning/LearningBase/test/otbGaussianModelComponent.cxx
similarity index 100%
rename from Testing/Code/Learning/otbGaussianModelComponent.cxx
rename to Modules/Learning/LearningBase/test/otbGaussianModelComponent.cxx
diff --git a/Testing/Code/Learning/otbImageClassificationFilter.cxx b/Modules/Learning/LearningBase/test/otbImageClassificationFilter.cxx
similarity index 100%
rename from Testing/Code/Learning/otbImageClassificationFilter.cxx
rename to Modules/Learning/LearningBase/test/otbImageClassificationFilter.cxx
diff --git a/Testing/Code/Learning/otbKMeansImageClassificationFilter.cxx b/Modules/Learning/LearningBase/test/otbKMeansImageClassificationFilter.cxx
similarity index 100%
rename from Testing/Code/Learning/otbKMeansImageClassificationFilter.cxx
rename to Modules/Learning/LearningBase/test/otbKMeansImageClassificationFilter.cxx
diff --git a/Testing/Code/Learning/otbKMeansImageClassificationFilterNew.cxx b/Modules/Learning/LearningBase/test/otbKMeansImageClassificationFilterNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbKMeansImageClassificationFilterNew.cxx
rename to Modules/Learning/LearningBase/test/otbKMeansImageClassificationFilterNew.cxx
diff --git a/Testing/Code/Learning/otbSEMClassifierNew.cxx b/Modules/Learning/LearningBase/test/otbSEMClassifierNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSEMClassifierNew.cxx
rename to Modules/Learning/LearningBase/test/otbSEMClassifierNew.cxx
diff --git a/Testing/Code/Learning/otbTrainMachineLearningModel.cxx b/Modules/Learning/LearningBase/test/otbTrainMachineLearningModel.cxx
similarity index 100%
rename from Testing/Code/Learning/otbTrainMachineLearningModel.cxx
rename to Modules/Learning/LearningBase/test/otbTrainMachineLearningModel.cxx
diff --git a/Code/Markov/otbMRFEnergy.h b/Modules/Learning/Markov/include/otbMRFEnergy.h
similarity index 100%
rename from Code/Markov/otbMRFEnergy.h
rename to Modules/Learning/Markov/include/otbMRFEnergy.h
diff --git a/Code/Markov/otbMRFEnergyEdgeFidelity.h b/Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
similarity index 100%
rename from Code/Markov/otbMRFEnergyEdgeFidelity.h
rename to Modules/Learning/Markov/include/otbMRFEnergyEdgeFidelity.h
diff --git a/Code/Markov/otbMRFEnergyFisherClassification.h b/Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h
similarity index 100%
rename from Code/Markov/otbMRFEnergyFisherClassification.h
rename to Modules/Learning/Markov/include/otbMRFEnergyFisherClassification.h
diff --git a/Code/Markov/otbMRFEnergyGaussian.h b/Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
similarity index 100%
rename from Code/Markov/otbMRFEnergyGaussian.h
rename to Modules/Learning/Markov/include/otbMRFEnergyGaussian.h
diff --git a/Code/Markov/otbMRFEnergyGaussianClassification.h b/Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
similarity index 100%
rename from Code/Markov/otbMRFEnergyGaussianClassification.h
rename to Modules/Learning/Markov/include/otbMRFEnergyGaussianClassification.h
diff --git a/Code/Markov/otbMRFEnergyPotts.h b/Modules/Learning/Markov/include/otbMRFEnergyPotts.h
similarity index 100%
rename from Code/Markov/otbMRFEnergyPotts.h
rename to Modules/Learning/Markov/include/otbMRFEnergyPotts.h
diff --git a/Code/Markov/otbMRFOptimizer.h b/Modules/Learning/Markov/include/otbMRFOptimizer.h
similarity index 100%
rename from Code/Markov/otbMRFOptimizer.h
rename to Modules/Learning/Markov/include/otbMRFOptimizer.h
diff --git a/Code/Markov/otbMRFOptimizerICM.h b/Modules/Learning/Markov/include/otbMRFOptimizerICM.h
similarity index 100%
rename from Code/Markov/otbMRFOptimizerICM.h
rename to Modules/Learning/Markov/include/otbMRFOptimizerICM.h
diff --git a/Code/Markov/otbMRFOptimizerMetropolis.h b/Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h
similarity index 100%
rename from Code/Markov/otbMRFOptimizerMetropolis.h
rename to Modules/Learning/Markov/include/otbMRFOptimizerMetropolis.h
diff --git a/Code/Markov/otbMRFSampler.h b/Modules/Learning/Markov/include/otbMRFSampler.h
similarity index 100%
rename from Code/Markov/otbMRFSampler.h
rename to Modules/Learning/Markov/include/otbMRFSampler.h
diff --git a/Code/Markov/otbMRFSamplerMAP.h b/Modules/Learning/Markov/include/otbMRFSamplerMAP.h
similarity index 100%
rename from Code/Markov/otbMRFSamplerMAP.h
rename to Modules/Learning/Markov/include/otbMRFSamplerMAP.h
diff --git a/Code/Markov/otbMRFSamplerRandom.h b/Modules/Learning/Markov/include/otbMRFSamplerRandom.h
similarity index 100%
rename from Code/Markov/otbMRFSamplerRandom.h
rename to Modules/Learning/Markov/include/otbMRFSamplerRandom.h
diff --git a/Code/Markov/otbMRFSamplerRandomMAP.h b/Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h
similarity index 100%
rename from Code/Markov/otbMRFSamplerRandomMAP.h
rename to Modules/Learning/Markov/include/otbMRFSamplerRandomMAP.h
diff --git a/Code/Markov/otbMarkovRandomFieldFilter.h b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
similarity index 100%
rename from Code/Markov/otbMarkovRandomFieldFilter.h
rename to Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
diff --git a/Code/Markov/otbMarkovRandomFieldFilter.txx b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.txx
similarity index 100%
rename from Code/Markov/otbMarkovRandomFieldFilter.txx
rename to Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.txx
diff --git a/Testing/Code/Markov/otbMRFEnergyEdgeFidelity.cxx b/Modules/Learning/Markov/test/otbMRFEnergyEdgeFidelity.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFEnergyEdgeFidelity.cxx
rename to Modules/Learning/Markov/test/otbMRFEnergyEdgeFidelity.cxx
diff --git a/Testing/Code/Markov/otbMRFEnergyEdgeFidelityNew.cxx b/Modules/Learning/Markov/test/otbMRFEnergyEdgeFidelityNew.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFEnergyEdgeFidelityNew.cxx
rename to Modules/Learning/Markov/test/otbMRFEnergyEdgeFidelityNew.cxx
diff --git a/Testing/Code/Markov/otbMRFEnergyFisherClassification.cxx b/Modules/Learning/Markov/test/otbMRFEnergyFisherClassification.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFEnergyFisherClassification.cxx
rename to Modules/Learning/Markov/test/otbMRFEnergyFisherClassification.cxx
diff --git a/Testing/Code/Markov/otbMRFEnergyGaussian.cxx b/Modules/Learning/Markov/test/otbMRFEnergyGaussian.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFEnergyGaussian.cxx
rename to Modules/Learning/Markov/test/otbMRFEnergyGaussian.cxx
diff --git a/Testing/Code/Markov/otbMRFEnergyGaussianClassification.cxx b/Modules/Learning/Markov/test/otbMRFEnergyGaussianClassification.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFEnergyGaussianClassification.cxx
rename to Modules/Learning/Markov/test/otbMRFEnergyGaussianClassification.cxx
diff --git a/Testing/Code/Markov/otbMRFEnergyGaussianClassificationNew.cxx b/Modules/Learning/Markov/test/otbMRFEnergyGaussianClassificationNew.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFEnergyGaussianClassificationNew.cxx
rename to Modules/Learning/Markov/test/otbMRFEnergyGaussianClassificationNew.cxx
diff --git a/Testing/Code/Markov/otbMRFEnergyGaussianNew.cxx b/Modules/Learning/Markov/test/otbMRFEnergyGaussianNew.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFEnergyGaussianNew.cxx
rename to Modules/Learning/Markov/test/otbMRFEnergyGaussianNew.cxx
diff --git a/Testing/Code/Markov/otbMRFEnergyPotts.cxx b/Modules/Learning/Markov/test/otbMRFEnergyPotts.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFEnergyPotts.cxx
rename to Modules/Learning/Markov/test/otbMRFEnergyPotts.cxx
diff --git a/Testing/Code/Markov/otbMRFEnergyPottsNew.cxx b/Modules/Learning/Markov/test/otbMRFEnergyPottsNew.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFEnergyPottsNew.cxx
rename to Modules/Learning/Markov/test/otbMRFEnergyPottsNew.cxx
diff --git a/Testing/Code/Markov/otbMRFOptimizerICM.cxx b/Modules/Learning/Markov/test/otbMRFOptimizerICM.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFOptimizerICM.cxx
rename to Modules/Learning/Markov/test/otbMRFOptimizerICM.cxx
diff --git a/Testing/Code/Markov/otbMRFOptimizerICMNew.cxx b/Modules/Learning/Markov/test/otbMRFOptimizerICMNew.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFOptimizerICMNew.cxx
rename to Modules/Learning/Markov/test/otbMRFOptimizerICMNew.cxx
diff --git a/Testing/Code/Markov/otbMRFOptimizerMetropolis.cxx b/Modules/Learning/Markov/test/otbMRFOptimizerMetropolis.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFOptimizerMetropolis.cxx
rename to Modules/Learning/Markov/test/otbMRFOptimizerMetropolis.cxx
diff --git a/Testing/Code/Markov/otbMRFOptimizerMetropolisNew.cxx b/Modules/Learning/Markov/test/otbMRFOptimizerMetropolisNew.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFOptimizerMetropolisNew.cxx
rename to Modules/Learning/Markov/test/otbMRFOptimizerMetropolisNew.cxx
diff --git a/Testing/Code/Markov/otbMRFSamplerMAP.cxx b/Modules/Learning/Markov/test/otbMRFSamplerMAP.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFSamplerMAP.cxx
rename to Modules/Learning/Markov/test/otbMRFSamplerMAP.cxx
diff --git a/Testing/Code/Markov/otbMRFSamplerMAPNew.cxx b/Modules/Learning/Markov/test/otbMRFSamplerMAPNew.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFSamplerMAPNew.cxx
rename to Modules/Learning/Markov/test/otbMRFSamplerMAPNew.cxx
diff --git a/Testing/Code/Markov/otbMRFSamplerRandom.cxx b/Modules/Learning/Markov/test/otbMRFSamplerRandom.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFSamplerRandom.cxx
rename to Modules/Learning/Markov/test/otbMRFSamplerRandom.cxx
diff --git a/Testing/Code/Markov/otbMRFSamplerRandomMAP.cxx b/Modules/Learning/Markov/test/otbMRFSamplerRandomMAP.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFSamplerRandomMAP.cxx
rename to Modules/Learning/Markov/test/otbMRFSamplerRandomMAP.cxx
diff --git a/Testing/Code/Markov/otbMRFSamplerRandomMAPNew.cxx b/Modules/Learning/Markov/test/otbMRFSamplerRandomMAPNew.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFSamplerRandomMAPNew.cxx
rename to Modules/Learning/Markov/test/otbMRFSamplerRandomMAPNew.cxx
diff --git a/Testing/Code/Markov/otbMRFSamplerRandomNew.cxx b/Modules/Learning/Markov/test/otbMRFSamplerRandomNew.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMRFSamplerRandomNew.cxx
rename to Modules/Learning/Markov/test/otbMRFSamplerRandomNew.cxx
diff --git a/Testing/Code/Markov/otbMarkovRandomFieldFilter.cxx b/Modules/Learning/Markov/test/otbMarkovRandomFieldFilter.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMarkovRandomFieldFilter.cxx
rename to Modules/Learning/Markov/test/otbMarkovRandomFieldFilter.cxx
diff --git a/Testing/Code/Markov/otbMarkovRandomFieldFilterNew.cxx b/Modules/Learning/Markov/test/otbMarkovRandomFieldFilterNew.cxx
similarity index 100%
rename from Testing/Code/Markov/otbMarkovRandomFieldFilterNew.cxx
rename to Modules/Learning/Markov/test/otbMarkovRandomFieldFilterNew.cxx
diff --git a/Code/Learning/otbCzihoSOMLearningBehaviorFunctor.h b/Modules/Learning/SOM/include/otbCzihoSOMLearningBehaviorFunctor.h
similarity index 100%
rename from Code/Learning/otbCzihoSOMLearningBehaviorFunctor.h
rename to Modules/Learning/SOM/include/otbCzihoSOMLearningBehaviorFunctor.h
diff --git a/Code/Learning/otbCzihoSOMNeighborhoodBehaviorFunctor.h b/Modules/Learning/SOM/include/otbCzihoSOMNeighborhoodBehaviorFunctor.h
similarity index 100%
rename from Code/Learning/otbCzihoSOMNeighborhoodBehaviorFunctor.h
rename to Modules/Learning/SOM/include/otbCzihoSOMNeighborhoodBehaviorFunctor.h
diff --git a/Code/Learning/otbPeriodicSOM.h b/Modules/Learning/SOM/include/otbPeriodicSOM.h
similarity index 100%
rename from Code/Learning/otbPeriodicSOM.h
rename to Modules/Learning/SOM/include/otbPeriodicSOM.h
diff --git a/Code/Learning/otbPeriodicSOM.txx b/Modules/Learning/SOM/include/otbPeriodicSOM.txx
similarity index 100%
rename from Code/Learning/otbPeriodicSOM.txx
rename to Modules/Learning/SOM/include/otbPeriodicSOM.txx
diff --git a/Code/Learning/otbSOM.h b/Modules/Learning/SOM/include/otbSOM.h
similarity index 100%
rename from Code/Learning/otbSOM.h
rename to Modules/Learning/SOM/include/otbSOM.h
diff --git a/Code/Learning/otbSOM.txx b/Modules/Learning/SOM/include/otbSOM.txx
similarity index 100%
rename from Code/Learning/otbSOM.txx
rename to Modules/Learning/SOM/include/otbSOM.txx
diff --git a/Code/Learning/otbSOMActivationBuilder.h b/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
similarity index 100%
rename from Code/Learning/otbSOMActivationBuilder.h
rename to Modules/Learning/SOM/include/otbSOMActivationBuilder.h
diff --git a/Code/Learning/otbSOMActivationBuilder.txx b/Modules/Learning/SOM/include/otbSOMActivationBuilder.txx
similarity index 100%
rename from Code/Learning/otbSOMActivationBuilder.txx
rename to Modules/Learning/SOM/include/otbSOMActivationBuilder.txx
diff --git a/Code/Learning/otbSOMClassifier.h b/Modules/Learning/SOM/include/otbSOMClassifier.h
similarity index 100%
rename from Code/Learning/otbSOMClassifier.h
rename to Modules/Learning/SOM/include/otbSOMClassifier.h
diff --git a/Code/Learning/otbSOMClassifier.txx b/Modules/Learning/SOM/include/otbSOMClassifier.txx
similarity index 100%
rename from Code/Learning/otbSOMClassifier.txx
rename to Modules/Learning/SOM/include/otbSOMClassifier.txx
diff --git a/Code/Learning/otbSOMImageClassificationFilter.h b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
similarity index 100%
rename from Code/Learning/otbSOMImageClassificationFilter.h
rename to Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
diff --git a/Code/Learning/otbSOMImageClassificationFilter.txx b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.txx
similarity index 100%
rename from Code/Learning/otbSOMImageClassificationFilter.txx
rename to Modules/Learning/SOM/include/otbSOMImageClassificationFilter.txx
diff --git a/Code/Learning/otbSOMLearningBehaviorFunctor.h b/Modules/Learning/SOM/include/otbSOMLearningBehaviorFunctor.h
similarity index 100%
rename from Code/Learning/otbSOMLearningBehaviorFunctor.h
rename to Modules/Learning/SOM/include/otbSOMLearningBehaviorFunctor.h
diff --git a/Code/Learning/otbSOMMap.h b/Modules/Learning/SOM/include/otbSOMMap.h
similarity index 100%
rename from Code/Learning/otbSOMMap.h
rename to Modules/Learning/SOM/include/otbSOMMap.h
diff --git a/Code/Learning/otbSOMMap.txx b/Modules/Learning/SOM/include/otbSOMMap.txx
similarity index 100%
rename from Code/Learning/otbSOMMap.txx
rename to Modules/Learning/SOM/include/otbSOMMap.txx
diff --git a/Code/Learning/otbSOMWithMissingValue.h b/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
similarity index 100%
rename from Code/Learning/otbSOMWithMissingValue.h
rename to Modules/Learning/SOM/include/otbSOMWithMissingValue.h
diff --git a/Code/Learning/otbSOMWithMissingValue.txx b/Modules/Learning/SOM/include/otbSOMWithMissingValue.txx
similarity index 100%
rename from Code/Learning/otbSOMWithMissingValue.txx
rename to Modules/Learning/SOM/include/otbSOMWithMissingValue.txx
diff --git a/Code/Learning/otbSOMbasedImageFilter.h b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
similarity index 100%
rename from Code/Learning/otbSOMbasedImageFilter.h
rename to Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
diff --git a/Code/Learning/otbSOMbasedImageFilter.txx b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.txx
similarity index 100%
rename from Code/Learning/otbSOMbasedImageFilter.txx
rename to Modules/Learning/SOM/include/otbSOMbasedImageFilter.txx
diff --git a/Testing/Fa/MapActivation.cxx b/Modules/Learning/SOM/test/MapActivation.cxx
similarity index 100%
rename from Testing/Fa/MapActivation.cxx
rename to Modules/Learning/SOM/test/MapActivation.cxx
diff --git a/Testing/Code/Learning/otbPeriodicSOM.cxx b/Modules/Learning/SOM/test/otbPeriodicSOM.cxx
similarity index 100%
rename from Testing/Code/Learning/otbPeriodicSOM.cxx
rename to Modules/Learning/SOM/test/otbPeriodicSOM.cxx
diff --git a/Testing/Code/Learning/otbPeriodicSOMNew.cxx b/Modules/Learning/SOM/test/otbPeriodicSOMNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbPeriodicSOMNew.cxx
rename to Modules/Learning/SOM/test/otbPeriodicSOMNew.cxx
diff --git a/Testing/Code/Learning/otbSOM.cxx b/Modules/Learning/SOM/test/otbSOM.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOM.cxx
rename to Modules/Learning/SOM/test/otbSOM.cxx
diff --git a/Testing/Code/Learning/otbSOMActivationBuilder.cxx b/Modules/Learning/SOM/test/otbSOMActivationBuilder.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMActivationBuilder.cxx
rename to Modules/Learning/SOM/test/otbSOMActivationBuilder.cxx
diff --git a/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx b/Modules/Learning/SOM/test/otbSOMActivationBuilderNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMActivationBuilderNew.cxx
rename to Modules/Learning/SOM/test/otbSOMActivationBuilderNew.cxx
diff --git a/Testing/Code/Learning/otbSOMClassifier.cxx b/Modules/Learning/SOM/test/otbSOMClassifier.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMClassifier.cxx
rename to Modules/Learning/SOM/test/otbSOMClassifier.cxx
diff --git a/Testing/Code/Learning/otbSOMClassifierNew.cxx b/Modules/Learning/SOM/test/otbSOMClassifierNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMClassifierNew.cxx
rename to Modules/Learning/SOM/test/otbSOMClassifierNew.cxx
diff --git a/Testing/Code/Learning/otbSOMImageClassificationFilter.cxx b/Modules/Learning/SOM/test/otbSOMImageClassificationFilter.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMImageClassificationFilter.cxx
rename to Modules/Learning/SOM/test/otbSOMImageClassificationFilter.cxx
diff --git a/Testing/Code/Learning/otbSOMImageClassificationFilterNew.cxx b/Modules/Learning/SOM/test/otbSOMImageClassificationFilterNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMImageClassificationFilterNew.cxx
rename to Modules/Learning/SOM/test/otbSOMImageClassificationFilterNew.cxx
diff --git a/Testing/Code/Learning/otbSOMMap.cxx b/Modules/Learning/SOM/test/otbSOMMap.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMMap.cxx
rename to Modules/Learning/SOM/test/otbSOMMap.cxx
diff --git a/Testing/Code/Learning/otbSOMMapNew.cxx b/Modules/Learning/SOM/test/otbSOMMapNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMMapNew.cxx
rename to Modules/Learning/SOM/test/otbSOMMapNew.cxx
diff --git a/Testing/Code/Learning/otbSOMNew.cxx b/Modules/Learning/SOM/test/otbSOMNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMNew.cxx
rename to Modules/Learning/SOM/test/otbSOMNew.cxx
diff --git a/Testing/Code/Learning/otbSOMWithMissingValue.cxx b/Modules/Learning/SOM/test/otbSOMWithMissingValue.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMWithMissingValue.cxx
rename to Modules/Learning/SOM/test/otbSOMWithMissingValue.cxx
diff --git a/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx b/Modules/Learning/SOM/test/otbSOMWithMissingValueNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
rename to Modules/Learning/SOM/test/otbSOMWithMissingValueNew.cxx
diff --git a/Testing/Code/Learning/otbSOMbasedImageFilter.cxx b/Modules/Learning/SOM/test/otbSOMbasedImageFilter.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMbasedImageFilter.cxx
rename to Modules/Learning/SOM/test/otbSOMbasedImageFilter.cxx
diff --git a/Testing/Code/Learning/otbSOMbasedImageFilterNew.cxx b/Modules/Learning/SOM/test/otbSOMbasedImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSOMbasedImageFilterNew.cxx
rename to Modules/Learning/SOM/test/otbSOMbasedImageFilterNew.cxx
diff --git a/Code/Learning/otbChangeProfileKernelFunctor.h b/Modules/Learning/SVMLearning/include/otbChangeProfileKernelFunctor.h
similarity index 100%
rename from Code/Learning/otbChangeProfileKernelFunctor.h
rename to Modules/Learning/SVMLearning/include/otbChangeProfileKernelFunctor.h
diff --git a/Code/Learning/otbExhaustiveExponentialOptimizer.h b/Modules/Learning/SVMLearning/include/otbExhaustiveExponentialOptimizer.h
similarity index 100%
rename from Code/Learning/otbExhaustiveExponentialOptimizer.h
rename to Modules/Learning/SVMLearning/include/otbExhaustiveExponentialOptimizer.h
diff --git a/Code/OBIA/otbLabelMapSVMClassifier.h b/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.h
similarity index 100%
rename from Code/OBIA/otbLabelMapSVMClassifier.h
rename to Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.h
diff --git a/Code/OBIA/otbLabelMapSVMClassifier.txx b/Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.txx
similarity index 100%
rename from Code/OBIA/otbLabelMapSVMClassifier.txx
rename to Modules/Learning/SVMLearning/include/otbLabelMapSVMClassifier.txx
diff --git a/Code/Learning/otbLibSVMMachineLearningModel.h b/Modules/Learning/SVMLearning/include/otbLibSVMMachineLearningModel.h
similarity index 100%
rename from Code/Learning/otbLibSVMMachineLearningModel.h
rename to Modules/Learning/SVMLearning/include/otbLibSVMMachineLearningModel.h
diff --git a/Code/Learning/otbLibSVMMachineLearningModel.txx b/Modules/Learning/SVMLearning/include/otbLibSVMMachineLearningModel.txx
similarity index 100%
rename from Code/Learning/otbLibSVMMachineLearningModel.txx
rename to Modules/Learning/SVMLearning/include/otbLibSVMMachineLearningModel.txx
diff --git a/Code/Learning/otbLibSVMMachineLearningModelFactory.h b/Modules/Learning/SVMLearning/include/otbLibSVMMachineLearningModelFactory.h
similarity index 100%
rename from Code/Learning/otbLibSVMMachineLearningModelFactory.h
rename to Modules/Learning/SVMLearning/include/otbLibSVMMachineLearningModelFactory.h
diff --git a/Code/Learning/otbLibSVMMachineLearningModelFactory.txx b/Modules/Learning/SVMLearning/include/otbLibSVMMachineLearningModelFactory.txx
similarity index 100%
rename from Code/Learning/otbLibSVMMachineLearningModelFactory.txx
rename to Modules/Learning/SVMLearning/include/otbLibSVMMachineLearningModelFactory.txx
diff --git a/Code/Learning/otbMixturePolyRBFKernelFunctor.h b/Modules/Learning/SVMLearning/include/otbMixturePolyRBFKernelFunctor.h
similarity index 100%
rename from Code/Learning/otbMixturePolyRBFKernelFunctor.h
rename to Modules/Learning/SVMLearning/include/otbMixturePolyRBFKernelFunctor.h
diff --git a/Code/Learning/otbNonGaussianRBFKernelFunctor.h b/Modules/Learning/SVMLearning/include/otbNonGaussianRBFKernelFunctor.h
similarity index 100%
rename from Code/Learning/otbNonGaussianRBFKernelFunctor.h
rename to Modules/Learning/SVMLearning/include/otbNonGaussianRBFKernelFunctor.h
diff --git a/Code/ObjectDetection/otbObjectDetectionClassifier.h b/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.h
similarity index 100%
rename from Code/ObjectDetection/otbObjectDetectionClassifier.h
rename to Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.h
diff --git a/Code/ObjectDetection/otbObjectDetectionClassifier.txx b/Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.txx
similarity index 100%
rename from Code/ObjectDetection/otbObjectDetectionClassifier.txx
rename to Modules/Learning/SVMLearning/include/otbObjectDetectionClassifier.txx
diff --git a/Code/Learning/otbSVMClassifier.h b/Modules/Learning/SVMLearning/include/otbSVMClassifier.h
similarity index 100%
rename from Code/Learning/otbSVMClassifier.h
rename to Modules/Learning/SVMLearning/include/otbSVMClassifier.h
diff --git a/Code/Learning/otbSVMClassifier.txx b/Modules/Learning/SVMLearning/include/otbSVMClassifier.txx
similarity index 100%
rename from Code/Learning/otbSVMClassifier.txx
rename to Modules/Learning/SVMLearning/include/otbSVMClassifier.txx
diff --git a/Code/Learning/otbSVMCrossValidationCostFunction.h b/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h
similarity index 100%
rename from Code/Learning/otbSVMCrossValidationCostFunction.h
rename to Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.h
diff --git a/Code/Learning/otbSVMCrossValidationCostFunction.txx b/Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.txx
similarity index 100%
rename from Code/Learning/otbSVMCrossValidationCostFunction.txx
rename to Modules/Learning/SVMLearning/include/otbSVMCrossValidationCostFunction.txx
diff --git a/Code/Learning/otbSVMImageClassificationFilter.h b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.h
similarity index 100%
rename from Code/Learning/otbSVMImageClassificationFilter.h
rename to Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.h
diff --git a/Code/Learning/otbSVMImageClassificationFilter.txx b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.txx
similarity index 100%
rename from Code/Learning/otbSVMImageClassificationFilter.txx
rename to Modules/Learning/SVMLearning/include/otbSVMImageClassificationFilter.txx
diff --git a/Code/Learning/otbSVMImageClassificationWithRuleFilter.h b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
similarity index 100%
rename from Code/Learning/otbSVMImageClassificationWithRuleFilter.h
rename to Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.h
diff --git a/Code/Learning/otbSVMImageClassificationWithRuleFilter.txx b/Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.txx
similarity index 100%
rename from Code/Learning/otbSVMImageClassificationWithRuleFilter.txx
rename to Modules/Learning/SVMLearning/include/otbSVMImageClassificationWithRuleFilter.txx
diff --git a/Code/Learning/otbSVMImageModelEstimator.h b/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.h
similarity index 100%
rename from Code/Learning/otbSVMImageModelEstimator.h
rename to Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.h
diff --git a/Code/Learning/otbSVMImageModelEstimator.txx b/Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.txx
similarity index 100%
rename from Code/Learning/otbSVMImageModelEstimator.txx
rename to Modules/Learning/SVMLearning/include/otbSVMImageModelEstimator.txx
diff --git a/Code/Learning/otbSVMKernels.h b/Modules/Learning/SVMLearning/include/otbSVMKernels.h
similarity index 100%
rename from Code/Learning/otbSVMKernels.h
rename to Modules/Learning/SVMLearning/include/otbSVMKernels.h
diff --git a/Code/Learning/otbSVMMarginSampler.h b/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.h
similarity index 100%
rename from Code/Learning/otbSVMMarginSampler.h
rename to Modules/Learning/SVMLearning/include/otbSVMMarginSampler.h
diff --git a/Code/Learning/otbSVMMarginSampler.txx b/Modules/Learning/SVMLearning/include/otbSVMMarginSampler.txx
similarity index 100%
rename from Code/Learning/otbSVMMarginSampler.txx
rename to Modules/Learning/SVMLearning/include/otbSVMMarginSampler.txx
diff --git a/Code/Learning/otbSVMModel.h b/Modules/Learning/SVMLearning/include/otbSVMModel.h
similarity index 100%
rename from Code/Learning/otbSVMModel.h
rename to Modules/Learning/SVMLearning/include/otbSVMModel.h
diff --git a/Code/Learning/otbSVMModel.txx b/Modules/Learning/SVMLearning/include/otbSVMModel.txx
similarity index 100%
rename from Code/Learning/otbSVMModel.txx
rename to Modules/Learning/SVMLearning/include/otbSVMModel.txx
diff --git a/Code/Learning/otbSVMModelEstimator.h b/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.h
similarity index 100%
rename from Code/Learning/otbSVMModelEstimator.h
rename to Modules/Learning/SVMLearning/include/otbSVMModelEstimator.h
diff --git a/Code/Learning/otbSVMModelEstimator.txx b/Modules/Learning/SVMLearning/include/otbSVMModelEstimator.txx
similarity index 100%
rename from Code/Learning/otbSVMModelEstimator.txx
rename to Modules/Learning/SVMLearning/include/otbSVMModelEstimator.txx
diff --git a/Code/Learning/otbSVMPointSetModelEstimator.h b/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.h
similarity index 100%
rename from Code/Learning/otbSVMPointSetModelEstimator.h
rename to Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.h
diff --git a/Code/Learning/otbSVMPointSetModelEstimator.txx b/Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.txx
similarity index 100%
rename from Code/Learning/otbSVMPointSetModelEstimator.txx
rename to Modules/Learning/SVMLearning/include/otbSVMPointSetModelEstimator.txx
diff --git a/Code/Learning/otbSVMSampleListModelEstimator.h b/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.h
similarity index 100%
rename from Code/Learning/otbSVMSampleListModelEstimator.h
rename to Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.h
diff --git a/Code/Learning/otbSVMSampleListModelEstimator.txx b/Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.txx
similarity index 100%
rename from Code/Learning/otbSVMSampleListModelEstimator.txx
rename to Modules/Learning/SVMLearning/include/otbSVMSampleListModelEstimator.txx
diff --git a/Code/Learning/otbSpectralAngleKernelFunctor.h b/Modules/Learning/SVMLearning/include/otbSpectralAngleKernelFunctor.h
similarity index 100%
rename from Code/Learning/otbSpectralAngleKernelFunctor.h
rename to Modules/Learning/SVMLearning/include/otbSpectralAngleKernelFunctor.h
diff --git a/Code/Learning/otbChangeProfileKernelFunctor.cxx b/Modules/Learning/SVMLearning/src/otbChangeProfileKernelFunctor.cxx
similarity index 100%
rename from Code/Learning/otbChangeProfileKernelFunctor.cxx
rename to Modules/Learning/SVMLearning/src/otbChangeProfileKernelFunctor.cxx
diff --git a/Code/Learning/otbExhaustiveExponentialOptimizer.cxx b/Modules/Learning/SVMLearning/src/otbExhaustiveExponentialOptimizer.cxx
similarity index 100%
rename from Code/Learning/otbExhaustiveExponentialOptimizer.cxx
rename to Modules/Learning/SVMLearning/src/otbExhaustiveExponentialOptimizer.cxx
diff --git a/Code/Learning/otbMixturePolyRBFKernelFunctor.cxx b/Modules/Learning/SVMLearning/src/otbMixturePolyRBFKernelFunctor.cxx
similarity index 100%
rename from Code/Learning/otbMixturePolyRBFKernelFunctor.cxx
rename to Modules/Learning/SVMLearning/src/otbMixturePolyRBFKernelFunctor.cxx
diff --git a/Code/Learning/otbNonGaussianRBFKernelFunctor.cxx b/Modules/Learning/SVMLearning/src/otbNonGaussianRBFKernelFunctor.cxx
similarity index 100%
rename from Code/Learning/otbNonGaussianRBFKernelFunctor.cxx
rename to Modules/Learning/SVMLearning/src/otbNonGaussianRBFKernelFunctor.cxx
diff --git a/Code/Learning/otbSpectralAngleKernelFunctor.cxx b/Modules/Learning/SVMLearning/src/otbSpectralAngleKernelFunctor.cxx
similarity index 100%
rename from Code/Learning/otbSpectralAngleKernelFunctor.cxx
rename to Modules/Learning/SVMLearning/src/otbSpectralAngleKernelFunctor.cxx
diff --git a/Testing/Code/Learning/otbExhaustiveExponentialOptimizerNew.cxx b/Modules/Learning/SVMLearning/test/otbExhaustiveExponentialOptimizerNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbExhaustiveExponentialOptimizerNew.cxx
rename to Modules/Learning/SVMLearning/test/otbExhaustiveExponentialOptimizerNew.cxx
diff --git a/Testing/Code/Learning/otbExhaustiveExponentialOptimizerTest.cxx b/Modules/Learning/SVMLearning/test/otbExhaustiveExponentialOptimizerTest.cxx
similarity index 100%
rename from Testing/Code/Learning/otbExhaustiveExponentialOptimizerTest.cxx
rename to Modules/Learning/SVMLearning/test/otbExhaustiveExponentialOptimizerTest.cxx
diff --git a/Testing/Code/OBIA/otbLabelMapSVMClassifier.cxx b/Modules/Learning/SVMLearning/test/otbLabelMapSVMClassifier.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbLabelMapSVMClassifier.cxx
rename to Modules/Learning/SVMLearning/test/otbLabelMapSVMClassifier.cxx
diff --git a/Testing/Code/Learning/otbMachineLearningModelCanRead.cxx b/Modules/Learning/SVMLearning/test/otbMachineLearningModelCanRead.cxx
similarity index 100%
rename from Testing/Code/Learning/otbMachineLearningModelCanRead.cxx
rename to Modules/Learning/SVMLearning/test/otbMachineLearningModelCanRead.cxx
diff --git a/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx b/Modules/Learning/SVMLearning/test/otbObjectDetectionClassifier.cxx
similarity index 100%
rename from Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx
rename to Modules/Learning/SVMLearning/test/otbObjectDetectionClassifier.cxx
diff --git a/Testing/Code/Learning/otbSVMClassifierImage.cxx b/Modules/Learning/SVMLearning/test/otbSVMClassifierImage.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMClassifierImage.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMClassifierImage.cxx
diff --git a/Testing/Code/Learning/otbSVMClassifierNew.cxx b/Modules/Learning/SVMLearning/test/otbSVMClassifierNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMClassifierNew.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMClassifierNew.cxx
diff --git a/Testing/Code/Learning/otbSVMClassifierPointSet.cxx b/Modules/Learning/SVMLearning/test/otbSVMClassifierPointSet.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMClassifierPointSet.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMClassifierPointSet.cxx
diff --git a/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx b/Modules/Learning/SVMLearning/test/otbSVMCrossValidationCostFunctionNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMCrossValidationCostFunctionNew.cxx
diff --git a/Testing/Code/Learning/otbSVMImageClassificationFilter.cxx b/Modules/Learning/SVMLearning/test/otbSVMImageClassificationFilter.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMImageClassificationFilter.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMImageClassificationFilter.cxx
diff --git a/Testing/Code/Learning/otbSVMImageClassificationFilterNew.cxx b/Modules/Learning/SVMLearning/test/otbSVMImageClassificationFilterNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMImageClassificationFilterNew.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMImageClassificationFilterNew.cxx
diff --git a/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilter.cxx b/Modules/Learning/SVMLearning/test/otbSVMImageClassificationWithRuleFilter.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMImageClassificationWithRuleFilter.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMImageClassificationWithRuleFilter.cxx
diff --git a/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilterNew.cxx b/Modules/Learning/SVMLearning/test/otbSVMImageClassificationWithRuleFilterNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMImageClassificationWithRuleFilterNew.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMImageClassificationWithRuleFilterNew.cxx
diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorModelAccessor.cxx b/Modules/Learning/SVMLearning/test/otbSVMImageModelEstimatorModelAccessor.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMImageModelEstimatorModelAccessor.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMImageModelEstimatorModelAccessor.cxx
diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx b/Modules/Learning/SVMLearning/test/otbSVMImageModelEstimatorNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMImageModelEstimatorNew.cxx
diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx b/Modules/Learning/SVMLearning/test/otbSVMImageModelEstimatorTrain.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMImageModelEstimatorTrain.cxx
diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorTrainOneClass.cxx b/Modules/Learning/SVMLearning/test/otbSVMImageModelEstimatorTrainOneClass.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMImageModelEstimatorTrainOneClass.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMImageModelEstimatorTrainOneClass.cxx
diff --git a/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest.cxx b/Modules/Learning/SVMLearning/test/otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMInverseCosSpectralAngleKernelFunctorImageClassificationTest.cxx
diff --git a/Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx b/Modules/Learning/SVMLearning/test/otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMInverseCosSpectralAngleKernelFunctorImageModelEstimatorTest.cxx
diff --git a/Testing/Code/Learning/otbSVMMarginSampler.cxx b/Modules/Learning/SVMLearning/test/otbSVMMarginSampler.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMMarginSampler.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMMarginSampler.cxx
diff --git a/Testing/Code/Learning/otbSVMModelAccessor.cxx b/Modules/Learning/SVMLearning/test/otbSVMModelAccessor.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMModelAccessor.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMModelAccessor.cxx
diff --git a/Testing/Code/Learning/otbSVMModelCopyComposedKernelTest.cxx b/Modules/Learning/SVMLearning/test/otbSVMModelCopyComposedKernelTest.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMModelCopyComposedKernelTest.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMModelCopyComposedKernelTest.cxx
diff --git a/Testing/Code/Learning/otbSVMModelCopyGenericKernelTest.cxx b/Modules/Learning/SVMLearning/test/otbSVMModelCopyGenericKernelTest.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMModelCopyGenericKernelTest.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMModelCopyGenericKernelTest.cxx
diff --git a/Testing/Code/Learning/otbSVMModelCopyTest.cxx b/Modules/Learning/SVMLearning/test/otbSVMModelCopyTest.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMModelCopyTest.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMModelCopyTest.cxx
diff --git a/Testing/Code/Learning/otbSVMModelGenericKernelLoadSave.cxx b/Modules/Learning/SVMLearning/test/otbSVMModelGenericKernelLoadSave.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMModelGenericKernelLoadSave.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMModelGenericKernelLoadSave.cxx
diff --git a/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx b/Modules/Learning/SVMLearning/test/otbSVMModelGenericKernelsTest.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMModelGenericKernelsTest.cxx
diff --git a/Testing/Code/Learning/otbSVMModelLoad.cxx b/Modules/Learning/SVMLearning/test/otbSVMModelLoad.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMModelLoad.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMModelLoad.cxx
diff --git a/Testing/Code/Learning/otbSVMModelLoadSave.cxx b/Modules/Learning/SVMLearning/test/otbSVMModelLoadSave.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMModelLoadSave.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMModelLoadSave.cxx
diff --git a/Testing/Code/Learning/otbSVMModelNew.cxx b/Modules/Learning/SVMLearning/test/otbSVMModelNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMModelNew.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMModelNew.cxx
diff --git a/Testing/Code/Learning/otbSVMPointSetModelEstimatorNew.cxx b/Modules/Learning/SVMLearning/test/otbSVMPointSetModelEstimatorNew.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMPointSetModelEstimatorNew.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMPointSetModelEstimatorNew.cxx
diff --git a/Testing/Code/Learning/otbSVMPointSetModelEstimatorTrain.cxx b/Modules/Learning/SVMLearning/test/otbSVMPointSetModelEstimatorTrain.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMPointSetModelEstimatorTrain.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMPointSetModelEstimatorTrain.cxx
diff --git a/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx b/Modules/Learning/SVMLearning/test/otbSVMSampleListModelEstimatorTest.cxx
similarity index 100%
rename from Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx
rename to Modules/Learning/SVMLearning/test/otbSVMSampleListModelEstimatorTest.cxx
diff --git a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
similarity index 100%
rename from Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h
rename to Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
diff --git a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.txx
similarity index 100%
rename from Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx
rename to Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.txx
diff --git a/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
similarity index 100%
rename from Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.h
rename to Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
diff --git a/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.txx
similarity index 100%
rename from Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx
rename to Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.txx
diff --git a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.h b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
similarity index 100%
rename from Code/SpatialReasoning/otbImageToImageRCC8Calculator.h
rename to Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
diff --git a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.txx
similarity index 100%
rename from Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
rename to Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.txx
diff --git a/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
similarity index 100%
rename from Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.h
rename to Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
diff --git a/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.txx b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx
similarity index 100%
rename from Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.txx
rename to Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.txx
diff --git a/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.h b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
similarity index 100%
rename from Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.h
rename to Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
diff --git a/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.txx b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.txx
similarity index 100%
rename from Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.txx
rename to Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.txx
diff --git a/Code/SpatialReasoning/otbRCC8Edge.h b/Modules/OBIA/RCC8/include/otbRCC8Edge.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8Edge.h
rename to Modules/OBIA/RCC8/include/otbRCC8Edge.h
diff --git a/Code/SpatialReasoning/otbRCC8EdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8EdgeIterator.h
rename to Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
diff --git a/Code/SpatialReasoning/otbRCC8EdgeIterator.txx b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.txx
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8EdgeIterator.txx
rename to Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.txx
diff --git a/Code/SpatialReasoning/otbRCC8Graph.h b/Modules/OBIA/RCC8/include/otbRCC8Graph.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8Graph.h
rename to Modules/OBIA/RCC8/include/otbRCC8Graph.h
diff --git a/Code/SpatialReasoning/otbRCC8Graph.txx b/Modules/OBIA/RCC8/include/otbRCC8Graph.txx
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8Graph.txx
rename to Modules/OBIA/RCC8/include/otbRCC8Graph.txx
diff --git a/Code/SpatialReasoning/otbRCC8GraphFileReader.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8GraphFileReader.h
rename to Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
diff --git a/Code/SpatialReasoning/otbRCC8GraphFileReader.txx b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.txx
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8GraphFileReader.txx
rename to Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.txx
diff --git a/Code/SpatialReasoning/otbRCC8GraphFileWriter.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8GraphFileWriter.h
rename to Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
diff --git a/Code/SpatialReasoning/otbRCC8GraphFileWriter.txx b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.txx
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8GraphFileWriter.txx
rename to Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.txx
diff --git a/Code/SpatialReasoning/otbRCC8GraphSource.h b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8GraphSource.h
rename to Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
diff --git a/Code/SpatialReasoning/otbRCC8GraphSource.txx b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.txx
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8GraphSource.txx
rename to Modules/OBIA/RCC8/include/otbRCC8GraphSource.txx
diff --git a/Code/SpatialReasoning/otbRCC8InEdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8InEdgeIterator.h
rename to Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
diff --git a/Code/SpatialReasoning/otbRCC8InEdgeIterator.txx b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.txx
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8InEdgeIterator.txx
rename to Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.txx
diff --git a/Code/SpatialReasoning/otbRCC8OutEdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8OutEdgeIterator.h
rename to Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
diff --git a/Code/SpatialReasoning/otbRCC8OutEdgeIterator.txx b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.txx
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8OutEdgeIterator.txx
rename to Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.txx
diff --git a/Code/SpatialReasoning/otbRCC8Value.h b/Modules/OBIA/RCC8/include/otbRCC8Value.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8Value.h
rename to Modules/OBIA/RCC8/include/otbRCC8Value.h
diff --git a/Code/SpatialReasoning/otbRCC8VertexBase.h b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8VertexBase.h
rename to Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
diff --git a/Code/SpatialReasoning/otbRCC8VertexBase.txx b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.txx
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8VertexBase.txx
rename to Modules/OBIA/RCC8/include/otbRCC8VertexBase.txx
diff --git a/Code/SpatialReasoning/otbRCC8VertexIterator.h b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8VertexIterator.h
rename to Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
diff --git a/Code/SpatialReasoning/otbRCC8VertexIterator.txx b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.txx
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8VertexIterator.txx
rename to Modules/OBIA/RCC8/include/otbRCC8VertexIterator.txx
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
rename to Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.txx b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.txx
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8VertexWithCompacity.txx
rename to Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.txx
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
rename to Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.txx b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.txx
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.txx
rename to Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.txx
diff --git a/Code/SpatialReasoning/otbRCC8Edge.cxx b/Modules/OBIA/RCC8/src/otbRCC8Edge.cxx
similarity index 100%
rename from Code/SpatialReasoning/otbRCC8Edge.cxx
rename to Modules/OBIA/RCC8/src/otbRCC8Edge.cxx
diff --git a/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx b/Modules/OBIA/RCC8/test/otbImageListToRCC8GraphFilterNew.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx
rename to Modules/OBIA/RCC8/test/otbImageListToRCC8GraphFilterNew.cxx
diff --git a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx b/Modules/OBIA/RCC8/test/otbImageMultiSegmentationToRCC8GraphFilter.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
rename to Modules/OBIA/RCC8/test/otbImageMultiSegmentationToRCC8GraphFilter.cxx
diff --git a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx b/Modules/OBIA/RCC8/test/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
rename to Modules/OBIA/RCC8/test/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
diff --git a/Testing/Code/SpatialReasoning/otbImageToImageRCC8Calculator.cxx b/Modules/OBIA/RCC8/test/otbImageToImageRCC8Calculator.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbImageToImageRCC8Calculator.cxx
rename to Modules/OBIA/RCC8/test/otbImageToImageRCC8Calculator.cxx
diff --git a/Testing/Code/SpatialReasoning/otbImageToImageRCC8CalculatorNew.cxx b/Modules/OBIA/RCC8/test/otbImageToImageRCC8CalculatorNew.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbImageToImageRCC8CalculatorNew.cxx
rename to Modules/OBIA/RCC8/test/otbImageToImageRCC8CalculatorNew.cxx
diff --git a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx b/Modules/OBIA/RCC8/test/otbPolygonListToRCC8GraphFilter.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx
rename to Modules/OBIA/RCC8/test/otbPolygonListToRCC8GraphFilter.cxx
diff --git a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilterNew.cxx b/Modules/OBIA/RCC8/test/otbPolygonListToRCC8GraphFilterNew.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilterNew.cxx
rename to Modules/OBIA/RCC8/test/otbPolygonListToRCC8GraphFilterNew.cxx
diff --git a/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx b/Modules/OBIA/RCC8/test/otbPolygonToPolygonRCC8Calculator.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx
rename to Modules/OBIA/RCC8/test/otbPolygonToPolygonRCC8Calculator.cxx
diff --git a/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8CalculatorNew.cxx b/Modules/OBIA/RCC8/test/otbPolygonToPolygonRCC8CalculatorNew.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8CalculatorNew.cxx
rename to Modules/OBIA/RCC8/test/otbPolygonToPolygonRCC8CalculatorNew.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8Edge.cxx b/Modules/OBIA/RCC8/test/otbRCC8Edge.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8Edge.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8Edge.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8EdgeNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8EdgeNew.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8EdgeNew.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8EdgeNew.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx b/Modules/OBIA/RCC8/test/otbRCC8Graph.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8Graph.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8Graph.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx b/Modules/OBIA/RCC8/test/otbRCC8GraphFileReader.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8GraphFileReader.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileReaderNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8GraphFileReaderNew.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8GraphFileReaderNew.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8GraphFileReaderNew.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx b/Modules/OBIA/RCC8/test/otbRCC8GraphFileWriter.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8GraphFileWriter.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8GraphFileWriterNew.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8GraphFileWriterNew.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx b/Modules/OBIA/RCC8/test/otbRCC8GraphIOEndToEnd.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8GraphIOEndToEnd.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8GraphNew.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8GraphNew.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8GraphNew.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphSourceNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8GraphSourceNew.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8GraphSourceNew.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8GraphSourceNew.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8VertexBase.cxx b/Modules/OBIA/RCC8/test/otbRCC8VertexBase.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8VertexBase.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8VertexBase.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8VertexBaseNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8VertexBaseNew.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8VertexBaseNew.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8VertexBaseNew.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacity.cxx b/Modules/OBIA/RCC8/test/otbRCC8VertexWithCompacity.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacity.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8VertexWithCompacity.cxx
diff --git a/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacityNew.cxx b/Modules/OBIA/RCC8/test/otbRCC8VertexWithCompacityNew.cxx
similarity index 100%
rename from Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacityNew.cxx
rename to Modules/OBIA/RCC8/test/otbRCC8VertexWithCompacityNew.cxx
diff --git a/Code/Radiometry/otbBuiltUpIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h
similarity index 100%
rename from Code/Radiometry/otbBuiltUpIndicesFunctor.h
rename to Modules/Radiometry/Indices/include/otbBuiltUpIndicesFunctor.h
diff --git a/Code/Radiometry/otbGAndRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbGAndRIndexImageFilter.h
rename to Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
diff --git a/Code/Radiometry/otbGAndRIndexImageFilter.txx b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.txx
similarity index 100%
rename from Code/Radiometry/otbGAndRIndexImageFilter.txx
rename to Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.txx
diff --git a/Code/Radiometry/otbLandsatTMIndices.h b/Modules/Radiometry/Indices/include/otbLandsatTMIndices.h
similarity index 100%
rename from Code/Radiometry/otbLandsatTMIndices.h
rename to Modules/Radiometry/Indices/include/otbLandsatTMIndices.h
diff --git a/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.h
rename to Modules/Radiometry/Indices/include/otbMultiChannelGAndRIndexImageFilter.h
diff --git a/Code/Radiometry/otbMultiChannelRAndBAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbMultiChannelRAndBAndNIRIndexImageFilter.h
rename to Modules/Radiometry/Indices/include/otbMultiChannelRAndBAndNIRIndexImageFilter.h
diff --git a/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilter.h
rename to Modules/Radiometry/Indices/include/otbMultiChannelRAndGAndNIRIndexImageFilter.h
diff --git a/Code/Radiometry/otbMultiChannelRAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbMultiChannelRAndNIRIndexImageFilter.h
rename to Modules/Radiometry/Indices/include/otbMultiChannelRAndNIRIndexImageFilter.h
diff --git a/Code/Radiometry/otbMultiChannelRadiometricImageFilter.h b/Modules/Radiometry/Indices/include/otbMultiChannelRadiometricImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbMultiChannelRadiometricImageFilter.h
rename to Modules/Radiometry/Indices/include/otbMultiChannelRadiometricImageFilter.h
diff --git a/Code/BasicFilters/otbNDVIDataNodeFeatureFunction.h b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
similarity index 100%
rename from Code/BasicFilters/otbNDVIDataNodeFeatureFunction.h
rename to Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
diff --git a/Code/BasicFilters/otbNDVIDataNodeFeatureFunction.txx b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.txx
similarity index 100%
rename from Code/BasicFilters/otbNDVIDataNodeFeatureFunction.txx
rename to Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.txx
diff --git a/Code/Radiometry/otbRAndBAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbRAndBAndNIRIndexImageFilter.h
rename to Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
diff --git a/Code/Radiometry/otbRAndBAndNIRIndexImageFilter.txx b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.txx
similarity index 100%
rename from Code/Radiometry/otbRAndBAndNIRIndexImageFilter.txx
rename to Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.txx
diff --git a/Code/Radiometry/otbRAndGAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbRAndGAndNIRIndexImageFilter.h
rename to Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
diff --git a/Code/Radiometry/otbRAndGAndNIRIndexImageFilter.txx b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.txx
similarity index 100%
rename from Code/Radiometry/otbRAndGAndNIRIndexImageFilter.txx
rename to Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.txx
diff --git a/Code/Radiometry/otbRAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbRAndNIRIndexImageFilter.h
rename to Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
diff --git a/Code/Radiometry/otbRAndNIRIndexImageFilter.txx b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.txx
similarity index 100%
rename from Code/Radiometry/otbRAndNIRIndexImageFilter.txx
rename to Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.txx
diff --git a/Code/Radiometry/otbSoilIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h
similarity index 100%
rename from Code/Radiometry/otbSoilIndicesFunctor.h
rename to Modules/Radiometry/Indices/include/otbSoilIndicesFunctor.h
diff --git a/Code/Radiometry/otbVegetationIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h
similarity index 100%
rename from Code/Radiometry/otbVegetationIndicesFunctor.h
rename to Modules/Radiometry/Indices/include/otbVegetationIndicesFunctor.h
diff --git a/Code/Radiometry/otbWaterIndicesFunctor.h b/Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h
similarity index 100%
rename from Code/Radiometry/otbWaterIndicesFunctor.h
rename to Modules/Radiometry/Indices/include/otbWaterIndicesFunctor.h
diff --git a/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h b/Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
rename to Modules/Radiometry/Indices/include/otbWaterSqrtSpectralAngleImageFilter.h
diff --git a/Testing/Fa/00134-feature_extraction.cxx b/Modules/Radiometry/Indices/test/00134-feature_extraction.cxx
similarity index 100%
rename from Testing/Fa/00134-feature_extraction.cxx
rename to Modules/Radiometry/Indices/test/00134-feature_extraction.cxx
diff --git a/Testing/Code/Radiometry/otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbGAndRIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbGAndRIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbGAndRIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbGAndRIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbGAndRIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbGAndRIndexImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbGAndRIndexImageFilterNew.cxx
rename to Modules/Radiometry/Indices/test/otbGAndRIndexImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbIBGAndRAndNIRIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbIBGAndRAndNIRIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbIBGAndRAndNIRIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbIBGAndRAndNIRIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbIBMultiChannelGAndRAndNIRIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbIBMultiChannelGAndRAndNIRIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbIBMultiChannelGAndRAndNIRIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbIBMultiChannelGAndRAndNIRIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbISUMultiChannelRAndNIRIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbISUMultiChannelRAndNIRIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbISUMultiChannelRAndNIRIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbISUMultiChannelRAndNIRIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbISURAndNIRIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbISURAndNIRIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbISURAndNIRIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbISURAndNIRIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbLAIFromNDVILogarithmicFunctorTest.cxx b/Modules/Radiometry/Indices/test/otbLAIFromNDVILogarithmicFunctorTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLAIFromNDVILogarithmicFunctorTest.cxx
rename to Modules/Radiometry/Indices/test/otbLAIFromNDVILogarithmicFunctorTest.cxx
diff --git a/Testing/Code/Radiometry/otbLAIFromReflectancesLinearFunctorTest.cxx b/Modules/Radiometry/Indices/test/otbLAIFromReflectancesLinearFunctorTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLAIFromReflectancesLinearFunctorTest.cxx
rename to Modules/Radiometry/Indices/test/otbLAIFromReflectancesLinearFunctorTest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMBrightTest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMBrightTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMBrightTest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMBrightTest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexBIOTest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexBIOTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexBIOTest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexBIOTest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexBrightTest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexBrightTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexBrightTest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexBrightTest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexMIR1Test.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexMIR1Test.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexMIR1Test.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexMIR1Test.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexMIR2Test.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexMIR2Test.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexMIR2Test.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexMIR2Test.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexMIRTIRTest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexMIRTIRTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexMIRTIRTest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexMIRTIRTest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDBBBITest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexNDBBBITest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexNDBBBITest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexNDBBBITest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDBSITest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexNDBSITest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexNDBSITest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexNDBSITest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDSITest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexNDSITest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexNDSITest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexNDSITest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDSIVisTest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexNDSIVisTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexNDSIVisTest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexNDSIVisTest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDVITest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexNDVITest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexNDVITest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexNDVITest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNIRTest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexNIRTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexNIRTest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexNIRTest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexTIRTest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexTIRTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexTIRTest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexTIRTest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexVisTest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMIndexVisTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMIndexVisTest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMIndexVisTest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMKernelSpectralRules.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMKernelSpectralRules.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMKernelSpectralRules.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMKernelSpectralRules.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMLinguisticLabelsTest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMLinguisticLabelsTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMLinguisticLabelsTest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMLinguisticLabelsTest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMThickCloudTest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMThickCloudTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMThickCloudTest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMThickCloudTest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMThinCloudTest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMThinCloudTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMThinCloudTest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMThinCloudTest.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMVegetationTest.cxx b/Modules/Radiometry/Indices/test/otbLandsatTMVegetationTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMVegetationTest.cxx
rename to Modules/Radiometry/Indices/test/otbLandsatTMVegetationTest.cxx
diff --git a/Testing/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbMultiChannelGAndRIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbMultiChannelGAndRIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbMultiChannelGAndRIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbMultiChannelGAndRIndexImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbMultiChannelGAndRIndexImageFilterNew.cxx
rename to Modules/Radiometry/Indices/test/otbMultiChannelGAndRIndexImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx
rename to Modules/Radiometry/Indices/test/otbMultiChannelRAndBAndNIRVegetationIndexImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx
rename to Modules/Radiometry/Indices/test/otbMultiChannelRAndGAndNIRIndexImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx
rename to Modules/Radiometry/Indices/test/otbMultiChannelRAndNIRVegetationIndexImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbNDBIMultiChannelTM4AndTM5IndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbNDBIMultiChannelTM4AndTM5IndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbNDBIMultiChannelTM4AndTM5IndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbNDBIMultiChannelTM4AndTM5IndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbNDBITM4AndTM5IndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbNDBITM4AndTM5IndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbNDBITM4AndTM5IndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbNDBITM4AndTM5IndexImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbNDVIDataNodeFeatureFunction.cxx b/Modules/Radiometry/Indices/test/otbNDVIDataNodeFeatureFunction.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbNDVIDataNodeFeatureFunction.cxx
rename to Modules/Radiometry/Indices/test/otbNDVIDataNodeFeatureFunction.cxx
diff --git a/Testing/Code/Radiometry/otbNDWIMultiChannelWaterIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbNDWIMultiChannelWaterIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbNDWIMultiChannelWaterIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbNDWIMultiChannelWaterIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbNDWIWaterIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbNDWIWaterIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbNDWIWaterIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbNDWIWaterIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbRAndBAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbRAndBAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbRAndBAndNIRVegetationIndexImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilterNew.cxx
rename to Modules/Radiometry/Indices/test/otbRAndBAndNIRVegetationIndexImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbRAndGAndNIRVegetationIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbRAndGAndNIRVegetationIndexImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbRAndGAndNIRVegetationIndexImageFilterNew.cxx
rename to Modules/Radiometry/Indices/test/otbRAndGAndNIRVegetationIndexImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbRAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbRAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilterNew.cxx b/Modules/Radiometry/Indices/test/otbRAndNIRVegetationIndexImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilterNew.cxx
rename to Modules/Radiometry/Indices/test/otbRAndNIRVegetationIndexImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbWDVIRAndNIRVegetationIndexImageFilter.cxx b/Modules/Radiometry/Indices/test/otbWDVIRAndNIRVegetationIndexImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbWDVIRAndNIRVegetationIndexImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbWDVIRAndNIRVegetationIndexImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.cxx b/Modules/Radiometry/Indices/test/otbWaterSqrtSpectralAngleImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.cxx
rename to Modules/Radiometry/Indices/test/otbWaterSqrtSpectralAngleImageFilter.cxx
diff --git a/Code/Radiometry/otbAeronetData.h b/Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h
similarity index 100%
rename from Code/Radiometry/otbAeronetData.h
rename to Modules/Radiometry/OpticalCalibration/include/otbAeronetData.h
diff --git a/Code/Radiometry/otbAeronetFileReader.h b/Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
similarity index 100%
rename from Code/Radiometry/otbAeronetFileReader.h
rename to Modules/Radiometry/OpticalCalibration/include/otbAeronetFileReader.h
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.h b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
similarity index 100%
rename from Code/Radiometry/otbAtmosphericCorrectionParameters.h
rename to Modules/Radiometry/OpticalCalibration/include/otbAtmosphericCorrectionParameters.h
diff --git a/Code/Radiometry/otbAtmosphericRadiativeTerms.h b/Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h
similarity index 100%
rename from Code/Radiometry/otbAtmosphericRadiativeTerms.h
rename to Modules/Radiometry/OpticalCalibration/include/otbAtmosphericRadiativeTerms.h
diff --git a/Code/Radiometry/otbImageMetadataCorrectionParameters.h b/Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h
similarity index 100%
rename from Code/Radiometry/otbImageMetadataCorrectionParameters.h
rename to Modules/Radiometry/OpticalCalibration/include/otbImageMetadataCorrectionParameters.h
diff --git a/Code/Radiometry/otbImageToLuminanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbImageToLuminanceImageFilter.h
rename to Modules/Radiometry/OpticalCalibration/include/otbImageToLuminanceImageFilter.h
diff --git a/Code/Radiometry/otbImageToReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbImageToReflectanceImageFilter.h
rename to Modules/Radiometry/OpticalCalibration/include/otbImageToReflectanceImageFilter.h
diff --git a/Code/Radiometry/otbLandsatTMSpectralRuleBasedClassifier.h b/Modules/Radiometry/OpticalCalibration/include/otbLandsatTMSpectralRuleBasedClassifier.h
similarity index 100%
rename from Code/Radiometry/otbLandsatTMSpectralRuleBasedClassifier.h
rename to Modules/Radiometry/OpticalCalibration/include/otbLandsatTMSpectralRuleBasedClassifier.h
diff --git a/Code/Radiometry/otbLuminanceToImageImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbLuminanceToImageImageFilter.h
rename to Modules/Radiometry/OpticalCalibration/include/otbLuminanceToImageImageFilter.h
diff --git a/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbLuminanceToReflectanceImageFilter.h
rename to Modules/Radiometry/OpticalCalibration/include/otbLuminanceToReflectanceImageFilter.h
diff --git a/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h b/Modules/Radiometry/OpticalCalibration/include/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h
similarity index 100%
rename from Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h
rename to Modules/Radiometry/OpticalCalibration/include/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h
diff --git a/Code/Radiometry/otbReflectanceToImageImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbReflectanceToImageImageFilter.h
rename to Modules/Radiometry/OpticalCalibration/include/otbReflectanceToImageImageFilter.h
diff --git a/Code/Radiometry/otbReflectanceToLuminanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbReflectanceToLuminanceImageFilter.h
rename to Modules/Radiometry/OpticalCalibration/include/otbReflectanceToLuminanceImageFilter.h
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
rename to Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.txx
similarity index 100%
rename from Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
rename to Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.txx
diff --git a/Code/Radiometry/otbSIXSTraits.h b/Modules/Radiometry/OpticalCalibration/include/otbSIXSTraits.h
similarity index 100%
rename from Code/Radiometry/otbSIXSTraits.h
rename to Modules/Radiometry/OpticalCalibration/include/otbSIXSTraits.h
diff --git a/Code/IO/otbSpectralSensitivityReader.h b/Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h
similarity index 100%
rename from Code/IO/otbSpectralSensitivityReader.h
rename to Modules/Radiometry/OpticalCalibration/include/otbSpectralSensitivityReader.h
diff --git a/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
similarity index 100%
rename from Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
rename to Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
diff --git a/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
similarity index 100%
rename from Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
rename to Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
diff --git a/Code/Radiometry/otbVarSol.h b/Modules/Radiometry/OpticalCalibration/include/otbVarSol.h
similarity index 100%
rename from Code/Radiometry/otbVarSol.h
rename to Modules/Radiometry/OpticalCalibration/include/otbVarSol.h
diff --git a/Code/IO/otbWavelengthSpectralBands.h b/Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h
similarity index 100%
rename from Code/IO/otbWavelengthSpectralBands.h
rename to Modules/Radiometry/OpticalCalibration/include/otbWavelengthSpectralBands.h
diff --git a/Code/Radiometry/otbAeronetData.cxx b/Modules/Radiometry/OpticalCalibration/src/otbAeronetData.cxx
similarity index 100%
rename from Code/Radiometry/otbAeronetData.cxx
rename to Modules/Radiometry/OpticalCalibration/src/otbAeronetData.cxx
diff --git a/Code/Radiometry/otbAeronetFileReader.cxx b/Modules/Radiometry/OpticalCalibration/src/otbAeronetFileReader.cxx
similarity index 100%
rename from Code/Radiometry/otbAeronetFileReader.cxx
rename to Modules/Radiometry/OpticalCalibration/src/otbAeronetFileReader.cxx
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.cxx b/Modules/Radiometry/OpticalCalibration/src/otbAtmosphericCorrectionParameters.cxx
similarity index 100%
rename from Code/Radiometry/otbAtmosphericCorrectionParameters.cxx
rename to Modules/Radiometry/OpticalCalibration/src/otbAtmosphericCorrectionParameters.cxx
diff --git a/Code/Radiometry/otbAtmosphericRadiativeTerms.cxx b/Modules/Radiometry/OpticalCalibration/src/otbAtmosphericRadiativeTerms.cxx
similarity index 100%
rename from Code/Radiometry/otbAtmosphericRadiativeTerms.cxx
rename to Modules/Radiometry/OpticalCalibration/src/otbAtmosphericRadiativeTerms.cxx
diff --git a/Code/Radiometry/otbImageMetadataCorrectionParameters.cxx b/Modules/Radiometry/OpticalCalibration/src/otbImageMetadataCorrectionParameters.cxx
similarity index 100%
rename from Code/Radiometry/otbImageMetadataCorrectionParameters.cxx
rename to Modules/Radiometry/OpticalCalibration/src/otbImageMetadataCorrectionParameters.cxx
diff --git a/Code/Radiometry/otbSIXSTraits.cxx b/Modules/Radiometry/OpticalCalibration/src/otbSIXSTraits.cxx
similarity index 100%
rename from Code/Radiometry/otbSIXSTraits.cxx
rename to Modules/Radiometry/OpticalCalibration/src/otbSIXSTraits.cxx
diff --git a/Code/IO/otbSpectralSensitivityReader.cxx b/Modules/Radiometry/OpticalCalibration/src/otbSpectralSensitivityReader.cxx
similarity index 100%
rename from Code/IO/otbSpectralSensitivityReader.cxx
rename to Modules/Radiometry/OpticalCalibration/src/otbSpectralSensitivityReader.cxx
diff --git a/Code/IO/otbWavelengthSpectralBands.cxx b/Modules/Radiometry/OpticalCalibration/src/otbWavelengthSpectralBands.cxx
similarity index 100%
rename from Code/IO/otbWavelengthSpectralBands.cxx
rename to Modules/Radiometry/OpticalCalibration/src/otbWavelengthSpectralBands.cxx
diff --git a/Testing/Code/Radiometry/otbAeronetExtractData.cxx b/Modules/Radiometry/OpticalCalibration/test/otbAeronetExtractData.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbAeronetExtractData.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbAeronetExtractData.cxx
diff --git a/Testing/Code/Radiometry/otbAeronetExtractDataBadData.cxx b/Modules/Radiometry/OpticalCalibration/test/otbAeronetExtractDataBadData.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbAeronetExtractDataBadData.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbAeronetExtractDataBadData.cxx
diff --git a/Testing/Code/Radiometry/otbAeronetNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbAeronetNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbAeronetNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbAeronetNew.cxx
diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericCorrectionParametersNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbAtmosphericCorrectionParametersNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbAtmosphericCorrectionParametersNew.cxx
diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx b/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericCorrectionSequencement.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbAtmosphericCorrectionSequencement.cxx
diff --git a/Testing/Code/Radiometry/otbAtmosphericRadiativeTermsTest.cxx b/Modules/Radiometry/OpticalCalibration/test/otbAtmosphericRadiativeTermsTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbAtmosphericRadiativeTermsTest.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbAtmosphericRadiativeTermsTest.cxx
diff --git a/Testing/Code/Radiometry/otbImageMetadataCorrectionParametersNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageMetadataCorrectionParametersNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbImageMetadataCorrectionParametersNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbImageMetadataCorrectionParametersNew.cxx
diff --git a/Testing/Code/Radiometry/otbImageToLuminanceImageFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbImageToLuminanceImageFilter.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilterAuto.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilterAuto.cxx
diff --git a/Testing/Code/Radiometry/otbImageToLuminanceImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbImageToLuminanceImageFilterNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbImageToLuminanceImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbImageToReflectanceImageFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageToReflectanceImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbImageToReflectanceImageFilter.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbImageToReflectanceImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbImageToReflectanceImageFilterAuto.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageToReflectanceImageFilterAuto.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbImageToReflectanceImageFilterAuto.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbImageToReflectanceImageFilterAuto.cxx
diff --git a/Testing/Code/Radiometry/otbImageToReflectanceImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbImageToReflectanceImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbImageToReflectanceImageFilterNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbImageToReflectanceImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbLandsatTMSpectralRuleBasedClassifierTest.cxx b/Modules/Radiometry/OpticalCalibration/test/otbLandsatTMSpectralRuleBasedClassifierTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLandsatTMSpectralRuleBasedClassifierTest.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbLandsatTMSpectralRuleBasedClassifierTest.cxx
diff --git a/Testing/Code/Radiometry/otbLuminanceToImageImageFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLuminanceToImageImageFilter.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbLuminanceToImageImageFilterAuto.cxx b/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilterAuto.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLuminanceToImageImageFilterAuto.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilterAuto.cxx
diff --git a/Testing/Code/Radiometry/otbLuminanceToImageImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLuminanceToImageImageFilterNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbLuminanceToImageImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilter.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterAuto.cxx b/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilterAuto.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterAuto.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilterAuto.cxx
diff --git a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbLuminanceToReflectanceImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx b/Modules/Radiometry/OpticalCalibration/test/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
diff --git a/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbRadiometryCorrectionParametersToAtmosphericRadiativeTermsNew.cxx
diff --git a/Testing/Code/Radiometry/otbReflectanceToImageImageFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbReflectanceToImageImageFilter.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbReflectanceToImageImageFilterAuto.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilterAuto.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbReflectanceToImageImageFilterAuto.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilterAuto.cxx
diff --git a/Testing/Code/Radiometry/otbReflectanceToImageImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbReflectanceToImageImageFilterNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbReflectanceToImageImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilter.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilterAuto.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilterAuto.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilterAuto.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilterAuto.cxx
diff --git a/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilterNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbReflectanceToLuminanceImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx b/Modules/Radiometry/OpticalCalibration/test/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
diff --git a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbSIXSTraitsComputeAtmosphericParameters.cxx b/Modules/Radiometry/OpticalCalibration/test/otbSIXSTraitsComputeAtmosphericParameters.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSIXSTraitsComputeAtmosphericParameters.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbSIXSTraitsComputeAtmosphericParameters.cxx
diff --git a/Testing/Code/Radiometry/otbSIXSTraitsTest.cxx b/Modules/Radiometry/OpticalCalibration/test/otbSIXSTraitsTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSIXSTraitsTest.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbSIXSTraitsTest.cxx
diff --git a/Testing/Code/IO/otbSpectralSensitivityReaderNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbSpectralSensitivityReaderNew.cxx
similarity index 100%
rename from Testing/Code/IO/otbSpectralSensitivityReaderNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbSpectralSensitivityReaderNew.cxx
diff --git a/Testing/Code/IO/otbSpectralSensitivityReaderTest.cxx b/Modules/Radiometry/OpticalCalibration/test/otbSpectralSensitivityReaderTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbSpectralSensitivityReaderTest.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbSpectralSensitivityReaderTest.cxx
diff --git a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx b/Modules/Radiometry/OpticalCalibration/test/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx
diff --git a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilterNew.cxx b/Modules/Radiometry/OpticalCalibration/test/otbSurfaceAdjacencyEffectCorrectionSchemeFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilterNew.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbSurfaceAdjacencyEffectCorrectionSchemeFilterNew.cxx
diff --git a/Testing/Code/IO/otbWavelengthSpectralBandsTest.cxx b/Modules/Radiometry/OpticalCalibration/test/otbWavelengthSpectralBandsTest.cxx
similarity index 100%
rename from Testing/Code/IO/otbWavelengthSpectralBandsTest.cxx
rename to Modules/Radiometry/OpticalCalibration/test/otbWavelengthSpectralBandsTest.cxx
diff --git a/Code/Radiometry/otbSarBrightnessFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
similarity index 100%
rename from Code/Radiometry/otbSarBrightnessFunction.h
rename to Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
diff --git a/Code/Radiometry/otbSarBrightnessFunction.txx b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.txx
similarity index 100%
rename from Code/Radiometry/otbSarBrightnessFunction.txx
rename to Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.txx
diff --git a/Code/Radiometry/otbSarBrightnessFunctor.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunctor.h
similarity index 100%
rename from Code/Radiometry/otbSarBrightnessFunctor.h
rename to Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunctor.h
diff --git a/Code/Radiometry/otbSarBrightnessToImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbSarBrightnessToImageFilter.h
rename to Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
diff --git a/Code/Radiometry/otbSarBrightnessToImageFilter.txx b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.txx
similarity index 100%
rename from Code/Radiometry/otbSarBrightnessToImageFilter.txx
rename to Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.txx
diff --git a/Code/Radiometry/otbSarParametricMapFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
similarity index 100%
rename from Code/Radiometry/otbSarParametricMapFunction.h
rename to Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
diff --git a/Code/Radiometry/otbSarParametricMapFunction.txx b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.txx
similarity index 100%
rename from Code/Radiometry/otbSarParametricMapFunction.txx
rename to Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.txx
diff --git a/Code/Radiometry/otbSarRadiometricCalibrationFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
similarity index 100%
rename from Code/Radiometry/otbSarRadiometricCalibrationFunction.h
rename to Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
diff --git a/Code/Radiometry/otbSarRadiometricCalibrationFunction.txx b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.txx
similarity index 100%
rename from Code/Radiometry/otbSarRadiometricCalibrationFunction.txx
rename to Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.txx
diff --git a/Code/Radiometry/otbSarRadiometricCalibrationFunctor.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunctor.h
similarity index 100%
rename from Code/Radiometry/otbSarRadiometricCalibrationFunctor.h
rename to Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunctor.h
diff --git a/Code/Radiometry/otbSarRadiometricCalibrationToImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbSarRadiometricCalibrationToImageFilter.h
rename to Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
diff --git a/Code/Radiometry/otbSarRadiometricCalibrationToImageFilter.txx b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.txx
similarity index 100%
rename from Code/Radiometry/otbSarRadiometricCalibrationToImageFilter.txx
rename to Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.txx
diff --git a/Code/Radiometry/otbTerraSarBrightnessFunctor.h b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
similarity index 100%
rename from Code/Radiometry/otbTerraSarBrightnessFunctor.h
rename to Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
diff --git a/Code/Radiometry/otbTerraSarBrightnessFunctor.txx b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.txx
similarity index 100%
rename from Code/Radiometry/otbTerraSarBrightnessFunctor.txx
rename to Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.txx
diff --git a/Code/Radiometry/otbTerraSarBrightnessImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
similarity index 100%
rename from Code/Radiometry/otbTerraSarBrightnessImageFilter.h
rename to Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
diff --git a/Code/Radiometry/otbTerraSarBrightnessImageFilter.txx b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.txx
similarity index 100%
rename from Code/Radiometry/otbTerraSarBrightnessImageFilter.txx
rename to Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.txx
diff --git a/Testing/Code/Radiometry/otbSarBrightnessFunction.cxx b/Modules/Radiometry/SARCalibration/test/otbSarBrightnessFunction.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarBrightnessFunction.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarBrightnessFunction.cxx
diff --git a/Testing/Code/Radiometry/otbSarBrightnessFunctionWithoutNoise.cxx b/Modules/Radiometry/SARCalibration/test/otbSarBrightnessFunctionWithoutNoise.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarBrightnessFunctionWithoutNoise.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarBrightnessFunctionWithoutNoise.cxx
diff --git a/Testing/Code/Radiometry/otbSarBrightnessFunctor.cxx b/Modules/Radiometry/SARCalibration/test/otbSarBrightnessFunctor.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarBrightnessFunctor.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarBrightnessFunctor.cxx
diff --git a/Testing/Code/Radiometry/otbSarBrightnessFunctorWithoutNoise.cxx b/Modules/Radiometry/SARCalibration/test/otbSarBrightnessFunctorWithoutNoise.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarBrightnessFunctorWithoutNoise.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarBrightnessFunctorWithoutNoise.cxx
diff --git a/Testing/Code/Radiometry/otbSarBrightnessToImageFilterTest.cxx b/Modules/Radiometry/SARCalibration/test/otbSarBrightnessToImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarBrightnessToImageFilterTest.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarBrightnessToImageFilterTest.cxx
diff --git a/Testing/Code/Radiometry/otbSarBrightnessToImageFilterTestWithoutNoise.cxx b/Modules/Radiometry/SARCalibration/test/otbSarBrightnessToImageFilterTestWithoutNoise.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarBrightnessToImageFilterTestWithoutNoise.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarBrightnessToImageFilterTestWithoutNoise.cxx
diff --git a/Testing/Code/Radiometry/otbSarBrightnessToImageWithComplexPixelFilterTest.cxx b/Modules/Radiometry/SARCalibration/test/otbSarBrightnessToImageWithComplexPixelFilterTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarBrightnessToImageWithComplexPixelFilterTest.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarBrightnessToImageWithComplexPixelFilterTest.cxx
diff --git a/Testing/Code/Radiometry/otbSarParametricMapFunctionTest.cxx b/Modules/Radiometry/SARCalibration/test/otbSarParametricMapFunctionTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarParametricMapFunctionTest.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarParametricMapFunctionTest.cxx
diff --git a/Testing/Code/Radiometry/otbSarParametricMapFunctionToImageFilter.cxx b/Modules/Radiometry/SARCalibration/test/otbSarParametricMapFunctionToImageFilter.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarParametricMapFunctionToImageFilter.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarParametricMapFunctionToImageFilter.cxx
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationFunction.cxx b/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationFunction.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarRadiometricCalibrationFunction.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationFunction.cxx
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctionWithoutNoise.cxx b/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationFunctionWithoutNoise.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctionWithoutNoise.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationFunctionWithoutNoise.cxx
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctor.cxx b/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationFunctor.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctor.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationFunctor.cxx
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctorWithoutNoise.cxx b/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationFunctorWithoutNoise.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarRadiometricCalibrationFunctorWithoutNoise.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationFunctorWithoutNoise.cxx
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterCompareTest.cxx b/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterCompareTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterCompareTest.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterCompareTest.cxx
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx b/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx b/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx b/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithRealPixelTest.cxx b/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterWithRealPixelTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithRealPixelTest.cxx
rename to Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterWithRealPixelTest.cxx
diff --git a/Testing/Code/Radiometry/otbTerraSarBrightnessFunctor.cxx b/Modules/Radiometry/SARCalibration/test/otbTerraSarBrightnessFunctor.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbTerraSarBrightnessFunctor.cxx
rename to Modules/Radiometry/SARCalibration/test/otbTerraSarBrightnessFunctor.cxx
diff --git a/Testing/Code/Radiometry/otbTerraSarBrightnessImageComplexFilterTest.cxx b/Modules/Radiometry/SARCalibration/test/otbTerraSarBrightnessImageComplexFilterTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbTerraSarBrightnessImageComplexFilterTest.cxx
rename to Modules/Radiometry/SARCalibration/test/otbTerraSarBrightnessImageComplexFilterTest.cxx
diff --git a/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterNew.cxx b/Modules/Radiometry/SARCalibration/test/otbTerraSarBrightnessImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterNew.cxx
rename to Modules/Radiometry/SARCalibration/test/otbTerraSarBrightnessImageFilterNew.cxx
diff --git a/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterTest.cxx b/Modules/Radiometry/SARCalibration/test/otbTerraSarBrightnessImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterTest.cxx
rename to Modules/Radiometry/SARCalibration/test/otbTerraSarBrightnessImageFilterTest.cxx
diff --git a/Code/Simulation/otbAtmosphericEffects.h b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
similarity index 100%
rename from Code/Simulation/otbAtmosphericEffects.h
rename to Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
diff --git a/Code/Simulation/otbAtmosphericEffects.txx b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.txx
similarity index 100%
rename from Code/Simulation/otbAtmosphericEffects.txx
rename to Modules/Radiometry/Simulation/include/otbAtmosphericEffects.txx
diff --git a/Code/Simulation/otbDataSpecP5B.h b/Modules/Radiometry/Simulation/include/otbDataSpecP5B.h
similarity index 100%
rename from Code/Simulation/otbDataSpecP5B.h
rename to Modules/Radiometry/Simulation/include/otbDataSpecP5B.h
diff --git a/Code/Simulation/otbImageSimulationMethod.h b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
similarity index 100%
rename from Code/Simulation/otbImageSimulationMethod.h
rename to Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
diff --git a/Code/Simulation/otbImageSimulationMethod.txx b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.txx
similarity index 100%
rename from Code/Simulation/otbImageSimulationMethod.txx
rename to Modules/Radiometry/Simulation/include/otbImageSimulationMethod.txx
diff --git a/Code/Simulation/otbLabelMapToSimulatedImageFilter.h b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
similarity index 100%
rename from Code/Simulation/otbLabelMapToSimulatedImageFilter.h
rename to Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
diff --git a/Code/Simulation/otbLabelMapToSimulatedImageFilter.txx b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.txx
similarity index 100%
rename from Code/Simulation/otbLabelMapToSimulatedImageFilter.txx
rename to Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.txx
diff --git a/Code/Simulation/otbLabelToProSailParameters.h b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
similarity index 100%
rename from Code/Simulation/otbLabelToProSailParameters.h
rename to Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
diff --git a/Code/Simulation/otbLabelToProSailParameters.txx b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.txx
similarity index 100%
rename from Code/Simulation/otbLabelToProSailParameters.txx
rename to Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.txx
diff --git a/Code/Simulation/otbLabelToSimulationParametersBase.h b/Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h
similarity index 100%
rename from Code/Simulation/otbLabelToSimulationParametersBase.h
rename to Modules/Radiometry/Simulation/include/otbLabelToSimulationParametersBase.h
diff --git a/Code/Simulation/otbLeafParameters.h b/Modules/Radiometry/Simulation/include/otbLeafParameters.h
similarity index 100%
rename from Code/Simulation/otbLeafParameters.h
rename to Modules/Radiometry/Simulation/include/otbLeafParameters.h
diff --git a/Code/Simulation/otbProSailParameters.h b/Modules/Radiometry/Simulation/include/otbProSailParameters.h
similarity index 100%
rename from Code/Simulation/otbProSailParameters.h
rename to Modules/Radiometry/Simulation/include/otbProSailParameters.h
diff --git a/Code/Simulation/otbProspectModel.h b/Modules/Radiometry/Simulation/include/otbProspectModel.h
similarity index 100%
rename from Code/Simulation/otbProspectModel.h
rename to Modules/Radiometry/Simulation/include/otbProspectModel.h
diff --git a/Code/Simulation/otbReduceSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
similarity index 100%
rename from Code/Simulation/otbReduceSpectralResponse.h
rename to Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
diff --git a/Code/Simulation/otbReduceSpectralResponse.txx b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.txx
similarity index 100%
rename from Code/Simulation/otbReduceSpectralResponse.txx
rename to Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.txx
diff --git a/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
similarity index 100%
rename from Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.h
rename to Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
diff --git a/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.txx b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.txx
similarity index 100%
rename from Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.txx
rename to Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.txx
diff --git a/Code/Simulation/otbSailModel.h b/Modules/Radiometry/Simulation/include/otbSailModel.h
similarity index 100%
rename from Code/Simulation/otbSailModel.h
rename to Modules/Radiometry/Simulation/include/otbSailModel.h
diff --git a/Code/Simulation/otbSatelliteRSR.h b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
similarity index 100%
rename from Code/Simulation/otbSatelliteRSR.h
rename to Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
diff --git a/Code/Simulation/otbSatelliteRSR.txx b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.txx
similarity index 100%
rename from Code/Simulation/otbSatelliteRSR.txx
rename to Modules/Radiometry/Simulation/include/otbSatelliteRSR.txx
diff --git a/Code/Simulation/otbSimulationStep1Base.h b/Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h
similarity index 100%
rename from Code/Simulation/otbSimulationStep1Base.h
rename to Modules/Radiometry/Simulation/include/otbSimulationStep1Base.h
diff --git a/Code/Simulation/otbSimulationStep2Base.h b/Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h
similarity index 100%
rename from Code/Simulation/otbSimulationStep2Base.h
rename to Modules/Radiometry/Simulation/include/otbSimulationStep2Base.h
diff --git a/Code/Simulation/otbSpatialisationFilter.h b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
similarity index 100%
rename from Code/Simulation/otbSpatialisationFilter.h
rename to Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
diff --git a/Code/Simulation/otbSpatialisationFilter.txx b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.txx
similarity index 100%
rename from Code/Simulation/otbSpatialisationFilter.txx
rename to Modules/Radiometry/Simulation/include/otbSpatialisationFilter.txx
diff --git a/Code/Simulation/otbSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
similarity index 100%
rename from Code/Simulation/otbSpectralResponse.h
rename to Modules/Radiometry/Simulation/include/otbSpectralResponse.h
diff --git a/Code/Simulation/otbSpectralResponse.txx b/Modules/Radiometry/Simulation/include/otbSpectralResponse.txx
similarity index 100%
rename from Code/Simulation/otbSpectralResponse.txx
rename to Modules/Radiometry/Simulation/include/otbSpectralResponse.txx
diff --git a/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
similarity index 100%
rename from Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h
rename to Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
diff --git a/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.txx b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.txx
similarity index 100%
rename from Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.txx
rename to Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.txx
diff --git a/Code/Simulation/otbDataSpecP5B.cxx b/Modules/Radiometry/Simulation/src/otbDataSpecP5B.cxx
similarity index 100%
rename from Code/Simulation/otbDataSpecP5B.cxx
rename to Modules/Radiometry/Simulation/src/otbDataSpecP5B.cxx
diff --git a/Code/Simulation/otbLeafParameters.cxx b/Modules/Radiometry/Simulation/src/otbLeafParameters.cxx
similarity index 100%
rename from Code/Simulation/otbLeafParameters.cxx
rename to Modules/Radiometry/Simulation/src/otbLeafParameters.cxx
diff --git a/Code/Simulation/otbProspectModel.cxx b/Modules/Radiometry/Simulation/src/otbProspectModel.cxx
similarity index 100%
rename from Code/Simulation/otbProspectModel.cxx
rename to Modules/Radiometry/Simulation/src/otbProspectModel.cxx
diff --git a/Code/Simulation/otbSailModel.cxx b/Modules/Radiometry/Simulation/src/otbSailModel.cxx
similarity index 100%
rename from Code/Simulation/otbSailModel.cxx
rename to Modules/Radiometry/Simulation/src/otbSailModel.cxx
diff --git a/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx b/Modules/Radiometry/Simulation/test/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
rename to Modules/Radiometry/Simulation/test/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
diff --git a/Testing/Code/Simulation/otbAtmosphericEffects.cxx b/Modules/Radiometry/Simulation/test/otbAtmosphericEffects.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbAtmosphericEffects.cxx
rename to Modules/Radiometry/Simulation/test/otbAtmosphericEffects.cxx
diff --git a/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx b/Modules/Radiometry/Simulation/test/otbImageSimulationMethodKMeansClassif.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx
rename to Modules/Radiometry/Simulation/test/otbImageSimulationMethodKMeansClassif.cxx
diff --git a/Testing/Code/Simulation/otbImageSimulationMethodSVMClassif.cxx b/Modules/Radiometry/Simulation/test/otbImageSimulationMethodSVMClassif.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbImageSimulationMethodSVMClassif.cxx
rename to Modules/Radiometry/Simulation/test/otbImageSimulationMethodSVMClassif.cxx
diff --git a/Testing/Code/Simulation/otbImageSimulationMethodWithSpatialisationTest.cxx b/Modules/Radiometry/Simulation/test/otbImageSimulationMethodWithSpatialisationTest.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbImageSimulationMethodWithSpatialisationTest.cxx
rename to Modules/Radiometry/Simulation/test/otbImageSimulationMethodWithSpatialisationTest.cxx
diff --git a/Testing/Code/Simulation/otbImageSimulationMethodWithVectorDataTest.cxx b/Modules/Radiometry/Simulation/test/otbImageSimulationMethodWithVectorDataTest.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbImageSimulationMethodWithVectorDataTest.cxx
rename to Modules/Radiometry/Simulation/test/otbImageSimulationMethodWithVectorDataTest.cxx
diff --git a/Testing/Code/Simulation/otbLabelMapToSimulatedImageFilterTest.cxx b/Modules/Radiometry/Simulation/test/otbLabelMapToSimulatedImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbLabelMapToSimulatedImageFilterTest.cxx
rename to Modules/Radiometry/Simulation/test/otbLabelMapToSimulatedImageFilterTest.cxx
diff --git a/Testing/Code/Simulation/otbProspectReflTest.cxx b/Modules/Radiometry/Simulation/test/otbProspectReflTest.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbProspectReflTest.cxx
rename to Modules/Radiometry/Simulation/test/otbProspectReflTest.cxx
diff --git a/Testing/Code/Simulation/otbProspectTransTest.cxx b/Modules/Radiometry/Simulation/test/otbProspectTransTest.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbProspectTransTest.cxx
rename to Modules/Radiometry/Simulation/test/otbProspectTransTest.cxx
diff --git a/Testing/Code/Simulation/otbReduceSpectralResponse.cxx b/Modules/Radiometry/Simulation/test/otbReduceSpectralResponse.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbReduceSpectralResponse.cxx
rename to Modules/Radiometry/Simulation/test/otbReduceSpectralResponse.cxx
diff --git a/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx b/Modules/Radiometry/Simulation/test/otbReduceSpectralResponseClassifierRAndNIR.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx
rename to Modules/Radiometry/Simulation/test/otbReduceSpectralResponseClassifierRAndNIR.cxx
diff --git a/Testing/Code/Simulation/otbReduceSpectralResponseNew.cxx b/Modules/Radiometry/Simulation/test/otbReduceSpectralResponseNew.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbReduceSpectralResponseNew.cxx
rename to Modules/Radiometry/Simulation/test/otbReduceSpectralResponseNew.cxx
diff --git a/Testing/Code/Simulation/otbReduceSpectralResponseSVMClassifier.cxx b/Modules/Radiometry/Simulation/test/otbReduceSpectralResponseSVMClassifier.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbReduceSpectralResponseSVMClassifier.cxx
rename to Modules/Radiometry/Simulation/test/otbReduceSpectralResponseSVMClassifier.cxx
diff --git a/Testing/Code/Simulation/otbSailReflHTest.cxx b/Modules/Radiometry/Simulation/test/otbSailReflHTest.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbSailReflHTest.cxx
rename to Modules/Radiometry/Simulation/test/otbSailReflHTest.cxx
diff --git a/Testing/Code/Simulation/otbSailReflVTest.cxx b/Modules/Radiometry/Simulation/test/otbSailReflVTest.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbSailReflVTest.cxx
rename to Modules/Radiometry/Simulation/test/otbSailReflVTest.cxx
diff --git a/Testing/Code/Simulation/otbSatelliteRSR.cxx b/Modules/Radiometry/Simulation/test/otbSatelliteRSR.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbSatelliteRSR.cxx
rename to Modules/Radiometry/Simulation/test/otbSatelliteRSR.cxx
diff --git a/Testing/Code/Simulation/otbSatelliteRSRNew.cxx b/Modules/Radiometry/Simulation/test/otbSatelliteRSRNew.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbSatelliteRSRNew.cxx
rename to Modules/Radiometry/Simulation/test/otbSatelliteRSRNew.cxx
diff --git a/Testing/Code/Simulation/otbSpatialisationTest.cxx b/Modules/Radiometry/Simulation/test/otbSpatialisationTest.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbSpatialisationTest.cxx
rename to Modules/Radiometry/Simulation/test/otbSpatialisationTest.cxx
diff --git a/Testing/Code/Simulation/otbSpatialisationTestNew.cxx b/Modules/Radiometry/Simulation/test/otbSpatialisationTestNew.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbSpatialisationTestNew.cxx
rename to Modules/Radiometry/Simulation/test/otbSpatialisationTestNew.cxx
diff --git a/Testing/Code/Simulation/otbSpectralResponse.cxx b/Modules/Radiometry/Simulation/test/otbSpectralResponse.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbSpectralResponse.cxx
rename to Modules/Radiometry/Simulation/test/otbSpectralResponse.cxx
diff --git a/Testing/Code/Simulation/otbSpectralResponseNew.cxx b/Modules/Radiometry/Simulation/test/otbSpectralResponseNew.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbSpectralResponseNew.cxx
rename to Modules/Radiometry/Simulation/test/otbSpectralResponseNew.cxx
diff --git a/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx b/Modules/Radiometry/Simulation/test/otbSurfaceReflectanceToReflectanceFilterNew.cxx
similarity index 100%
rename from Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx
rename to Modules/Radiometry/Simulation/test/otbSurfaceReflectanceToReflectanceFilterNew.cxx
diff --git a/Code/DisparityMap/otbDisparityMapEstimationMethod.h b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
similarity index 100%
rename from Code/DisparityMap/otbDisparityMapEstimationMethod.h
rename to Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
diff --git a/Code/DisparityMap/otbDisparityMapEstimationMethod.txx b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.txx
similarity index 100%
rename from Code/DisparityMap/otbDisparityMapEstimationMethod.txx
rename to Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.txx
diff --git a/Code/DisparityMap/otbDisparityMapMedianFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
similarity index 100%
rename from Code/DisparityMap/otbDisparityMapMedianFilter.h
rename to Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
diff --git a/Code/DisparityMap/otbDisparityMapMedianFilter.txx b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbDisparityMapMedianFilter.txx
rename to Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.txx
diff --git a/Code/DisparityMap/otbDisparityMapTo3DFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
similarity index 100%
rename from Code/DisparityMap/otbDisparityMapTo3DFilter.h
rename to Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
diff --git a/Code/DisparityMap/otbDisparityMapTo3DFilter.txx b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbDisparityMapTo3DFilter.txx
rename to Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.txx
diff --git a/Code/DisparityMap/otbDisparityMapToDEMFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
similarity index 100%
rename from Code/DisparityMap/otbDisparityMapToDEMFilter.h
rename to Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
diff --git a/Code/DisparityMap/otbDisparityMapToDEMFilter.txx b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbDisparityMapToDEMFilter.txx
rename to Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.txx
diff --git a/Code/DisparityMap/otbDisparityTranslateFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
similarity index 100%
rename from Code/DisparityMap/otbDisparityTranslateFilter.h
rename to Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
diff --git a/Code/DisparityMap/otbDisparityTranslateFilter.txx b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbDisparityTranslateFilter.txx
rename to Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.txx
diff --git a/Code/DisparityMap/otbMultiDisparityMapTo3DFilter.h b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
similarity index 100%
rename from Code/DisparityMap/otbMultiDisparityMapTo3DFilter.h
rename to Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
diff --git a/Code/DisparityMap/otbMultiDisparityMapTo3DFilter.txx b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbMultiDisparityMapTo3DFilter.txx
rename to Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.txx
diff --git a/Code/DisparityMap/otbSubPixelDisparityImageFilter.h b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
similarity index 100%
rename from Code/DisparityMap/otbSubPixelDisparityImageFilter.h
rename to Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
diff --git a/Code/DisparityMap/otbSubPixelDisparityImageFilter.txx b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbSubPixelDisparityImageFilter.txx
rename to Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.txx
diff --git a/Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx b/Modules/Registration/DisparityMap/test/otbDisparityMapEstimationMethod.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbDisparityMapEstimationMethod.cxx
rename to Modules/Registration/DisparityMap/test/otbDisparityMapEstimationMethod.cxx
diff --git a/Testing/Code/DisparityMap/otbDisparityMapEstimationMethodNew.cxx b/Modules/Registration/DisparityMap/test/otbDisparityMapEstimationMethodNew.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbDisparityMapEstimationMethodNew.cxx
rename to Modules/Registration/DisparityMap/test/otbDisparityMapEstimationMethodNew.cxx
diff --git a/Testing/Code/DisparityMap/otbDisparityMapMedianFilter.cxx b/Modules/Registration/DisparityMap/test/otbDisparityMapMedianFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbDisparityMapMedianFilter.cxx
rename to Modules/Registration/DisparityMap/test/otbDisparityMapMedianFilter.cxx
diff --git a/Testing/Code/DisparityMap/otbDisparityMapTo3DFilter.cxx b/Modules/Registration/DisparityMap/test/otbDisparityMapTo3DFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbDisparityMapTo3DFilter.cxx
rename to Modules/Registration/DisparityMap/test/otbDisparityMapTo3DFilter.cxx
diff --git a/Testing/Code/DisparityMap/otbDisparityMapToDEMFilter.cxx b/Modules/Registration/DisparityMap/test/otbDisparityMapToDEMFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbDisparityMapToDEMFilter.cxx
rename to Modules/Registration/DisparityMap/test/otbDisparityMapToDEMFilter.cxx
diff --git a/Testing/Code/DisparityMap/otbDisparityTranslateFilter.cxx b/Modules/Registration/DisparityMap/test/otbDisparityTranslateFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbDisparityTranslateFilter.cxx
rename to Modules/Registration/DisparityMap/test/otbDisparityTranslateFilter.cxx
diff --git a/Testing/Code/DisparityMap/otbMultiDisparityMapTo3DFilter.cxx b/Modules/Registration/DisparityMap/test/otbMultiDisparityMapTo3DFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbMultiDisparityMapTo3DFilter.cxx
rename to Modules/Registration/DisparityMap/test/otbMultiDisparityMapTo3DFilter.cxx
diff --git a/Testing/Code/DisparityMap/otbSubPixelDisparityImageFilter.cxx b/Modules/Registration/DisparityMap/test/otbSubPixelDisparityImageFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbSubPixelDisparityImageFilter.cxx
rename to Modules/Registration/DisparityMap/test/otbSubPixelDisparityImageFilter.cxx
diff --git a/Code/DisparityMap/otbBSplinesInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
similarity index 100%
rename from Code/DisparityMap/otbBSplinesInterpolateDisplacementFieldGenerator.h
rename to Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
diff --git a/Code/DisparityMap/otbBSplinesInterpolateDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.txx
similarity index 100%
rename from Code/DisparityMap/otbBSplinesInterpolateDisplacementFieldGenerator.txx
rename to Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.txx
diff --git a/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
similarity index 100%
rename from Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
rename to Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
diff --git a/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx
similarity index 100%
rename from Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx
rename to Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx
diff --git a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
similarity index 100%
rename from Code/DisparityMap/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
rename to Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
diff --git a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.txx
similarity index 100%
rename from Code/DisparityMap/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.txx
rename to Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.txx
diff --git a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
similarity index 100%
rename from Code/DisparityMap/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
rename to Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
diff --git a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.txx
similarity index 100%
rename from Code/DisparityMap/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.txx
rename to Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.txx
diff --git a/Code/DisparityMap/otbNearestPointDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
similarity index 100%
rename from Code/DisparityMap/otbNearestPointDisplacementFieldGenerator.h
rename to Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
diff --git a/Code/DisparityMap/otbNearestPointDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.txx
similarity index 100%
rename from Code/DisparityMap/otbNearestPointDisplacementFieldGenerator.txx
rename to Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.txx
diff --git a/Code/DisparityMap/otbNearestTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
similarity index 100%
rename from Code/DisparityMap/otbNearestTransformDisplacementFieldGenerator.h
rename to Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
diff --git a/Code/DisparityMap/otbNearestTransformDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.txx
similarity index 100%
rename from Code/DisparityMap/otbNearestTransformDisplacementFieldGenerator.txx
rename to Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.txx
diff --git a/Code/DisparityMap/otbPointSetToDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
similarity index 100%
rename from Code/DisparityMap/otbPointSetToDisplacementFieldGenerator.h
rename to Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
diff --git a/Code/DisparityMap/otbPointSetToDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.txx
similarity index 100%
rename from Code/DisparityMap/otbPointSetToDisplacementFieldGenerator.txx
rename to Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.txx
diff --git a/Code/DisparityMap/otbPointSetWithTransformToDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
similarity index 100%
rename from Code/DisparityMap/otbPointSetWithTransformToDisplacementFieldGenerator.h
rename to Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
diff --git a/Code/DisparityMap/otbPointSetWithTransformToDisplacementFieldGenerator.txx b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.txx
similarity index 100%
rename from Code/DisparityMap/otbPointSetWithTransformToDisplacementFieldGenerator.txx
rename to Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.txx
diff --git a/Code/DisparityMap/otbStereorectificationDisplacementFieldSource.h b/Modules/Registration/DisplacementField/include/otbStereorectificationDisplacementFieldSource.h
similarity index 100%
rename from Code/DisparityMap/otbStereorectificationDisplacementFieldSource.h
rename to Modules/Registration/DisplacementField/include/otbStereorectificationDisplacementFieldSource.h
diff --git a/Code/DisparityMap/otbStereorectificationDisplacementFieldSource.txx b/Modules/Registration/DisplacementField/include/otbStereorectificationDisplacementFieldSource.txx
similarity index 100%
rename from Code/DisparityMap/otbStereorectificationDisplacementFieldSource.txx
rename to Modules/Registration/DisplacementField/include/otbStereorectificationDisplacementFieldSource.txx
diff --git a/Testing/Code/DisparityMap/otbBSplinesInterpolateDisplacementFieldGenerator.cxx b/Modules/Registration/DisplacementField/test/otbBSplinesInterpolateDisplacementFieldGenerator.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbBSplinesInterpolateDisplacementFieldGenerator.cxx
rename to Modules/Registration/DisplacementField/test/otbBSplinesInterpolateDisplacementFieldGenerator.cxx
diff --git a/Testing/Code/DisparityMap/otbBSplinesInterpolateDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbBSplinesInterpolateDisplacementFieldGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbBSplinesInterpolateDisplacementFieldGeneratorNew.cxx
rename to Modules/Registration/DisplacementField/test/otbBSplinesInterpolateDisplacementFieldGeneratorNew.cxx
diff --git a/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.cxx b/Modules/Registration/DisplacementField/test/otbBSplinesInterpolateTransformDisplacementFieldGenerator.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.cxx
rename to Modules/Registration/DisplacementField/test/otbBSplinesInterpolateTransformDisplacementFieldGenerator.cxx
diff --git a/Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbBSplinesInterpolateTransformDisplacementFieldGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGeneratorNew.cxx
rename to Modules/Registration/DisplacementField/test/otbBSplinesInterpolateTransformDisplacementFieldGeneratorNew.cxx
diff --git a/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.cxx b/Modules/Registration/DisplacementField/test/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.cxx
rename to Modules/Registration/DisplacementField/test/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.cxx
diff --git a/Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew.cxx
rename to Modules/Registration/DisplacementField/test/otbNNearestPointsLinearInterpolateDisplacementFieldGeneratorNew.cxx
diff --git a/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.cxx b/Modules/Registration/DisplacementField/test/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.cxx
rename to Modules/Registration/DisplacementField/test/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.cxx
diff --git a/Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew.cxx
rename to Modules/Registration/DisplacementField/test/otbNNearestTransformsLinearInterpolateDisplacementFieldGeneratorNew.cxx
diff --git a/Testing/Code/DisparityMap/otbNearestPointDisplacementFieldGenerator.cxx b/Modules/Registration/DisplacementField/test/otbNearestPointDisplacementFieldGenerator.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbNearestPointDisplacementFieldGenerator.cxx
rename to Modules/Registration/DisplacementField/test/otbNearestPointDisplacementFieldGenerator.cxx
diff --git a/Testing/Code/DisparityMap/otbNearestPointDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbNearestPointDisplacementFieldGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbNearestPointDisplacementFieldGeneratorNew.cxx
rename to Modules/Registration/DisplacementField/test/otbNearestPointDisplacementFieldGeneratorNew.cxx
diff --git a/Testing/Code/DisparityMap/otbNearestTransformDisplacementFieldGenerator.cxx b/Modules/Registration/DisplacementField/test/otbNearestTransformDisplacementFieldGenerator.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbNearestTransformDisplacementFieldGenerator.cxx
rename to Modules/Registration/DisplacementField/test/otbNearestTransformDisplacementFieldGenerator.cxx
diff --git a/Testing/Code/DisparityMap/otbNearestTransformDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbNearestTransformDisplacementFieldGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbNearestTransformDisplacementFieldGeneratorNew.cxx
rename to Modules/Registration/DisplacementField/test/otbNearestTransformDisplacementFieldGeneratorNew.cxx
diff --git a/Testing/Code/DisparityMap/otbPointSetToDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbPointSetToDisplacementFieldGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbPointSetToDisplacementFieldGeneratorNew.cxx
rename to Modules/Registration/DisplacementField/test/otbPointSetToDisplacementFieldGeneratorNew.cxx
diff --git a/Testing/Code/DisparityMap/otbPointSetWithTransformToDisplacementFieldGeneratorNew.cxx b/Modules/Registration/DisplacementField/test/otbPointSetWithTransformToDisplacementFieldGeneratorNew.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbPointSetWithTransformToDisplacementFieldGeneratorNew.cxx
rename to Modules/Registration/DisplacementField/test/otbPointSetWithTransformToDisplacementFieldGeneratorNew.cxx
diff --git a/Testing/Code/DisparityMap/otbStereorectificationDisplacementFieldSource.cxx b/Modules/Registration/DisplacementField/test/otbStereorectificationDisplacementFieldSource.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbStereorectificationDisplacementFieldSource.cxx
rename to Modules/Registration/DisplacementField/test/otbStereorectificationDisplacementFieldSource.cxx
diff --git a/Code/DisparityMap/otbAdhesionCorrectionFilter.h b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
similarity index 100%
rename from Code/DisparityMap/otbAdhesionCorrectionFilter.h
rename to Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
diff --git a/Code/DisparityMap/otbAdhesionCorrectionFilter.txx b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbAdhesionCorrectionFilter.txx
rename to Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.txx
diff --git a/Code/DisparityMap/otbBijectionCoherencyFilter.h b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
similarity index 100%
rename from Code/DisparityMap/otbBijectionCoherencyFilter.h
rename to Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
diff --git a/Code/DisparityMap/otbBijectionCoherencyFilter.txx b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbBijectionCoherencyFilter.txx
rename to Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.txx
diff --git a/Code/DisparityMap/otbFineRegistrationImageFilter.h b/Modules/Registration/Stereo/include/otbFineRegistrationImageFilter.h
similarity index 100%
rename from Code/DisparityMap/otbFineRegistrationImageFilter.h
rename to Modules/Registration/Stereo/include/otbFineRegistrationImageFilter.h
diff --git a/Code/DisparityMap/otbFineRegistrationImageFilter.txx b/Modules/Registration/Stereo/include/otbFineRegistrationImageFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbFineRegistrationImageFilter.txx
rename to Modules/Registration/Stereo/include/otbFineRegistrationImageFilter.txx
diff --git a/Code/DisparityMap/otbLineOfSightOptimizer.h b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
similarity index 100%
rename from Code/DisparityMap/otbLineOfSightOptimizer.h
rename to Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
diff --git a/Code/DisparityMap/otbLineOfSightOptimizer.txx b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.txx
similarity index 100%
rename from Code/DisparityMap/otbLineOfSightOptimizer.txx
rename to Modules/Registration/Stereo/include/otbLineOfSightOptimizer.txx
diff --git a/Code/DisparityMap/otbMulti3DMapToDEMFilter.h b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
similarity index 100%
rename from Code/DisparityMap/otbMulti3DMapToDEMFilter.h
rename to Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
diff --git a/Code/DisparityMap/otbMulti3DMapToDEMFilter.txx b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbMulti3DMapToDEMFilter.txx
rename to Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.txx
diff --git a/Code/DisparityMap/otbNCCRegistrationFilter.h b/Modules/Registration/Stereo/include/otbNCCRegistrationFilter.h
similarity index 100%
rename from Code/DisparityMap/otbNCCRegistrationFilter.h
rename to Modules/Registration/Stereo/include/otbNCCRegistrationFilter.h
diff --git a/Code/DisparityMap/otbNCCRegistrationFilter.txx b/Modules/Registration/Stereo/include/otbNCCRegistrationFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbNCCRegistrationFilter.txx
rename to Modules/Registration/Stereo/include/otbNCCRegistrationFilter.txx
diff --git a/Code/DisparityMap/otbNCCRegistrationFunction.h b/Modules/Registration/Stereo/include/otbNCCRegistrationFunction.h
similarity index 100%
rename from Code/DisparityMap/otbNCCRegistrationFunction.h
rename to Modules/Registration/Stereo/include/otbNCCRegistrationFunction.h
diff --git a/Code/DisparityMap/otbNCCRegistrationFunction.txx b/Modules/Registration/Stereo/include/otbNCCRegistrationFunction.txx
similarity index 100%
rename from Code/DisparityMap/otbNCCRegistrationFunction.txx
rename to Modules/Registration/Stereo/include/otbNCCRegistrationFunction.txx
diff --git a/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.h b/Modules/Registration/Stereo/include/otbPixelWiseBlockMatchingImageFilter.h
similarity index 100%
rename from Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.h
rename to Modules/Registration/Stereo/include/otbPixelWiseBlockMatchingImageFilter.h
diff --git a/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.txx b/Modules/Registration/Stereo/include/otbPixelWiseBlockMatchingImageFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.txx
rename to Modules/Registration/Stereo/include/otbPixelWiseBlockMatchingImageFilter.txx
diff --git a/Code/DisparityMap/otbStereoSensorModelToElevationMapFilter.h b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
similarity index 100%
rename from Code/DisparityMap/otbStereoSensorModelToElevationMapFilter.h
rename to Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
diff --git a/Code/DisparityMap/otbStereoSensorModelToElevationMapFilter.txx b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.txx
similarity index 100%
rename from Code/DisparityMap/otbStereoSensorModelToElevationMapFilter.txx
rename to Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.txx
diff --git a/Testing/Code/DisparityMap/otbAdhesionCorrectionFilter.cxx b/Modules/Registration/Stereo/test/otbAdhesionCorrectionFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbAdhesionCorrectionFilter.cxx
rename to Modules/Registration/Stereo/test/otbAdhesionCorrectionFilter.cxx
diff --git a/Testing/Code/DisparityMap/otbBijectionCoherencyFilter.cxx b/Modules/Registration/Stereo/test/otbBijectionCoherencyFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbBijectionCoherencyFilter.cxx
rename to Modules/Registration/Stereo/test/otbBijectionCoherencyFilter.cxx
diff --git a/Testing/Code/DisparityMap/otbFineRegistrationImageFilterNew.cxx b/Modules/Registration/Stereo/test/otbFineRegistrationImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbFineRegistrationImageFilterNew.cxx
rename to Modules/Registration/Stereo/test/otbFineRegistrationImageFilterNew.cxx
diff --git a/Testing/Code/DisparityMap/otbFineRegistrationImageFilterTest.cxx b/Modules/Registration/Stereo/test/otbFineRegistrationImageFilterTest.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbFineRegistrationImageFilterTest.cxx
rename to Modules/Registration/Stereo/test/otbFineRegistrationImageFilterTest.cxx
diff --git a/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx b/Modules/Registration/Stereo/test/otbMulti3DMapToDEMFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx
rename to Modules/Registration/Stereo/test/otbMulti3DMapToDEMFilter.cxx
diff --git a/Testing/Code/DisparityMap/otbNCCRegistrationFilter.cxx b/Modules/Registration/Stereo/test/otbNCCRegistrationFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbNCCRegistrationFilter.cxx
rename to Modules/Registration/Stereo/test/otbNCCRegistrationFilter.cxx
diff --git a/Testing/Code/DisparityMap/otbNCCRegistrationFilterNew.cxx b/Modules/Registration/Stereo/test/otbNCCRegistrationFilterNew.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbNCCRegistrationFilterNew.cxx
rename to Modules/Registration/Stereo/test/otbNCCRegistrationFilterNew.cxx
diff --git a/Testing/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.cxx b/Modules/Registration/Stereo/test/otbPixelWiseBlockMatchingImageFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.cxx
rename to Modules/Registration/Stereo/test/otbPixelWiseBlockMatchingImageFilter.cxx
diff --git a/Testing/Code/DisparityMap/otbStereoSensorModelToElevationMapFilter.cxx b/Modules/Registration/Stereo/test/otbStereoSensorModelToElevationMapFilter.cxx
similarity index 100%
rename from Testing/Code/DisparityMap/otbStereoSensorModelToElevationMapFilter.cxx
rename to Modules/Registration/Stereo/test/otbStereoSensorModelToElevationMapFilter.cxx
diff --git a/Code/BasicFilters/otbConnectedComponentMuParserFunctor.h b/Modules/Segmentation/CCOBIA/include/otbConnectedComponentMuParserFunctor.h
similarity index 100%
rename from Code/BasicFilters/otbConnectedComponentMuParserFunctor.h
rename to Modules/Segmentation/CCOBIA/include/otbConnectedComponentMuParserFunctor.h
diff --git a/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.h b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
similarity index 100%
rename from Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.h
rename to Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
diff --git a/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.txx b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.txx
rename to Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.txx
diff --git a/Code/OBIA/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
similarity index 100%
rename from Code/OBIA/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
rename to Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
diff --git a/Code/OBIA/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.txx b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.txx
similarity index 100%
rename from Code/OBIA/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.txx
rename to Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.txx
diff --git a/Testing/Code/BasicFilters/otbConnectedComponentMuParserFunctorTest.cxx b/Modules/Segmentation/CCOBIA/test/otbConnectedComponentMuParserFunctorTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbConnectedComponentMuParserFunctorTest.cxx
rename to Modules/Segmentation/CCOBIA/test/otbConnectedComponentMuParserFunctorTest.cxx
diff --git a/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterNew.cxx b/Modules/Segmentation/CCOBIA/test/otbLabelObjectOpeningMuParserFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterNew.cxx
rename to Modules/Segmentation/CCOBIA/test/otbLabelObjectOpeningMuParserFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx b/Modules/Segmentation/CCOBIA/test/otbLabelObjectOpeningMuParserFilterTest.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx
rename to Modules/Segmentation/CCOBIA/test/otbLabelObjectOpeningMuParserFilterTest.cxx
diff --git a/Testing/Code/OBIA/otbMeanShiftStreamingConnectedComponentOBIATest.cxx b/Modules/Segmentation/CCOBIA/test/otbMeanShiftStreamingConnectedComponentOBIATest.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbMeanShiftStreamingConnectedComponentOBIATest.cxx
rename to Modules/Segmentation/CCOBIA/test/otbMeanShiftStreamingConnectedComponentOBIATest.cxx
diff --git a/Testing/Code/OBIA/otbStreamingConnectedComponentOBIATest.cxx b/Modules/Segmentation/CCOBIA/test/otbStreamingConnectedComponentOBIATest.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbStreamingConnectedComponentOBIATest.cxx
rename to Modules/Segmentation/CCOBIA/test/otbStreamingConnectedComponentOBIATest.cxx
diff --git a/Code/Common/otbGISTableToLabelMapFilter.h b/Modules/Segmentation/Conversion/include/otbGISTableToLabelMapFilter.h
similarity index 100%
rename from Code/Common/otbGISTableToLabelMapFilter.h
rename to Modules/Segmentation/Conversion/include/otbGISTableToLabelMapFilter.h
diff --git a/Code/Common/otbGISTableToLabelMapFilter.txx b/Modules/Segmentation/Conversion/include/otbGISTableToLabelMapFilter.txx
similarity index 100%
rename from Code/Common/otbGISTableToLabelMapFilter.txx
rename to Modules/Segmentation/Conversion/include/otbGISTableToLabelMapFilter.txx
diff --git a/Code/Common/otbGISTableToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbGISTableToVectorDataFilter.h
similarity index 100%
rename from Code/Common/otbGISTableToVectorDataFilter.h
rename to Modules/Segmentation/Conversion/include/otbGISTableToVectorDataFilter.h
diff --git a/Code/Common/otbGISTableToVectorDataFilter.txx b/Modules/Segmentation/Conversion/include/otbGISTableToVectorDataFilter.txx
similarity index 100%
rename from Code/Common/otbGISTableToVectorDataFilter.txx
rename to Modules/Segmentation/Conversion/include/otbGISTableToVectorDataFilter.txx
diff --git a/Code/BasicFilters/otbLabelImageRegionMergingFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
similarity index 100%
rename from Code/BasicFilters/otbLabelImageRegionMergingFilter.h
rename to Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
diff --git a/Code/BasicFilters/otbLabelImageRegionMergingFilter.txx b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbLabelImageRegionMergingFilter.txx
rename to Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.txx
diff --git a/Code/BasicFilters/otbLabelImageRegionPruningFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
similarity index 100%
rename from Code/BasicFilters/otbLabelImageRegionPruningFilter.h
rename to Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
diff --git a/Code/BasicFilters/otbLabelImageRegionPruningFilter.txx b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbLabelImageRegionPruningFilter.txx
rename to Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.txx
diff --git a/Code/Common/otbLabelImageToOGRDataSourceFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
similarity index 100%
rename from Code/Common/otbLabelImageToOGRDataSourceFilter.h
rename to Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
diff --git a/Code/Common/otbLabelImageToOGRDataSourceFilter.txx b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.txx
similarity index 100%
rename from Code/Common/otbLabelImageToOGRDataSourceFilter.txx
rename to Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.txx
diff --git a/Code/Common/otbLabelImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
similarity index 100%
rename from Code/Common/otbLabelImageToVectorDataFilter.h
rename to Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
diff --git a/Code/Common/otbLabelImageToVectorDataFilter.txx b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.txx
similarity index 100%
rename from Code/Common/otbLabelImageToVectorDataFilter.txx
rename to Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.txx
diff --git a/Code/OBIA/otbLabelMapToGISTableFilter.h b/Modules/Segmentation/Conversion/include/otbLabelMapToGISTableFilter.h
similarity index 100%
rename from Code/OBIA/otbLabelMapToGISTableFilter.h
rename to Modules/Segmentation/Conversion/include/otbLabelMapToGISTableFilter.h
diff --git a/Code/OBIA/otbLabelMapToGISTableFilter.txx b/Modules/Segmentation/Conversion/include/otbLabelMapToGISTableFilter.txx
similarity index 100%
rename from Code/OBIA/otbLabelMapToGISTableFilter.txx
rename to Modules/Segmentation/Conversion/include/otbLabelMapToGISTableFilter.txx
diff --git a/Code/OBIA/otbLabelMapToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
similarity index 100%
rename from Code/OBIA/otbLabelMapToVectorDataFilter.h
rename to Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
diff --git a/Code/OBIA/otbLabelMapToVectorDataFilter.txx b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.txx
similarity index 100%
rename from Code/OBIA/otbLabelMapToVectorDataFilter.txx
rename to Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.txx
diff --git a/Code/Common/otbOGRDataSourceToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
similarity index 100%
rename from Code/Common/otbOGRDataSourceToLabelImageFilter.h
rename to Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
diff --git a/Code/Common/otbOGRDataSourceToLabelImageFilter.txx b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.txx
similarity index 100%
rename from Code/Common/otbOGRDataSourceToLabelImageFilter.txx
rename to Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.txx
diff --git a/Code/Common/otbPersistentImageToOGRDataFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
similarity index 100%
rename from Code/Common/otbPersistentImageToOGRDataFilter.h
rename to Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
diff --git a/Code/Common/otbPersistentImageToOGRDataFilter.txx b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.txx
similarity index 100%
rename from Code/Common/otbPersistentImageToOGRDataFilter.txx
rename to Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.txx
diff --git a/Code/Common/otbPersistentImageToOGRLayerFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
similarity index 100%
rename from Code/Common/otbPersistentImageToOGRLayerFilter.h
rename to Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
diff --git a/Code/Common/otbPersistentImageToOGRLayerFilter.txx b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.txx
similarity index 100%
rename from Code/Common/otbPersistentImageToOGRLayerFilter.txx
rename to Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.txx
diff --git a/Code/Common/otbPersistentImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
similarity index 100%
rename from Code/Common/otbPersistentImageToVectorDataFilter.h
rename to Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
diff --git a/Code/Common/otbPersistentImageToVectorDataFilter.txx b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.txx
similarity index 100%
rename from Code/Common/otbPersistentImageToVectorDataFilter.txx
rename to Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.txx
diff --git a/Code/BasicFilters/otbRasterizeVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
similarity index 100%
rename from Code/BasicFilters/otbRasterizeVectorDataFilter.h
rename to Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
diff --git a/Code/BasicFilters/otbRasterizeVectorDataFilter.txx b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbRasterizeVectorDataFilter.txx
rename to Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.txx
diff --git a/Code/Common/otbVectorDataToGISTableFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToGISTableFilter.h
similarity index 100%
rename from Code/Common/otbVectorDataToGISTableFilter.h
rename to Modules/Segmentation/Conversion/include/otbVectorDataToGISTableFilter.h
diff --git a/Code/Common/otbVectorDataToGISTableFilter.txx b/Modules/Segmentation/Conversion/include/otbVectorDataToGISTableFilter.txx
similarity index 100%
rename from Code/Common/otbVectorDataToGISTableFilter.txx
rename to Modules/Segmentation/Conversion/include/otbVectorDataToGISTableFilter.txx
diff --git a/Code/BasicFilters/otbVectorDataToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbVectorDataToLabelImageFilter.h
rename to Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
diff --git a/Code/BasicFilters/otbVectorDataToLabelImageFilter.txx b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbVectorDataToLabelImageFilter.txx
rename to Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.txx
diff --git a/Code/Common/otbVectorDataToLabelMapFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
similarity index 100%
rename from Code/Common/otbVectorDataToLabelMapFilter.h
rename to Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
diff --git a/Code/Common/otbVectorDataToLabelMapFilter.txx b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.txx
similarity index 100%
rename from Code/Common/otbVectorDataToLabelMapFilter.txx
rename to Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.txx
diff --git a/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
similarity index 100%
rename from Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.h
rename to Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
diff --git a/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.txx b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.txx
similarity index 100%
rename from Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.txx
rename to Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.txx
diff --git a/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx b/Modules/Segmentation/Conversion/test/otbLabelImageRegionMergingFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx
rename to Modules/Segmentation/Conversion/test/otbLabelImageRegionMergingFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx b/Modules/Segmentation/Conversion/test/otbLabelImageRegionPruningFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx
rename to Modules/Segmentation/Conversion/test/otbLabelImageRegionPruningFilter.cxx
diff --git a/Testing/Code/Common/otbLabelImageToOGRDataSourceFilter.cxx b/Modules/Segmentation/Conversion/test/otbLabelImageToOGRDataSourceFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbLabelImageToOGRDataSourceFilter.cxx
rename to Modules/Segmentation/Conversion/test/otbLabelImageToOGRDataSourceFilter.cxx
diff --git a/Testing/Code/Common/otbLabelImageToVectorDataFilter.cxx b/Modules/Segmentation/Conversion/test/otbLabelImageToVectorDataFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbLabelImageToVectorDataFilter.cxx
rename to Modules/Segmentation/Conversion/test/otbLabelImageToVectorDataFilter.cxx
diff --git a/Testing/Code/Common/otbLabelImageToVectorDataFilterNew.cxx b/Modules/Segmentation/Conversion/test/otbLabelImageToVectorDataFilterNew.cxx
similarity index 100%
rename from Testing/Code/Common/otbLabelImageToVectorDataFilterNew.cxx
rename to Modules/Segmentation/Conversion/test/otbLabelImageToVectorDataFilterNew.cxx
diff --git a/Testing/Code/OBIA/otbLabelMapToVectorDataFilter.cxx b/Modules/Segmentation/Conversion/test/otbLabelMapToVectorDataFilter.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbLabelMapToVectorDataFilter.cxx
rename to Modules/Segmentation/Conversion/test/otbLabelMapToVectorDataFilter.cxx
diff --git a/Testing/Code/OBIA/otbLabelMapToVectorDataFilterNew.cxx b/Modules/Segmentation/Conversion/test/otbLabelMapToVectorDataFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbLabelMapToVectorDataFilterNew.cxx
rename to Modules/Segmentation/Conversion/test/otbLabelMapToVectorDataFilterNew.cxx
diff --git a/Testing/Code/Common/otbOGRDataSourceToLabelImageFilter.cxx b/Modules/Segmentation/Conversion/test/otbOGRDataSourceToLabelImageFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbOGRDataSourceToLabelImageFilter.cxx
rename to Modules/Segmentation/Conversion/test/otbOGRDataSourceToLabelImageFilter.cxx
diff --git a/Testing/Code/Common/otbPolygonizationRasterizationTest.cxx b/Modules/Segmentation/Conversion/test/otbPolygonizationRasterizationTest.cxx
similarity index 100%
rename from Testing/Code/Common/otbPolygonizationRasterizationTest.cxx
rename to Modules/Segmentation/Conversion/test/otbPolygonizationRasterizationTest.cxx
diff --git a/Testing/Code/Common/otbVectorDataRasterizeFilter.cxx b/Modules/Segmentation/Conversion/test/otbVectorDataRasterizeFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataRasterizeFilter.cxx
rename to Modules/Segmentation/Conversion/test/otbVectorDataRasterizeFilter.cxx
diff --git a/Testing/Code/Common/otbVectorDataToLabelImageFilter.cxx b/Modules/Segmentation/Conversion/test/otbVectorDataToLabelImageFilter.cxx
similarity index 100%
rename from Testing/Code/Common/otbVectorDataToLabelImageFilter.cxx
rename to Modules/Segmentation/Conversion/test/otbVectorDataToLabelImageFilter.cxx
diff --git a/Testing/Fa/otbVectorDataToLabelImageFilterWithoutReader.cxx b/Modules/Segmentation/Conversion/test/otbVectorDataToLabelImageFilterWithoutReader.cxx
similarity index 100%
rename from Testing/Fa/otbVectorDataToLabelImageFilterWithoutReader.cxx
rename to Modules/Segmentation/Conversion/test/otbVectorDataToLabelImageFilterWithoutReader.cxx
diff --git a/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx b/Modules/Segmentation/Conversion/test/otbVectorDataToLabelMapFilter.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx
rename to Modules/Segmentation/Conversion/test/otbVectorDataToLabelMapFilter.cxx
diff --git a/Testing/Code/OBIA/otbVectorDataToLabelMapFilterNew.cxx b/Modules/Segmentation/Conversion/test/otbVectorDataToLabelMapFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbVectorDataToLabelMapFilterNew.cxx
rename to Modules/Segmentation/Conversion/test/otbVectorDataToLabelMapFilterNew.cxx
diff --git a/Code/BasicFilters/otbMeanShiftImageFilter.h b/Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbMeanShiftImageFilter.h
rename to Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftImageFilter.h
diff --git a/Code/BasicFilters/otbMeanShiftImageFilter.txx b/Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbMeanShiftImageFilter.txx
rename to Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftImageFilter.txx
diff --git a/Code/BasicFilters/otbMeanShiftVectorImageFilter.h b/Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftVectorImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbMeanShiftVectorImageFilter.h
rename to Modules/Segmentation/EdisonMeanShift/include/otbMeanShiftVectorImageFilter.h
diff --git a/Testing/Fa/0000041-mean_shift.cxx b/Modules/Segmentation/EdisonMeanShift/test/0000041-mean_shift.cxx
similarity index 100%
rename from Testing/Fa/0000041-mean_shift.cxx
rename to Modules/Segmentation/EdisonMeanShift/test/0000041-mean_shift.cxx
diff --git a/Testing/Fa/000295-MeanShiftVectorImageFilterWithStreamingShrink.cxx b/Modules/Segmentation/EdisonMeanShift/test/000295-MeanShiftVectorImageFilterWithStreamingShrink.cxx
similarity index 100%
rename from Testing/Fa/000295-MeanShiftVectorImageFilterWithStreamingShrink.cxx
rename to Modules/Segmentation/EdisonMeanShift/test/000295-MeanShiftVectorImageFilterWithStreamingShrink.cxx
diff --git a/Testing/Code/BasicFilters/otbMeanShiftImageFilter.cxx b/Modules/Segmentation/EdisonMeanShift/test/otbMeanShiftImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMeanShiftImageFilter.cxx
rename to Modules/Segmentation/EdisonMeanShift/test/otbMeanShiftImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx b/Modules/Segmentation/EdisonMeanShift/test/otbMeanShiftImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx
rename to Modules/Segmentation/EdisonMeanShift/test/otbMeanShiftImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilter.cxx b/Modules/Segmentation/EdisonMeanShift/test/otbMeanShiftVectorImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMeanShiftVectorImageFilter.cxx
rename to Modules/Segmentation/EdisonMeanShift/test/otbMeanShiftVectorImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbMeanShiftVectorImageFilterNew.cxx b/Modules/Segmentation/EdisonMeanShift/test/otbMeanShiftVectorImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbMeanShiftVectorImageFilterNew.cxx
rename to Modules/Segmentation/EdisonMeanShift/test/otbMeanShiftVectorImageFilterNew.cxx
diff --git a/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.h
rename to Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
diff --git a/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.txx b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.txx
rename to Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.txx
diff --git a/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.h
rename to Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
diff --git a/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.txx b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.txx
rename to Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.txx
diff --git a/Code/BasicFilters/otbLabelizeImageFilterBase.h b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
similarity index 100%
rename from Code/BasicFilters/otbLabelizeImageFilterBase.h
rename to Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
diff --git a/Code/BasicFilters/otbLabelizeImageFilterBase.txx b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.txx
similarity index 100%
rename from Code/BasicFilters/otbLabelizeImageFilterBase.txx
rename to Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.txx
diff --git a/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.h
rename to Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
diff --git a/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.txx b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.txx
rename to Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.txx
diff --git a/Code/BasicFilters/otbRelabelComponentImageFilter.h b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
similarity index 100%
rename from Code/BasicFilters/otbRelabelComponentImageFilter.h
rename to Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
diff --git a/Code/BasicFilters/otbRelabelComponentImageFilter.txx b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbRelabelComponentImageFilter.txx
rename to Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.txx
diff --git a/Testing/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.cxx b/Modules/Segmentation/Labelling/test/otbLabelizeConfidenceConnectedImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.cxx
rename to Modules/Segmentation/Labelling/test/otbLabelizeConfidenceConnectedImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilterNew.cxx b/Modules/Segmentation/Labelling/test/otbLabelizeConfidenceConnectedImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilterNew.cxx
rename to Modules/Segmentation/Labelling/test/otbLabelizeConfidenceConnectedImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.cxx b/Modules/Segmentation/Labelling/test/otbLabelizeConnectedThresholdImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.cxx
rename to Modules/Segmentation/Labelling/test/otbLabelizeConnectedThresholdImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilterNew.cxx b/Modules/Segmentation/Labelling/test/otbLabelizeConnectedThresholdImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilterNew.cxx
rename to Modules/Segmentation/Labelling/test/otbLabelizeConnectedThresholdImageFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.cxx b/Modules/Segmentation/Labelling/test/otbLabelizeNeighborhoodConnectedImageFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.cxx
rename to Modules/Segmentation/Labelling/test/otbLabelizeNeighborhoodConnectedImageFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilterNew.cxx b/Modules/Segmentation/Labelling/test/otbLabelizeNeighborhoodConnectedImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilterNew.cxx
rename to Modules/Segmentation/Labelling/test/otbLabelizeNeighborhoodConnectedImageFilterNew.cxx
diff --git a/Code/Segmentation/otbMeanShiftConnectedComponentSegmentationFilter.h b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
similarity index 100%
rename from Code/Segmentation/otbMeanShiftConnectedComponentSegmentationFilter.h
rename to Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
diff --git a/Code/Segmentation/otbMeanShiftConnectedComponentSegmentationFilter.txx b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.txx
similarity index 100%
rename from Code/Segmentation/otbMeanShiftConnectedComponentSegmentationFilter.txx
rename to Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.txx
diff --git a/Code/Segmentation/otbMeanShiftSegmentationFilter.h b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
similarity index 100%
rename from Code/Segmentation/otbMeanShiftSegmentationFilter.h
rename to Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
diff --git a/Code/Segmentation/otbMeanShiftSegmentationFilter.txx b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.txx
similarity index 100%
rename from Code/Segmentation/otbMeanShiftSegmentationFilter.txx
rename to Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.txx
diff --git a/Testing/Code/OBIA/otbMeanShiftConnectedComponentSegmentationFilterTest.cxx b/Modules/Segmentation/MeanShift/test/otbMeanShiftConnectedComponentSegmentationFilterTest.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbMeanShiftConnectedComponentSegmentationFilterTest.cxx
rename to Modules/Segmentation/MeanShift/test/otbMeanShiftConnectedComponentSegmentationFilterTest.cxx
diff --git a/Testing/Code/Segmentation/otbMeanShiftSegmentationFilter.cxx b/Modules/Segmentation/MeanShift/test/otbMeanShiftSegmentationFilter.cxx
similarity index 100%
rename from Testing/Code/Segmentation/otbMeanShiftSegmentationFilter.cxx
rename to Modules/Segmentation/MeanShift/test/otbMeanShiftSegmentationFilter.cxx
diff --git a/Code/Segmentation/otbHooverInstanceFilter.h b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
similarity index 100%
rename from Code/Segmentation/otbHooverInstanceFilter.h
rename to Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
diff --git a/Code/Segmentation/otbHooverInstanceFilter.txx b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.txx
similarity index 100%
rename from Code/Segmentation/otbHooverInstanceFilter.txx
rename to Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.txx
diff --git a/Code/Segmentation/otbHooverMatrixFilter.h b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
similarity index 100%
rename from Code/Segmentation/otbHooverMatrixFilter.h
rename to Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
diff --git a/Code/Segmentation/otbHooverMatrixFilter.txx b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.txx
similarity index 100%
rename from Code/Segmentation/otbHooverMatrixFilter.txx
rename to Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.txx
diff --git a/Testing/Code/Segmentation/otbHooverInstanceFilterNew.cxx b/Modules/Segmentation/Metrics/test/otbHooverInstanceFilterNew.cxx
similarity index 100%
rename from Testing/Code/Segmentation/otbHooverInstanceFilterNew.cxx
rename to Modules/Segmentation/Metrics/test/otbHooverInstanceFilterNew.cxx
diff --git a/Testing/Code/Segmentation/otbHooverInstanceFilterToAttributeImage.cxx b/Modules/Segmentation/Metrics/test/otbHooverInstanceFilterToAttributeImage.cxx
similarity index 100%
rename from Testing/Code/Segmentation/otbHooverInstanceFilterToAttributeImage.cxx
rename to Modules/Segmentation/Metrics/test/otbHooverInstanceFilterToAttributeImage.cxx
diff --git a/Testing/Code/Segmentation/otbHooverMatrixFilter.cxx b/Modules/Segmentation/Metrics/test/otbHooverMatrixFilter.cxx
similarity index 100%
rename from Testing/Code/Segmentation/otbHooverMatrixFilter.cxx
rename to Modules/Segmentation/Metrics/test/otbHooverMatrixFilter.cxx
diff --git a/Testing/Code/Segmentation/otbHooverMatrixFilterNew.cxx b/Modules/Segmentation/Metrics/test/otbHooverMatrixFilterNew.cxx
similarity index 100%
rename from Testing/Code/Segmentation/otbHooverMatrixFilterNew.cxx
rename to Modules/Segmentation/Metrics/test/otbHooverMatrixFilterNew.cxx
diff --git a/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
similarity index 100%
rename from Code/BasicFilters/otbClosingOpeningMorphologicalFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
diff --git a/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbClosingOpeningMorphologicalFilter.txx
rename to Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.txx
diff --git a/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
similarity index 100%
rename from Code/MultiScale/otbConvexOrConcaveClassificationFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbConvexOrConcaveClassificationFilter.h
diff --git a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
similarity index 100%
rename from Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
diff --git a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.txx
similarity index 100%
rename from Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx
rename to Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.txx
diff --git a/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
similarity index 100%
rename from Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
diff --git a/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
similarity index 100%
rename from Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
rename to Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
diff --git a/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
similarity index 100%
rename from Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyLevelingFilter.h
diff --git a/Code/MultiScale/otbImageToProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
similarity index 100%
rename from Code/MultiScale/otbImageToProfileFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
diff --git a/Code/MultiScale/otbImageToProfileFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.txx
similarity index 100%
rename from Code/MultiScale/otbImageToProfileFilter.txx
rename to Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.txx
diff --git a/Code/MultiScale/otbMorphologicalClosingProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
similarity index 100%
rename from Code/MultiScale/otbMorphologicalClosingProfileFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
diff --git a/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
similarity index 100%
rename from Code/MultiScale/otbMorphologicalOpeningProfileFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
diff --git a/Code/Segmentation/otbMorphologicalProfilesSegmentationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
similarity index 100%
rename from Code/Segmentation/otbMorphologicalProfilesSegmentationFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
diff --git a/Code/Segmentation/otbMorphologicalProfilesSegmentationFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.txx
similarity index 100%
rename from Code/Segmentation/otbMorphologicalProfilesSegmentationFilter.txx
rename to Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.txx
diff --git a/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
similarity index 100%
rename from Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbMultiScaleConvexOrConcaveClassificationFilter.h
diff --git a/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
similarity index 100%
rename from Code/BasicFilters/otbOpeningClosingMorphologicalFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
diff --git a/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.txx
similarity index 100%
rename from Code/BasicFilters/otbOpeningClosingMorphologicalFilter.txx
rename to Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.txx
diff --git a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
similarity index 100%
rename from Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
diff --git a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
similarity index 100%
rename from Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
rename to Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
diff --git a/Code/MultiScale/otbProfileToProfileDerivativeFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
similarity index 100%
rename from Code/MultiScale/otbProfileToProfileDerivativeFilter.h
rename to Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
diff --git a/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.txx
similarity index 100%
rename from Code/MultiScale/otbProfileToProfileDerivativeFilter.txx
rename to Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.txx
diff --git a/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbClosingOpeningMorphologicalFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbClosingOpeningMorphologicalFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbClosingOpeningMorphologicalFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbClosingOpeningMorphologicalFilterNew.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbClosingOpeningMorphologicalFilterNew.cxx
diff --git a/Testing/Code/MultiScale/otbConvexOrConcaveClassificationFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbConvexOrConcaveClassificationFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbConvexOrConcaveClassificationFilter.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbConvexOrConcaveClassificationFilter.cxx
diff --git a/Testing/Code/MultiScale/otbConvexOrConcaveClassificationFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbConvexOrConcaveClassificationFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbConvexOrConcaveClassificationFilterNew.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbConvexOrConcaveClassificationFilterNew.cxx
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyDecompositionImageFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyDecompositionImageFilter.cxx
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyDecompositionImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilterNew.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyDecompositionImageFilterNew.cxx
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyIterativeDecompositionImageFilter.cxx
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyIterativeDecompositionImageFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilterNew.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyIterativeDecompositionImageFilterNew.cxx
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyLevelingFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyLevelingFilter.cxx
diff --git a/Testing/Code/MultiScale/otbGeodesicMorphologyLevelingFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyLevelingFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbGeodesicMorphologyLevelingFilterNew.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbGeodesicMorphologyLevelingFilterNew.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalClosingProfileFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalClosingProfileFilter.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalClosingProfileFilter.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalClosingProfileFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalClosingProfileFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalClosingProfileFilterNew.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalClosingProfileFilterNew.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalOpeningProfileFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilter.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalOpeningProfileFilter.cxx
diff --git a/Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalOpeningProfileFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMorphologicalOpeningProfileFilterNew.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalOpeningProfileFilterNew.cxx
diff --git a/Testing/Code/Segmentation/otbMorphologicalProfilesSegmentationFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalProfilesSegmentationFilter.cxx
similarity index 100%
rename from Testing/Code/Segmentation/otbMorphologicalProfilesSegmentationFilter.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbMorphologicalProfilesSegmentationFilter.cxx
diff --git a/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMultiScaleConvexOrConcaveClassificationFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbMultiScaleConvexOrConcaveClassificationFilter.cxx
diff --git a/Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx
diff --git a/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbOpeningClosingMorphologicalFilter.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbOpeningClosingMorphologicalFilter.cxx
diff --git a/Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbOpeningClosingMorphologicalFilterNew.cxx
similarity index 100%
rename from Testing/Code/BasicFilters/otbOpeningClosingMorphologicalFilterNew.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbOpeningClosingMorphologicalFilterNew.cxx
diff --git a/Testing/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbProfileDerivativeToMultiScaleCharacteristicsFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbProfileDerivativeToMultiScaleCharacteristicsFilter.cxx
diff --git a/Testing/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbProfileDerivativeToMultiScaleCharacteristicsFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilterNew.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbProfileDerivativeToMultiScaleCharacteristicsFilterNew.cxx
diff --git a/Testing/Code/MultiScale/otbProfileToProfileDerivativeFilter.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbProfileToProfileDerivativeFilter.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbProfileToProfileDerivativeFilter.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbProfileToProfileDerivativeFilter.cxx
diff --git a/Testing/Code/MultiScale/otbProfileToProfileDerivativeFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbProfileToProfileDerivativeFilterNew.cxx
similarity index 100%
rename from Testing/Code/MultiScale/otbProfileToProfileDerivativeFilterNew.cxx
rename to Modules/Segmentation/MorphologicalProfiles/test/otbProfileToProfileDerivativeFilterNew.cxx
diff --git a/Code/Segmentation/otbOGRLayerStreamStitchingFilter.h b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
similarity index 100%
rename from Code/Segmentation/otbOGRLayerStreamStitchingFilter.h
rename to Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
diff --git a/Code/Segmentation/otbOGRLayerStreamStitchingFilter.txx b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.txx
similarity index 100%
rename from Code/Segmentation/otbOGRLayerStreamStitchingFilter.txx
rename to Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.txx
diff --git a/Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.h b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
similarity index 100%
rename from Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.h
rename to Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
diff --git a/Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.txx b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.txx
similarity index 100%
rename from Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.txx
rename to Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.txx
diff --git a/Testing/Code/Segmentation/otbOGRLayerStreamStitchingFilter.cxx b/Modules/Segmentation/OGRProcessing/test/otbOGRLayerStreamStitchingFilter.cxx
similarity index 100%
rename from Testing/Code/Segmentation/otbOGRLayerStreamStitchingFilter.cxx
rename to Modules/Segmentation/OGRProcessing/test/otbOGRLayerStreamStitchingFilter.cxx
diff --git a/Testing/Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.cxx b/Modules/Segmentation/OGRProcessing/test/otbStreamingImageToOGRLayerSegmentationFilter.cxx
similarity index 100%
rename from Testing/Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.cxx
rename to Modules/Segmentation/OGRProcessing/test/otbStreamingImageToOGRLayerSegmentationFilter.cxx
diff --git a/Code/Segmentation/otbWatershedSegmentationFilter.h b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
similarity index 100%
rename from Code/Segmentation/otbWatershedSegmentationFilter.h
rename to Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
diff --git a/Code/Segmentation/otbWatershedSegmentationFilter.txx b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.txx
similarity index 100%
rename from Code/Segmentation/otbWatershedSegmentationFilter.txx
rename to Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.txx
diff --git a/Testing/Code/Segmentation/otbWatershedSegmentationFilter.cxx b/Modules/Segmentation/Watersheds/test/otbWatershedSegmentationFilter.cxx
similarity index 100%
rename from Testing/Code/Segmentation/otbWatershedSegmentationFilter.cxx
rename to Modules/Segmentation/Watersheds/test/otbWatershedSegmentationFilter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperAddProcessToWatchEvent.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperAddProcessToWatchEvent.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperAddProcessToWatchEvent.h
diff --git a/Code/ApplicationEngine/otbWrapperApplication.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperApplication.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
diff --git a/Code/ApplicationEngine/otbWrapperApplicationFactory.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactory.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperApplicationFactory.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationFactory.h
diff --git a/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGenerator.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationHtmlDocGenerator.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperApplicationHtmlDocGenerator.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationHtmlDocGenerator.h
diff --git a/Code/ApplicationEngine/otbWrapperApplicationRegistry.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperApplicationRegistry.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperApplicationRegistry.h
diff --git a/Code/ApplicationEngine/otbWrapperChoiceParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperChoiceParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperChoiceParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperComplexInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperComplexInputImageParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperComplexInputImageParameter.txx b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.txx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperComplexInputImageParameter.txx
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.txx
diff --git a/Code/ApplicationEngine/otbWrapperComplexOutputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperComplexOutputImageParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexOutputImageParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperDirectoryParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperDirectoryParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperDocExampleStructure.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperDocExampleStructure.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperDocExampleStructure.h
diff --git a/Code/ApplicationEngine/otbWrapperElevationParametersHandler.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperElevationParametersHandler.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperElevationParametersHandler.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperElevationParametersHandler.h
diff --git a/Code/ApplicationEngine/otbWrapperEmptyParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperEmptyParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperEmptyParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperInputFilenameListParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameListParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputFilenameListParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameListParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperInputFilenameParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputFilenameParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperInputFilenameParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperInputImageListParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageListParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputImageListParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageListParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputImageParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperInputImageParameter.txx b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.txx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputImageParameter.txx
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.txx
diff --git a/Code/ApplicationEngine/otbWrapperInputProcessXMLParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputProcessXMLParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperInputProcessXMLParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperInputVectorDataListParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataListParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputVectorDataListParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataListParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperInputVectorDataParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputVectorDataParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperInputVectorDataParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperListViewParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperListViewParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperListViewParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperMacros.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperMacros.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperMacros.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperMacros.h
diff --git a/Code/ApplicationEngine/otbWrapperMapProjectionParametersHandler.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperMapProjectionParametersHandler.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperMapProjectionParametersHandler.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperMapProjectionParametersHandler.h
diff --git a/Code/ApplicationEngine/otbWrapperNumericalParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperNumericalParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperNumericalParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperOutputFilenameParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperOutputFilenameParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputFilenameParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperOutputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperOutputImageParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputImageParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperOutputProcessXMLParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperOutputProcessXMLParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputProcessXMLParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperOutputVectorDataParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperOutputVectorDataParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperOutputVectorDataParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperParameterGroup.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperParameterGroup.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterGroup.h
diff --git a/Code/ApplicationEngine/otbWrapperParameterKey.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperParameterKey.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterKey.h
diff --git a/Code/ApplicationEngine/otbWrapperRAMParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperRAMParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperRadiusParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperRadiusParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperRadiusParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperStringListParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringListParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperStringListParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperStringListParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperStringParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperStringParameter.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperStringParameter.h
diff --git a/Code/ApplicationEngine/otbWrapperTags.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperTags.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperTags.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperTags.h
diff --git a/Code/ApplicationEngine/otbWrapperTypes.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperTypes.h
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperTypes.h
rename to Modules/Wrappers/ApplicationEngine/include/otbWrapperTypes.h
diff --git a/Code/ApplicationEngine/otbWrapperApplication.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperApplication.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperApplication.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperApplication.cxx
diff --git a/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGenerator.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperApplicationHtmlDocGenerator.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperApplicationHtmlDocGenerator.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperApplicationHtmlDocGenerator.cxx
diff --git a/Code/ApplicationEngine/otbWrapperApplicationRegistry.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperApplicationRegistry.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperApplicationRegistry.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperApplicationRegistry.cxx
diff --git a/Code/ApplicationEngine/otbWrapperChoiceParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperChoiceParameter.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperChoiceParameter.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperChoiceParameter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperComplexInputImageParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexInputImageParameter.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperComplexInputImageParameter.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexInputImageParameter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperComplexOutputImageParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexOutputImageParameter.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperComplexOutputImageParameter.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexOutputImageParameter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperDocExampleStructure.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperDocExampleStructure.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperDocExampleStructure.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperDocExampleStructure.cxx
diff --git a/Code/ApplicationEngine/otbWrapperElevationParametersHandler.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperElevationParametersHandler.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperElevationParametersHandler.cxx
diff --git a/Code/ApplicationEngine/otbWrapperInputFilenameListParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputFilenameListParameter.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputFilenameListParameter.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperInputFilenameListParameter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperInputImageListParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageListParameter.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputImageListParameter.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageListParameter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperInputImageParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameter.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputImageParameter.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperInputImageParameter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperInputProcessXMLParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputProcessXMLParameter.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputProcessXMLParameter.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperInputProcessXMLParameter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperInputVectorDataListParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataListParameter.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputVectorDataListParameter.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataListParameter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperInputVectorDataParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataParameter.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperInputVectorDataParameter.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperInputVectorDataParameter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperListViewParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperListViewParameter.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperListViewParameter.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperListViewParameter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperMapProjectionParametersHandler.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperMapProjectionParametersHandler.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperMapProjectionParametersHandler.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperMapProjectionParametersHandler.cxx
diff --git a/Code/ApplicationEngine/otbWrapperOutputImageParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperOutputImageParameter.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperOutputImageParameter.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperOutputImageParameter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperOutputProcessXMLParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperOutputProcessXMLParameter.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperOutputProcessXMLParameter.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperOutputProcessXMLParameter.cxx
diff --git a/Code/ApplicationEngine/otbWrapperParameterGroup.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperParameterGroup.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperParameterGroup.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperParameterGroup.cxx
diff --git a/Code/ApplicationEngine/otbWrapperParameterKey.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperParameterKey.cxx
similarity index 100%
rename from Code/ApplicationEngine/otbWrapperParameterKey.cxx
rename to Modules/Wrappers/ApplicationEngine/src/otbWrapperParameterKey.cxx
diff --git a/Testing/Fa/0000436-WrapperInputImage_GetImage.cxx b/Modules/Wrappers/ApplicationEngine/test/0000436-WrapperInputImage_GetImage.cxx
similarity index 100%
rename from Testing/Fa/0000436-WrapperInputImage_GetImage.cxx
rename to Modules/Wrappers/ApplicationEngine/test/0000436-WrapperInputImage_GetImage.cxx
diff --git a/Testing/Applications/otbWrapperApplicationDocTests.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationDocTests.cxx
similarity index 100%
rename from Testing/Applications/otbWrapperApplicationDocTests.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationDocTests.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGeneratorTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationHtmlDocGeneratorTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGeneratorTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationHtmlDocGeneratorTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperApplicationRegistryTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationRegistryTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperApplicationRegistryTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationRegistryTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperApplicationTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperApplicationTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperApplicationTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperChoiceParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperChoiceParameterTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperChoiceParameterTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperChoiceParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperDocExampleStructureTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperDocExampleStructureTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperDocExampleStructureTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperDocExampleStructureTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperEmptyParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperEmptyParameterTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperEmptyParameterTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperEmptyParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperInputImageListParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputImageListParameterTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperInputImageListParameterTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperInputImageListParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperInputImageParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputImageParameterTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperInputImageParameterTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperInputImageParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperInputVectorDataListParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputVectorDataListParameterTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperInputVectorDataListParameterTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperInputVectorDataListParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperInputVectorDataParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperInputVectorDataParameterTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperInputVectorDataParameterTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperInputVectorDataParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperNumericalParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperNumericalParameterTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperNumericalParameterTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperNumericalParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperOutputImageParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperOutputImageParameterTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperOutputImageParameterTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperOutputImageParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperParameterKeyTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperParameterKeyTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperParameterKeyTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperParameterKeyTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperParameterListTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperParameterListTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperParameterListTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperParameterListTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperParameterTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperParameterTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperRAMParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperRAMParameterTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperRAMParameterTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperRAMParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperStringListParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperStringListParameterTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperStringListParameterTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperStringListParameterTest.cxx
diff --git a/Testing/Code/ApplicationEngine/otbWrapperStringParameterTest.cxx b/Modules/Wrappers/ApplicationEngine/test/otbWrapperStringParameterTest.cxx
similarity index 100%
rename from Testing/Code/ApplicationEngine/otbWrapperStringParameterTest.cxx
rename to Modules/Wrappers/ApplicationEngine/test/otbWrapperStringParameterTest.cxx
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.h b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h
similarity index 100%
rename from Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.h
rename to Modules/Wrappers/CommandLine/include/otbWrapperCommandLineLauncher.h
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.h b/Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h
similarity index 100%
rename from Code/Wrappers/CommandLine/otbWrapperCommandLineParser.h
rename to Modules/Wrappers/CommandLine/include/otbWrapperCommandLineParser.h
diff --git a/Code/Wrappers/CommandLine/otbApplicationLauncherCommandLine.cxx b/Modules/Wrappers/CommandLine/src/otbApplicationLauncherCommandLine.cxx
similarity index 100%
rename from Code/Wrappers/CommandLine/otbApplicationLauncherCommandLine.cxx
rename to Modules/Wrappers/CommandLine/src/otbApplicationLauncherCommandLine.cxx
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx b/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx
similarity index 100%
rename from Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
rename to Modules/Wrappers/CommandLine/src/otbWrapperCommandLineLauncher.cxx
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx b/Modules/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx
similarity index 100%
rename from Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
rename to Modules/Wrappers/CommandLine/src/otbWrapperCommandLineParser.cxx
diff --git a/Testing/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncherTests.cxx b/Modules/Wrappers/CommandLine/test/otbWrapperCommandLineLauncherTests.cxx
similarity index 100%
rename from Testing/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncherTests.cxx
rename to Modules/Wrappers/CommandLine/test/otbWrapperCommandLineLauncherTests.cxx
diff --git a/Testing/Code/Wrappers/CommandLine/otbWrapperCommandLineParserTests.cxx b/Modules/Wrappers/CommandLine/test/otbWrapperCommandLineParserTests.cxx
similarity index 100%
rename from Testing/Code/Wrappers/CommandLine/otbWrapperCommandLineParserTests.cxx
rename to Modules/Wrappers/CommandLine/test/otbWrapperCommandLineParserTests.cxx
diff --git a/Code/Wrappers/QtWidget/itkQtProgressBar.h b/Modules/Wrappers/QtWidget/include/itkQtProgressBar.h
similarity index 100%
rename from Code/Wrappers/QtWidget/itkQtProgressBar.h
rename to Modules/Wrappers/QtWidget/include/itkQtProgressBar.h
diff --git a/Code/Wrappers/QtWidget/otbQtApplication.h b/Modules/Wrappers/QtWidget/include/otbQtApplication.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbQtApplication.h
rename to Modules/Wrappers/QtWidget/include/otbQtApplication.h
diff --git a/Code/Wrappers/QtWidget/otbQtFileSelectionWidget.h b/Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbQtFileSelectionWidget.h
rename to Modules/Wrappers/QtWidget/include/otbQtFileSelectionWidget.h
diff --git a/Code/Wrappers/QtWidget/otbQtLogOutput.h b/Modules/Wrappers/QtWidget/include/otbQtLogOutput.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbQtLogOutput.h
rename to Modules/Wrappers/QtWidget/include/otbQtLogOutput.h
diff --git a/Code/Wrappers/QtWidget/otbQtStringSelectionWidget.h b/Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbQtStringSelectionWidget.h
rename to Modules/Wrappers/QtWidget/include/otbQtStringSelectionWidget.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetChoiceParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetChoiceParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetChoiceParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetComplexInputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetComplexInputImageParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexInputImageParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetComplexOutputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetComplexOutputImageParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetComplexOutputImageParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetDirectoryParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetDirectoryParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetDirectoryParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetEmptyParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetEmptyParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetEmptyParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetFloatParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetFloatParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetFloatParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameListParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameListParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameListParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputFilenameParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageListParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputImageParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputProcessXMLParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputProcessXMLParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputProcessXMLParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataListParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataListParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataListParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetInputVectorDataParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetIntParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetIntParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetIntParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetListViewParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetListViewParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetListViewParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetModel.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetModel.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetModel.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputFilenameParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputFilenameParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputFilenameParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputImageParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputImageParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputImageParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputProcessXMLParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputProcessXMLParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputProcessXMLParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputVectorDataParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputVectorDataParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetOutputVectorDataParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterBase.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterBase.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterBase.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterFactory.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterFactory.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterFactory.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterGroup.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterGroup.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterGroup.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterLabel.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterLabel.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetParameterLabel.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetProgressReport.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetProgressReport.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetProgressReport.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetRAMParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetRAMParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetRAMParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetSimpleProgressReport.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetSimpleProgressReport.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetSimpleProgressReport.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetStringListParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetStringListParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringListParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetStringParameter.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetStringParameter.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetStringParameter.h
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.h b/Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetView.h
rename to Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetView.h
diff --git a/Code/Wrappers/QtWidget/itkQtProgressBar.cxx b/Modules/Wrappers/QtWidget/src/itkQtProgressBar.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/itkQtProgressBar.cxx
rename to Modules/Wrappers/QtWidget/src/itkQtProgressBar.cxx
diff --git a/Code/Wrappers/ApplicationLauncherQt/otbApplicationLauncherQt.cxx b/Modules/Wrappers/QtWidget/src/otbApplicationLauncherQt.cxx
similarity index 100%
rename from Code/Wrappers/ApplicationLauncherQt/otbApplicationLauncherQt.cxx
rename to Modules/Wrappers/QtWidget/src/otbApplicationLauncherQt.cxx
diff --git a/Code/Wrappers/QtWidget/otbQtApplication.cxx b/Modules/Wrappers/QtWidget/src/otbQtApplication.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbQtApplication.cxx
rename to Modules/Wrappers/QtWidget/src/otbQtApplication.cxx
diff --git a/Code/Wrappers/QtWidget/otbQtFileSelectionWidget.cxx b/Modules/Wrappers/QtWidget/src/otbQtFileSelectionWidget.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbQtFileSelectionWidget.cxx
rename to Modules/Wrappers/QtWidget/src/otbQtFileSelectionWidget.cxx
diff --git a/Code/Wrappers/QtWidget/otbQtLogOutput.cxx b/Modules/Wrappers/QtWidget/src/otbQtLogOutput.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbQtLogOutput.cxx
rename to Modules/Wrappers/QtWidget/src/otbQtLogOutput.cxx
diff --git a/Code/Wrappers/QtWidget/otbQtStringSelectionWidget.cxx b/Modules/Wrappers/QtWidget/src/otbQtStringSelectionWidget.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbQtStringSelectionWidget.cxx
rename to Modules/Wrappers/QtWidget/src/otbQtStringSelectionWidget.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetChoiceParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetChoiceParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetChoiceParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetChoiceParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetComplexInputImageParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetComplexInputImageParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetComplexInputImageParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetComplexInputImageParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetComplexOutputImageParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetComplexOutputImageParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetComplexOutputImageParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetComplexOutputImageParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetDirectoryParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetDirectoryParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetDirectoryParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetDirectoryParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetEmptyParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetEmptyParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetEmptyParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetEmptyParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetFloatParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetFloatParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetFloatParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetFloatParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameListParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputFilenameListParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameListParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputFilenameListParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputFilenameParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputFilenameParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputImageListParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputImageListParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputImageParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputImageParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputProcessXMLParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputProcessXMLParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputProcessXMLParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputProcessXMLParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataListParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputVectorDataListParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataListParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputVectorDataListParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputVectorDataParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetInputVectorDataParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetIntParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetIntParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetIntParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetIntParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetListViewParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetListViewParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetListViewParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetListViewParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetModel.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetModel.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetModel.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetModel.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputFilenameParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetOutputFilenameParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputFilenameParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetOutputFilenameParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputImageParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetOutputImageParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputImageParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetOutputImageParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputProcessXMLParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetOutputProcessXMLParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputProcessXMLParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetOutputProcessXMLParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputVectorDataParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetOutputVectorDataParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetOutputVectorDataParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetOutputVectorDataParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterBase.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetParameterBase.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterBase.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetParameterBase.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterFactory.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetParameterFactory.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterFactory.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetParameterFactory.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterGroup.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetParameterGroup.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterGroup.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetParameterGroup.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterLabel.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetParameterLabel.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterLabel.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetParameterLabel.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetProgressReport.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetProgressReport.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetProgressReport.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetProgressReport.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetRAMParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetRAMParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetRAMParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetRAMParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetSimpleProgressReport.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetSimpleProgressReport.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetSimpleProgressReport.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetSimpleProgressReport.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetStringListParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetStringListParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetStringListParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetStringListParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetStringParameter.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetStringParameter.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetStringParameter.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetStringParameter.cxx
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetView.cxx
similarity index 100%
rename from Code/Wrappers/QtWidget/otbWrapperQtWidgetView.cxx
rename to Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetView.cxx
diff --git a/Testing/Code/Wrappers/Qt/otbQtLogOutputTests.cxx b/Modules/Wrappers/QtWidget/test/otbQtLogOutputTests.cxx
similarity index 100%
rename from Testing/Code/Wrappers/Qt/otbQtLogOutputTests.cxx
rename to Modules/Wrappers/QtWidget/test/otbQtLogOutputTests.cxx
diff --git a/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetParameterFactory.cxx b/Modules/Wrappers/QtWidget/test/otbWrapperQtWidgetParameterFactory.cxx
similarity index 100%
rename from Testing/Code/Wrappers/Qt/otbWrapperQtWidgetParameterFactory.cxx
rename to Modules/Wrappers/QtWidget/test/otbWrapperQtWidgetParameterFactory.cxx
diff --git a/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetShowWidget.cxx b/Modules/Wrappers/QtWidget/test/otbWrapperQtWidgetShowWidget.cxx
similarity index 100%
rename from Testing/Code/Wrappers/Qt/otbWrapperQtWidgetShowWidget.cxx
rename to Modules/Wrappers/QtWidget/test/otbWrapperQtWidgetShowWidget.cxx
diff --git a/Testing/Code/Wrappers/Java/JavaRescaleInXMLTest.java b/Modules/Wrappers/SWIG/test/java/JavaRescaleInXMLTest.java
similarity index 100%
rename from Testing/Code/Wrappers/Java/JavaRescaleInXMLTest.java
rename to Modules/Wrappers/SWIG/test/java/JavaRescaleInXMLTest.java
diff --git a/Testing/Code/Wrappers/Java/JavaRescaleOutXMLTest.java b/Modules/Wrappers/SWIG/test/java/JavaRescaleOutXMLTest.java
similarity index 100%
rename from Testing/Code/Wrappers/Java/JavaRescaleOutXMLTest.java
rename to Modules/Wrappers/SWIG/test/java/JavaRescaleOutXMLTest.java
diff --git a/Testing/Code/Wrappers/Java/JavaRescaleTest.java b/Modules/Wrappers/SWIG/test/java/JavaRescaleTest.java
similarity index 100%
rename from Testing/Code/Wrappers/Java/JavaRescaleTest.java
rename to Modules/Wrappers/SWIG/test/java/JavaRescaleTest.java
diff --git a/Testing/Code/Wrappers/Java/JavaSmoothingTest.java b/Modules/Wrappers/SWIG/test/java/JavaSmoothingTest.java
similarity index 100%
rename from Testing/Code/Wrappers/Java/JavaSmoothingTest.java
rename to Modules/Wrappers/SWIG/test/java/JavaSmoothingTest.java
diff --git a/Testing/Code/Wrappers/Python/Bug440.py b/Modules/Wrappers/SWIG/test/python/Bug440.py
similarity index 100%
rename from Testing/Code/Wrappers/Python/Bug440.py
rename to Modules/Wrappers/SWIG/test/python/Bug440.py
diff --git a/Testing/Code/Wrappers/Python/Bug736.py b/Modules/Wrappers/SWIG/test/python/Bug736.py
similarity index 100%
rename from Testing/Code/Wrappers/Python/Bug736.py
rename to Modules/Wrappers/SWIG/test/python/Bug736.py
diff --git a/Testing/Code/Wrappers/Python/Bug804.py b/Modules/Wrappers/SWIG/test/python/Bug804.py
similarity index 100%
rename from Testing/Code/Wrappers/Python/Bug804.py
rename to Modules/Wrappers/SWIG/test/python/Bug804.py
diff --git a/Testing/Code/Wrappers/Python/Bug823.py b/Modules/Wrappers/SWIG/test/python/Bug823.py
similarity index 100%
rename from Testing/Code/Wrappers/Python/Bug823.py
rename to Modules/Wrappers/SWIG/test/python/Bug823.py
diff --git a/Testing/Code/Wrappers/Python/CMakeLists.txt b/Modules/Wrappers/SWIG/test/python/CMakeLists.txt
similarity index 100%
rename from Testing/Code/Wrappers/Python/CMakeLists.txt
rename to Modules/Wrappers/SWIG/test/python/CMakeLists.txt
diff --git a/Testing/Code/Wrappers/Python/PythonHyperspectralUnmixing1.py b/Modules/Wrappers/SWIG/test/python/PythonHyperspectralUnmixing1.py
similarity index 100%
rename from Testing/Code/Wrappers/Python/PythonHyperspectralUnmixing1.py
rename to Modules/Wrappers/SWIG/test/python/PythonHyperspectralUnmixing1.py
diff --git a/Testing/Code/Wrappers/Python/PythonInXMLTest.py b/Modules/Wrappers/SWIG/test/python/PythonInXMLTest.py
similarity index 100%
rename from Testing/Code/Wrappers/Python/PythonInXMLTest.py
rename to Modules/Wrappers/SWIG/test/python/PythonInXMLTest.py
diff --git a/Testing/Code/Wrappers/Python/PythonOutXMLTest.py b/Modules/Wrappers/SWIG/test/python/PythonOutXMLTest.py
similarity index 100%
rename from Testing/Code/Wrappers/Python/PythonOutXMLTest.py
rename to Modules/Wrappers/SWIG/test/python/PythonOutXMLTest.py
diff --git a/Testing/Code/Wrappers/Python/PythonRescaleTest.py b/Modules/Wrappers/SWIG/test/python/PythonRescaleTest.py
similarity index 100%
rename from Testing/Code/Wrappers/Python/PythonRescaleTest.py
rename to Modules/Wrappers/SWIG/test/python/PythonRescaleTest.py
diff --git a/Testing/Code/Wrappers/Python/PythonSmoothingTest.py b/Modules/Wrappers/SWIG/test/python/PythonSmoothingTest.py
similarity index 100%
rename from Testing/Code/Wrappers/Python/PythonSmoothingTest.py
rename to Modules/Wrappers/SWIG/test/python/PythonSmoothingTest.py