diff --git a/Code/OBIA/otbHooverInstanceFilter.h b/Code/Segmentation/otbHooverInstanceFilter.h
similarity index 100%
rename from Code/OBIA/otbHooverInstanceFilter.h
rename to Code/Segmentation/otbHooverInstanceFilter.h
diff --git a/Code/OBIA/otbHooverInstanceFilter.txx b/Code/Segmentation/otbHooverInstanceFilter.txx
similarity index 100%
rename from Code/OBIA/otbHooverInstanceFilter.txx
rename to Code/Segmentation/otbHooverInstanceFilter.txx
diff --git a/Code/OBIA/otbHooverMatrixFilter.h b/Code/Segmentation/otbHooverMatrixFilter.h
similarity index 100%
rename from Code/OBIA/otbHooverMatrixFilter.h
rename to Code/Segmentation/otbHooverMatrixFilter.h
diff --git a/Code/OBIA/otbHooverMatrixFilter.txx b/Code/Segmentation/otbHooverMatrixFilter.txx
similarity index 100%
rename from Code/OBIA/otbHooverMatrixFilter.txx
rename to Code/Segmentation/otbHooverMatrixFilter.txx
diff --git a/Testing/Code/OBIA/CMakeLists.txt b/Testing/Code/OBIA/CMakeLists.txt
index 02919ab844f9318f40e5b4c991566ef615dff625..deecaa3e46b93c9f58e4bb36613f521d278eecd6 100644
--- a/Testing/Code/OBIA/CMakeLists.txt
+++ b/Testing/Code/OBIA/CMakeLists.txt
@@ -222,35 +222,9 @@ ADD_TEST(obTvLabelImageToLabelMapWithAdjacencyFilter ${OBIA_TESTS3}
   ${TEMP}/obTvLabelImageToLabelMapWithAdjacencyFilterOutput.txt
 )
 
-ADD_TEST(obTuHooverMatrixFilterNew ${OBIA_TESTS1}
-    otbHooverMatrixFilterNew)
-
-ADD_TEST(obTvHooverMatrixFilter ${OBIA_TESTS1}
-    --compare-ascii ${NOTOL}
-    ${BASELINE_FILES}/obTvHooverMatrixFilter.txt
-    ${TEMP}/obTvHooverMatrixFilter.txt
-    otbHooverMatrixFilter
-    ${INPUTDATA}/Seg1InputForRCC8Graph.tif
-    ${INPUTDATA}/Seg2InputForRCC8Graph.tif
-    ${TEMP}/obTvHooverMatrixFilter.txt
-    )
-
-ADD_TEST(obTuHooverInstanceFilterNew ${OBIA_TESTS1}
-    otbHooverInstanceFilterNew)
-
 ADD_TEST(obTuLabelMapToAttributeImageFilterNew ${OBIA_TESTS1}
     otbLabelMapToAttributeImageFilterNew)
 
-ADD_TEST(obTvHooverInstanceFilterToAttributeImage ${OBIA_TESTS1}
-    --compare-image ${EPSILON_9}
-    ${BASELINE}/obTvHooverInstanceFilterToAttributeImage.tif
-    ${TEMP}/obTvHooverInstanceFilterToAttributeImage.tif
-    otbHooverInstanceFilterToAttributeImage
-    ${INPUTDATA}/maur_GT.tif
-    ${INPUTDATA}/maur_labelled.tif
-    ${TEMP}/obTvHooverInstanceFilterToAttributeImage.tif
-    )
-
 ADD_TEST(obTuLabelImageToVectorDataFilterNew ${OBIA_TESTS1}
     otbLabelImageToVectorDataFilterNew)
 
@@ -263,7 +237,6 @@ ADD_TEST(obTvLabelImageToVectorDataFilter ${OBIA_TESTS1}
     ${TEMP}/obTuLabelImageToVectorDataFilter.shp
     )
 
-
 ADD_TEST(obTuLabelImageToOGRDataSourceFilterNew ${OBIA_TESTS1}
     otbLabelImageToOGRDataSourceFilterNew)
 
@@ -330,11 +303,7 @@ otbMeanShiftStreamingConnectedComponentOBIATest.cxx
 otbMeanShiftConnectedComponentSegmentationFilterTest.cxx
 otbMeanShiftSegmentationFilter.cxx
 otbWatershedSegmentationFilter.cxx
-otbHooverMatrixFilterNew.cxx
-otbHooverMatrixFilter.cxx
-otbHooverInstanceFilterNew.cxx
 otbLabelMapToAttributeImageFilterNew.cxx
-otbHooverInstanceFilterToAttributeImage.cxx
 otbLabelImageToVectorDataFilterNew.cxx
 otbLabelImageToVectorDataFilter.cxx
 otbLabelImageToOGRDataSourceFilter.cxx
