diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt
index 0811420f0e40d7330801ece55de7862225af6c95..8680c4545e97d10e39a2fa147cb448b1f3391441 100644
--- a/Applications/CMakeLists.txt
+++ b/Applications/CMakeLists.txt
@@ -7,7 +7,6 @@ set(OTB_APPLICATIONS_NAME_LIST "" CACHE STRING "List of all applications name" F
 add_subdirectory(CartographicDBValidation)
 add_subdirectory(ChangeDetection)
 add_subdirectory(Classification)
-add_subdirectory(ConnectedComponentSegmentation)
 add_subdirectory(DimensionnalityReduction)
 add_subdirectory(DisparityMap)
 add_subdirectory(FeatureExtraction)
diff --git a/Applications/ConnectedComponentSegmentation/CMakeLists.txt b/Applications/ConnectedComponentSegmentation/CMakeLists.txt
deleted file mode 100644
index a3c802e2c58cc938b6e9584fb075e4db0676dfa5..0000000000000000000000000000000000000000
--- a/Applications/ConnectedComponentSegmentation/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-
-OTB_CREATE_APPLICATION(NAME           ConnectedComponentSegmentation
-                       SOURCES        otbConnectedComponentSegmentation.cxx
-                       LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
diff --git a/Applications/Segmentation/CMakeLists.txt b/Applications/Segmentation/CMakeLists.txt
index 7e8c199de28ba659b939cbc2f9e1a489af7cc04b..4bd811dc2a93e40dc899b576d1f59e362689f67e 100644
--- a/Applications/Segmentation/CMakeLists.txt
+++ b/Applications/Segmentation/CMakeLists.txt
@@ -2,3 +2,7 @@
 OTB_CREATE_APPLICATION(NAME           MeanShiftSegmentation
                        SOURCES        otbMeanShiftSegmentation.cxx
                        LINK_LIBRARIES OTBBasicFilters)
+
+OTB_CREATE_APPLICATION(NAME           ConnectedComponentSegmentation
+                       SOURCES        otbConnectedComponentSegmentation.cxx
+                       LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
diff --git a/Applications/ConnectedComponentSegmentation/otbConnectedComponentSegmentation.cxx b/Applications/Segmentation/otbConnectedComponentSegmentation.cxx
similarity index 100%
rename from Applications/ConnectedComponentSegmentation/otbConnectedComponentSegmentation.cxx
rename to Applications/Segmentation/otbConnectedComponentSegmentation.cxx
diff --git a/Testing/Applications/CMakeLists.txt b/Testing/Applications/CMakeLists.txt
index a1d631f9efca416aedef1b9b827f4b6ae7ba1f5a..ed3f3bdebc92c4ad1b748650fddcd7f0cd4e6b0f 100644
--- a/Testing/Applications/CMakeLists.txt
+++ b/Testing/Applications/CMakeLists.txt
@@ -50,7 +50,6 @@ endforeach(app)
 add_subdirectory(CartographicDBValidation)
 add_subdirectory(ChangeDetection)
 add_subdirectory(Classification)
-add_subdirectory(ConnectedComponentSegmentation)
 add_subdirectory(DimensionnalityReduction)
 add_subdirectory(DisparityMap)
 add_subdirectory(FeatureExtraction)
diff --git a/Testing/Applications/ConnectedComponentSegmentation/CMakeLists.txt b/Testing/Applications/ConnectedComponentSegmentation/CMakeLists.txt
deleted file mode 100644
index 430b637b5668f71c58559e524e05c200e8607b84..0000000000000000000000000000000000000000
--- a/Testing/Applications/ConnectedComponentSegmentation/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-#--- ConnectedComponentSegmentation ---#
-
-OTB_TEST_APPLICATION(NAME  apTvCcConnectedComponentSegmentationMaskMuParserShp
-                     APP  ConnectedComponentSegmentation
-                     OPTIONS --in ${INPUTDATA}/ROI_QB_MUL_4.tif
-                             --out ${TEMP}/apTvCcConnectedComponentSegmentationMaskMuParser.shp
-                             --mask "((b1>80)*intensity>95)"
-                             --expr "distance<10"
-                             --minsize 15
-                             --obia "SHAPE_Elongation>8"
-                     VALID   --compare-ogr ${NOTOL}
-                             ${BASELINE_FILES}/apTvCcConnectedComponentSegmentationMaskMuParser.shp
-                             ${TEMP}/apTvCcConnectedComponentSegmentationMaskMuParser.shp)
-
-OTB_TEST_APPLICATION(NAME  apTvCcConnectedComponentSegmentatioNoMask
-                     APP  ConnectedComponentSegmentation
-                     OPTIONS --in ${INPUTDATA}/ROI_QB_MUL_4.tif
-                             --out ${TEMP}/apTvCcConnectedComponentSegmentationNoMask.shp
-                             --expr "distance<10"
-                             --minsize 15
-                             --obia "SHAPE_Elongation>8"
-                     VALID   --compare-ogr ${NOTOL}
-                             ${BASELINE_FILES}/apTvCcConnectedComponentSegmentationNoMask.shp
-                             ${TEMP}/apTvCcConnectedComponentSegmentationNoMask.shp)
diff --git a/Testing/Applications/Segmentation/CMakeLists.txt b/Testing/Applications/Segmentation/CMakeLists.txt
index e8a0c3f9ae50151e54d2c94ef0dabed97132ebd2..b60332da0b26e8650db2f2fc0f50dfc48904f179 100644
--- a/Testing/Applications/Segmentation/CMakeLists.txt
+++ b/Testing/Applications/Segmentation/CMakeLists.txt
@@ -20,4 +20,28 @@ OTB_TEST_APPLICATION(NAME apTvSeMeanShift
                     		   ${TEMP}/apTvSeMeanShift_LabeledClusteredOutput.tif
                     		   ${BASELINE}/bfMeanShiftVectorImageFilterClusterBoundariesOutput.tif
                     		   ${TEMP}/apTvSeMeanShift_ClusterBoundariesOutput.tif)
-                    		   
\ No newline at end of file
+
+#--- ConnectedComponentSegmentation ---#
+
+OTB_TEST_APPLICATION(NAME  apTvCcConnectedComponentSegmentationMaskMuParserShp
+                     APP  ConnectedComponentSegmentation
+                     OPTIONS --in ${INPUTDATA}/ROI_QB_MUL_4.tif
+                             --out ${TEMP}/apTvCcConnectedComponentSegmentationMaskMuParser.shp
+                             --mask "((b1>80)*intensity>95)"
+                             --expr "distance<10"
+                             --minsize 15
+                             --obia "SHAPE_Elongation>8"
+                     VALID   --compare-ogr ${NOTOL}
+                             ${BASELINE_FILES}/apTvCcConnectedComponentSegmentationMaskMuParser.shp
+                             ${TEMP}/apTvCcConnectedComponentSegmentationMaskMuParser.shp)
+
+OTB_TEST_APPLICATION(NAME  apTvCcConnectedComponentSegmentatioNoMask
+                     APP  ConnectedComponentSegmentation
+                     OPTIONS --in ${INPUTDATA}/ROI_QB_MUL_4.tif
+                             --out ${TEMP}/apTvCcConnectedComponentSegmentationNoMask.shp
+                             --expr "distance<10"
+                             --minsize 15
+                             --obia "SHAPE_Elongation>8"
+                     VALID   --compare-ogr ${NOTOL}
+                             ${BASELINE_FILES}/apTvCcConnectedComponentSegmentationNoMask.shp
+                             ${TEMP}/apTvCcConnectedComponentSegmentationNoMask.shp)