diff --git a/Testing/Code/OBIA/otbOBIATests1.cxx b/Testing/Code/OBIA/otbOBIATests1.cxx
index eefdc5bdd4da9c92407494aab767f7c571430f28..764959e86e8e939355a9be41646b9c3b0968f68f 100644
--- a/Testing/Code/OBIA/otbOBIATests1.cxx
+++ b/Testing/Code/OBIA/otbOBIATests1.cxx
@@ -58,11 +58,7 @@ REGISTER_TEST(otbMeanShiftStreamingConnectedComponentSegmentationOBIAToVectorDat
 REGISTER_TEST(otbMeanShiftConnectedComponentSegmentationFilter);
 REGISTER_TEST(otbMeanShiftSegmentationFilter);
 REGISTER_TEST(otbWatershedSegmentationFilter);
-REGISTER_TEST(otbHooverMatrixFilterNew);
-REGISTER_TEST(otbHooverMatrixFilter);
-REGISTER_TEST(otbHooverInstanceFilterNew);
 REGISTER_TEST(otbLabelMapToAttributeImageFilterNew);
-REGISTER_TEST(otbHooverInstanceFilterToAttributeImage);
 REGISTER_TEST(otbLabelImageToVectorDataFilterNew);
 REGISTER_TEST(otbLabelImageToVectorDataFilter);
 REGISTER_TEST(otbLabelImageToOGRDataSourceFilterNew);
diff --git a/Testing/Code/Segmentation/CMakeLists.txt b/Testing/Code/Segmentation/CMakeLists.txt
index ca781ac1dc98ffc376a891e5c3bb704c0c86ed7c..b4133d6e6f1c4483660a56b2c0349219364e8ade 100644
--- a/Testing/Code/Segmentation/CMakeLists.txt
+++ b/Testing/Code/Segmentation/CMakeLists.txt
@@ -5,6 +5,35 @@ SET(SEGMENTATION_TESTS1 ${CXX_TEST_PATH}/otbSegmentationTests1)
 
 ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
 
+
+# -------  otb::HooverMatrix &  otb::HooverInstance -------------
+
+ADD_TEST(obTuHooverMatrixFilterNew ${OBIA_TESTS1}
+    otbHooverMatrixFilterNew)
+
+ADD_TEST(obTvHooverMatrixFilter ${OBIA_TESTS1}
+    --compare-ascii ${NOTOL}
+    ${BASELINE_FILES}/obTvHooverMatrixFilter.txt
+    ${TEMP}/obTvHooverMatrixFilter.txt
+    otbHooverMatrixFilter
+    ${INPUTDATA}/Seg1InputForRCC8Graph.tif
+    ${INPUTDATA}/Seg2InputForRCC8Graph.tif
+    ${TEMP}/obTvHooverMatrixFilter.txt
+    )
+
+ADD_TEST(obTuHooverInstanceFilterNew ${OBIA_TESTS1}
+    otbHooverInstanceFilterNew)
+
+ADD_TEST(obTvHooverInstanceFilterToAttributeImage ${OBIA_TESTS1}
+    --compare-image ${EPSILON_9}
+    ${BASELINE}/obTvHooverInstanceFilterToAttributeImage.tif
+    ${TEMP}/obTvHooverInstanceFilterToAttributeImage.tif
+    otbHooverInstanceFilterToAttributeImage
+    ${INPUTDATA}/maur_GT.tif
+    ${INPUTDATA}/maur_labelled.tif
+    ${TEMP}/obTvHooverInstanceFilterToAttributeImage.tif
+    )
+
 # -------            otb::StreamingVectorizedSegmentation   -------------
 ADD_TEST(obTuStreamingImageToOGRDataSourceSegmentationFilterNew ${SEGMENTATION_TESTS1}
     otbStreamingImageToOGRDataSourceSegmentationFilterNew)
@@ -64,6 +93,10 @@ ADD_TEST(obTuOGRDataSourceStreamStitchingFilter ${SEGMENTATION_TESTS1}
 
 
 SET(Segmentation_SRCS1
+otbHooverMatrixFilterNew.cxx
+otbHooverMatrixFilter.cxx
+otbHooverInstanceFilterNew.cxx
+otbHooverInstanceFilterToAttributeImage.cxx
 otbStreamingImageToOGRDataSourceSegmentationFilter.cxx
 otbOGRDataSourceStreamStitchingFilter.cxx
 )
diff --git a/Testing/Code/OBIA/otbHooverInstanceFilterNew.cxx b/Testing/Code/Segmentation/otbHooverInstanceFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbHooverInstanceFilterNew.cxx
rename to Testing/Code/Segmentation/otbHooverInstanceFilterNew.cxx
diff --git a/Testing/Code/OBIA/otbHooverInstanceFilterToAttributeImage.cxx b/Testing/Code/Segmentation/otbHooverInstanceFilterToAttributeImage.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbHooverInstanceFilterToAttributeImage.cxx
rename to Testing/Code/Segmentation/otbHooverInstanceFilterToAttributeImage.cxx
diff --git a/Testing/Code/OBIA/otbHooverMatrixFilter.cxx b/Testing/Code/Segmentation/otbHooverMatrixFilter.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbHooverMatrixFilter.cxx
rename to Testing/Code/Segmentation/otbHooverMatrixFilter.cxx
diff --git a/Testing/Code/OBIA/otbHooverMatrixFilterNew.cxx b/Testing/Code/Segmentation/otbHooverMatrixFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbHooverMatrixFilterNew.cxx
rename to Testing/Code/Segmentation/otbHooverMatrixFilterNew.cxx
diff --git a/Testing/Code/Segmentation/otbSegmentationTests1.cxx b/Testing/Code/Segmentation/otbSegmentationTests1.cxx
index 0028f6f3be21a7354ddeda0778a692285fd8a0af..2e08643da55a56d8b9ee6a910482e1e7a58ff9ca 100644
--- a/Testing/Code/Segmentation/otbSegmentationTests1.cxx
+++ b/Testing/Code/Segmentation/otbSegmentationTests1.cxx
@@ -28,5 +28,8 @@ void RegisterTests()
 REGISTER_TEST(otbStreamingImageToOGRDataSourceSegmentationFilterNew);
 REGISTER_TEST(otbStreamingImageToOGRDataSourceSegmentationFilter);
 REGISTER_TEST(otbOGRDataSourceStreamStitchingFilter);
-
+REGISTER_TEST(otbHooverMatrixFilterNew);
+REGISTER_TEST(otbHooverMatrixFilter);
+REGISTER_TEST(otbHooverInstanceFilterNew);
+REGISTER_TEST(otbHooverInstanceFilterToAttributeImage);
 }