diff --git a/src/aliceVision/CMakeLists.txt b/src/aliceVision/CMakeLists.txt
index aa0c15d2dd..a5e6e51d70 100644
--- a/src/aliceVision/CMakeLists.txt
+++ b/src/aliceVision/CMakeLists.txt
@@ -3,6 +3,7 @@
 add_subdirectory(image)
 add_subdirectory(numeric)
 add_subdirectory(system)
+add_subdirectory(cmdline)
 add_subdirectory(stl)
 add_subdirectory(utils)
 add_subdirectory(panorama)
diff --git a/src/aliceVision/cmdline/CMakeLists.txt b/src/aliceVision/cmdline/CMakeLists.txt
new file mode 100644
index 0000000000..66467b8101
--- /dev/null
+++ b/src/aliceVision/cmdline/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Sources
+set(cmdline_files_sources
+  cmdline.cpp
+)
+
+alicevision_add_library(aliceVision_cmdline
+  SOURCES ${cmdline_files_sources}
+  PUBLIC_LINKS
+    Boost::program_options
+  PRIVATE_LINKS
+    aliceVision_system
+)
diff --git a/src/aliceVision/system/cmdline.cpp b/src/aliceVision/cmdline/cmdline.cpp
similarity index 73%
rename from src/aliceVision/system/cmdline.cpp
rename to src/aliceVision/cmdline/cmdline.cpp
index 91218c7568..9c3a30bc4e 100644
--- a/src/aliceVision/system/cmdline.cpp
+++ b/src/aliceVision/cmdline/cmdline.cpp
@@ -1,7 +1,7 @@
 #include "cmdline.hpp"
 
-#include "cpu.hpp"
-#include "MemoryInfo.hpp"
+#include <aliceVision/system/cpu.hpp>
+#include <aliceVision/system/MemoryInfo.hpp>
 #include <aliceVision/alicevision_omp.hpp>
 
 namespace aliceVision {
@@ -17,7 +17,13 @@ bool CmdLine::execute(int argc, char** argv)
     _allParams.add(logParams);
 
     boost::program_options::options_description hardwareParams("Hardware parameters");
-    _hContext.setupFromCommandLine(hardwareParams);
+    
+    size_t uma = _hContext.getUserMaxMemoryAvailable();
+    unsigned int uca = _hContext.getUserMaxCoresAvailable();
+
+    hardwareParams.add_options()
+        ("maxMemoryAvailable", boost::program_options::value<size_t>(&uma)->default_value(uma), "User specified available RAM")
+        ("maxCoresAvailable", boost::program_options::value<unsigned int>(&uca)->default_value(uca), "User specified available number of cores");
 
     _allParams.add(hardwareParams);
 
@@ -52,6 +58,8 @@ bool CmdLine::execute(int argc, char** argv)
     // set verbose level
     system::Logger::get()->setLogLevel(verboseLevel);
 
+    _hContext.setUserMaxMemoryAvailable(uma);
+    _hContext.setUserMaxCoresAvailable(uca);
     _hContext.displayHardware();
 
     return true;
diff --git a/src/aliceVision/system/cmdline.hpp b/src/aliceVision/cmdline/cmdline.hpp
similarity index 97%
rename from src/aliceVision/system/cmdline.hpp
rename to src/aliceVision/cmdline/cmdline.hpp
index a2034d05cb..32c7387010 100644
--- a/src/aliceVision/system/cmdline.hpp
+++ b/src/aliceVision/cmdline/cmdline.hpp
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include "Logger.hpp"
-#include "Timer.hpp"
-#include "hardwareContext.hpp"
+#include <aliceVision/system/Logger.hpp>
+#include <aliceVision/system/Timer.hpp>
+#include <aliceVision/system/hardwareContext.hpp>
 
 #include <boost/program_options/variables_map.hpp>
 #include <boost/program_options/option.hpp>
diff --git a/src/aliceVision/system/CMakeLists.txt b/src/aliceVision/system/CMakeLists.txt
index f6523aed89..c7f0e71b01 100644
--- a/src/aliceVision/system/CMakeLists.txt
+++ b/src/aliceVision/system/CMakeLists.txt
@@ -19,7 +19,6 @@ set(system_files_sources
   Logger.cpp
   ProgressDisplay.cpp
   nvtx.cpp
-  cmdline.cpp
   hardwareContext.cpp
 )
 
@@ -31,7 +30,6 @@ alicevision_add_library(aliceVision_system
     Boost::thread
     Boost::system
     Boost::date_time
-    Boost::program_options
     ${ALICEVISION_NVTX_LIBRARY}
   PRIVATE_LINKS
     Boost::boost
diff --git a/src/aliceVision/system/hardwareContext.cpp b/src/aliceVision/system/hardwareContext.cpp
index 4a134a1dbe..ec5484b161 100644
--- a/src/aliceVision/system/hardwareContext.cpp
+++ b/src/aliceVision/system/hardwareContext.cpp
@@ -6,12 +6,6 @@
 
 namespace aliceVision {
 
-void HardwareContext::setupFromCommandLine(boost::program_options::options_description & options)
-{
-    options.add_options()
-        ("maxMemoryAvailable", boost::program_options::value<size_t>(&_maxUserMemoryAvailable)->default_value(_maxUserMemoryAvailable), "User specified available RAM")
-        ("maxCoresAvailable", boost::program_options::value<unsigned int>(&_maxUserCoresAvailable)->default_value(_maxUserCoresAvailable), "User specified available number of cores");
-}
 
 void HardwareContext::displayHardware()
 {
diff --git a/src/aliceVision/system/hardwareContext.hpp b/src/aliceVision/system/hardwareContext.hpp
index e44b0165e5..68166b9593 100644
--- a/src/aliceVision/system/hardwareContext.hpp
+++ b/src/aliceVision/system/hardwareContext.hpp
@@ -9,7 +9,6 @@
 #include "Logger.hpp"
 #include "Timer.hpp"
 
-#include <boost/program_options/options_description.hpp>
 
 namespace aliceVision {
 
@@ -23,18 +22,26 @@ class HardwareContext
         return _maxUserMemoryAvailable;
     }
 
+    void setUserMaxMemoryAvailable(size_t val)
+    {
+        _maxUserCoresAvailable = val;
+    }
+
     unsigned int getUserMaxCoresAvailable() const
     {
         return _maxUserCoresAvailable;
     }
 
+    void setUserMaxCoresAvailable(unsigned int val)
+    {
+        _maxUserCoresAvailable = val;
+    }
+
     void setUserCoresLimit(unsigned int coresLimit)
     {
         _limitUserCores = coresLimit;
     }
 
-    void setupFromCommandLine(boost::program_options::options_description & options);
-
     unsigned int getMaxThreads() const;
 
 private:
diff --git a/src/samples/featuresRepeatability/main_repeatabilityDataset.cpp b/src/samples/featuresRepeatability/main_repeatabilityDataset.cpp
index 45742008d2..719a37a77f 100644
--- a/src/samples/featuresRepeatability/main_repeatabilityDataset.cpp
+++ b/src/samples/featuresRepeatability/main_repeatabilityDataset.cpp
@@ -14,7 +14,7 @@
 #include <aliceVision/matching/RegionsMatcher.hpp>
 
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 
 #include <dependencies/vectorGraphics/svgDrawer.hpp>
 
diff --git a/src/samples/imageCaching/CMakeLists.txt b/src/samples/imageCaching/CMakeLists.txt
index 8d32e99b50..81f8d0bedc 100644
--- a/src/samples/imageCaching/CMakeLists.txt
+++ b/src/samples/imageCaching/CMakeLists.txt
@@ -3,5 +3,6 @@ alicevision_add_software(aliceVision_samples_imageCaching
   FOLDER ${FOLDER_SAMPLES}
   LINKS aliceVision_system
         aliceVision_image
+        aliceVision_cmdline
         Boost::program_options
 )
diff --git a/src/samples/imageCaching/main_imageCaching.cpp b/src/samples/imageCaching/main_imageCaching.cpp
index 3f86f8b1fd..ebbfb79dc0 100644
--- a/src/samples/imageCaching/main_imageCaching.cpp
+++ b/src/samples/imageCaching/main_imageCaching.cpp
@@ -7,7 +7,7 @@
 #include <aliceVision/image/ImageCache.hpp>
 
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <boost/program_options.hpp>
diff --git a/src/samples/kvldFilter/CMakeLists.txt b/src/samples/kvldFilter/CMakeLists.txt
index 41e38b3649..16761423e2 100644
--- a/src/samples/kvldFilter/CMakeLists.txt
+++ b/src/samples/kvldFilter/CMakeLists.txt
@@ -3,7 +3,7 @@ add_definitions(-DTHIS_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
 alicevision_add_software(aliceVision_samples_kvldFilter
   SOURCE main_kvldFilter.cpp
   FOLDER ${FOLDER_SAMPLES}
-  LINKS aliceVision_system
+  LINKS aliceVision_cmdline
         aliceVision_image
         aliceVision_multiview
         aliceVision_kvld
diff --git a/src/samples/multiBandBlending/main_multibandtest.cpp b/src/samples/multiBandBlending/main_multibandtest.cpp
index 775ecb745e..c698d41dab 100644
--- a/src/samples/multiBandBlending/main_multibandtest.cpp
+++ b/src/samples/multiBandBlending/main_multibandtest.cpp
@@ -9,7 +9,7 @@
 #include <aliceVision/image/io.hpp>
 #include <aliceVision//mvsData/Color.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 
 #include <boost/program_options.hpp>
 
diff --git a/src/samples/robustHomographyGrowing/main_robustHomographyGrowing.cpp b/src/samples/robustHomographyGrowing/main_robustHomographyGrowing.cpp
index 2a7a53cabd..ee129ba703 100644
--- a/src/samples/robustHomographyGrowing/main_robustHomographyGrowing.cpp
+++ b/src/samples/robustHomographyGrowing/main_robustHomographyGrowing.cpp
@@ -14,7 +14,7 @@
 #include <aliceVision/matchingImageCollection/GeometricFilterMatrix_HGrowing.hpp>
 #include <aliceVision/matching/svgVisualization.hpp>
 
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <boost/program_options.hpp>
 #include <dependencies/vectorGraphics/svgDrawer.hpp>
 
diff --git a/src/samples/texturing/main_evcorrection.cpp b/src/samples/texturing/main_evcorrection.cpp
index da237bb91e..2de9e0a6f5 100644
--- a/src/samples/texturing/main_evcorrection.cpp
+++ b/src/samples/texturing/main_evcorrection.cpp
@@ -6,7 +6,7 @@
  
 #include <aliceVision/sfmData/SfMData.hpp> 
 #include <aliceVision/system/Logger.hpp> 
-#include <aliceVision/system/cmdline.hpp> 
+#include <aliceVision/cmdline/cmdline.hpp> 
 #include <aliceVision/image/io.hpp> 
 #include <aliceVision/image/pixelTypes.hpp> 
  
diff --git a/src/software/convert/CMakeLists.txt b/src/software/convert/CMakeLists.txt
index 142d8a7deb..dc98f7858d 100644
--- a/src/software/convert/CMakeLists.txt
+++ b/src/software/convert/CMakeLists.txt
@@ -10,6 +10,7 @@ alicevision_add_software(aliceVision_convertSfMFormat
   SOURCE main_convertSfMFormat.cpp
   FOLDER ${FOLDER_SOFTWARE_CONVERT}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_feature
         aliceVision_sfmData
         aliceVision_sfmDataIO
@@ -24,6 +25,7 @@ alicevision_add_software(aliceVision_convertFloatDescriptorToUchar
   FOLDER ${FOLDER_SOFTWARE_CONVERT}
   LINKS aliceVision_localization
         aliceVision_feature
+        aliceVision_cmdline        
         Boost::program_options
         Boost::filesystem
         Boost::boost
@@ -37,6 +39,7 @@ alicevision_add_software(aliceVision_importKnownPoses
         aliceVision_feature
         aliceVision_sfmData
         aliceVision_sfmDataIO
+        aliceVision_cmdline
         Boost::program_options
         Boost::filesystem
         Boost::boost
@@ -50,6 +53,7 @@ alicevision_add_software(aliceVision_convertRAW
   FOLDER ${FOLDER_SOFTWARE_CONVERT}
   LINKS aliceVision_system
         aliceVision_image
+        aliceVision_cmdline
         Boost::program_options
         Boost::filesystem
 )
@@ -62,6 +66,7 @@ alicevision_add_software(aliceVision_convertMesh
   FOLDER ${FOLDER_SOFTWARE_CONVERT}
   LINKS aliceVision_system
         aliceVision_numeric
+        aliceVision_cmdline
 	aliceVision_mesh
         ${Boost_LIBRARIES}
 )
diff --git a/src/software/convert/main_convertFloatDescriptorToUchar.cpp b/src/software/convert/main_convertFloatDescriptorToUchar.cpp
index 9ff5dce212..07e402740d 100644
--- a/src/software/convert/main_convertFloatDescriptorToUchar.cpp
+++ b/src/software/convert/main_convertFloatDescriptorToUchar.cpp
@@ -6,7 +6,7 @@
 
 #include <aliceVision/feature/Descriptor.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <boost/filesystem.hpp>
diff --git a/src/software/convert/main_convertMesh.cpp b/src/software/convert/main_convertMesh.cpp
index fcccd8f220..fec6caabf2 100644
--- a/src/software/convert/main_convertMesh.cpp
+++ b/src/software/convert/main_convertMesh.cpp
@@ -5,7 +5,7 @@
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/mesh/Texturing.hpp>
diff --git a/src/software/convert/main_convertRAW.cpp b/src/software/convert/main_convertRAW.cpp
index ff43baab8b..264b7e869d 100644
--- a/src/software/convert/main_convertRAW.cpp
+++ b/src/software/convert/main_convertRAW.cpp
@@ -7,7 +7,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/image/io.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <boost/program_options.hpp>
diff --git a/src/software/convert/main_convertSfMFormat.cpp b/src/software/convert/main_convertSfMFormat.cpp
index 8913f16f3c..600a2d8d18 100644
--- a/src/software/convert/main_convertSfMFormat.cpp
+++ b/src/software/convert/main_convertSfMFormat.cpp
@@ -8,7 +8,7 @@
 #include <aliceVision/sfmData/SfMData.hpp>
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/stl/regex.hpp>
 #include <aliceVision/config.hpp>
diff --git a/src/software/convert/main_importKnownPoses.cpp b/src/software/convert/main_importKnownPoses.cpp
index 1a21170b95..8df7fe08ff 100644
--- a/src/software/convert/main_importKnownPoses.cpp
+++ b/src/software/convert/main_importKnownPoses.cpp
@@ -7,7 +7,7 @@
 #include <aliceVision/sfmData/SfMData.hpp>
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/config.hpp>
 #include <aliceVision/utils/regexFilter.hpp>
diff --git a/src/software/export/CMakeLists.txt b/src/software/export/CMakeLists.txt
index ea772e2207..ec15e9a7f9 100644
--- a/src/software/export/CMakeLists.txt
+++ b/src/software/export/CMakeLists.txt
@@ -11,6 +11,7 @@ if(ALICEVISION_HAVE_ALEMBIC)
     SOURCE main_exportAnimatedCamera.cpp
     FOLDER ${FOLDER_SOFTWARE_EXPORT}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_sfmData
           aliceVision_sfmDataIO
           Boost::program_options
@@ -25,6 +26,7 @@ alicevision_add_software(aliceVision_exportKeypoints
   SOURCE main_exportKeypoints.cpp
   FOLDER ${FOLDER_SOFTWARE_EXPORT}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_feature
         aliceVision_sfm
         aliceVision_sfmData
@@ -40,6 +42,7 @@ alicevision_add_software(aliceVision_exportMatches
   SOURCE main_exportMatches.cpp
   FOLDER ${FOLDER_SOFTWARE_EXPORT}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_feature
         aliceVision_sfm
         aliceVision_sfmData
@@ -55,6 +58,7 @@ alicevision_add_software(aliceVision_exportTracks
   SOURCE main_exportTracks.cpp
   FOLDER ${FOLDER_SOFTWARE_EXPORT}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_feature
         aliceVision_sfm
         aliceVision_sfmData
@@ -70,6 +74,7 @@ alicevision_add_software(aliceVision_exportPMVS
   SOURCE main_exportPMVS.cpp
   FOLDER ${FOLDER_SOFTWARE_EXPORT}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_feature
         aliceVision_sfmData
@@ -85,6 +90,7 @@ alicevision_add_software(aliceVision_exportColmap
         SOURCE main_exportColmap.cpp
         FOLDER ${FOLDER_SOFTWARE_EXPORT}
         LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_feature
         aliceVision_sfmData
@@ -101,6 +107,7 @@ alicevision_add_software(aliceVision_exportColoredPointCloud
   SOURCE main_exportColoredPointCloud.cpp
   FOLDER ${FOLDER_SOFTWARE_EXPORT}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_feature
         aliceVision_sfmData
@@ -114,6 +121,7 @@ if(ALICEVISION_HAVE_ALEMBIC) # maya can read alembic file
     SOURCE main_exportMeshroomMaya.cpp
     FOLDER ${FOLDER_SOFTWARE_EXPORT}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_image
           aliceVision_feature
           aliceVision_sfmData
@@ -131,6 +139,7 @@ alicevision_add_software(aliceVision_exportMVE2
   SOURCE main_exportMVE2.cpp
   FOLDER ${FOLDER_SOFTWARE_EXPORT}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_feature
         aliceVision_sfmData
@@ -146,6 +155,7 @@ alicevision_add_software(aliceVision_exportMeshlab
   SOURCE main_exportMeshlab.cpp
   FOLDER ${FOLDER_SOFTWARE_EXPORT}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_feature
         aliceVision_sfmData
@@ -161,6 +171,7 @@ alicevision_add_software(aliceVision_exportMVSTexturing
   SOURCE main_exportMVSTexturing.cpp
   FOLDER ${FOLDER_SOFTWARE_EXPORT}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_feature
         aliceVision_sfmData
@@ -174,6 +185,7 @@ alicevision_add_software(aliceVision_exportMatlab
   SOURCE main_exportMatlab.cpp
   FOLDER ${FOLDER_SOFTWARE_EXPORT}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_feature
         aliceVision_sfmData
@@ -189,6 +201,7 @@ alicevision_add_software(aliceVision_exportCameraFrustums
   SOURCE main_exportCameraFrustums.cpp
   FOLDER ${FOLDER_SOFTWARE_EXPORT}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_feature
         aliceVision_sfm
         aliceVision_sfmData
diff --git a/src/software/export/main_exportAnimatedCamera.cpp b/src/software/export/main_exportAnimatedCamera.cpp
index 0f9e2b67c3..b8ee433570 100644
--- a/src/software/export/main_exportAnimatedCamera.cpp
+++ b/src/software/export/main_exportAnimatedCamera.cpp
@@ -5,7 +5,7 @@
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
diff --git a/src/software/export/main_exportCameraFrustums.cpp b/src/software/export/main_exportCameraFrustums.cpp
index 603835da8e..8cddd3e0e7 100644
--- a/src/software/export/main_exportCameraFrustums.cpp
+++ b/src/software/export/main_exportCameraFrustums.cpp
@@ -10,7 +10,7 @@
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <boost/program_options.hpp>
diff --git a/src/software/export/main_exportColmap.cpp b/src/software/export/main_exportColmap.cpp
index 92cd6e5cbb..60cc860feb 100644
--- a/src/software/export/main_exportColmap.cpp
+++ b/src/software/export/main_exportColmap.cpp
@@ -10,7 +10,7 @@
 #include <aliceVision/sfmDataIO/colmap.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
diff --git a/src/software/export/main_exportColoredPointCloud.cpp b/src/software/export/main_exportColoredPointCloud.cpp
index a7ca01f698..e95fe03e95 100644
--- a/src/software/export/main_exportColoredPointCloud.cpp
+++ b/src/software/export/main_exportColoredPointCloud.cpp
@@ -9,7 +9,7 @@
 #include <aliceVision/sfmData/colorize.hpp>
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/config.hpp>
 
diff --git a/src/software/export/main_exportKeypoints.cpp b/src/software/export/main_exportKeypoints.cpp
index 8544bc6d0b..1f5d19bf39 100644
--- a/src/software/export/main_exportKeypoints.cpp
+++ b/src/software/export/main_exportKeypoints.cpp
@@ -13,7 +13,7 @@
 #include <aliceVision/sfm/pipeline/regionsIO.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/ProgressDisplay.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/image/all.hpp>
 
diff --git a/src/software/export/main_exportMVE2.cpp b/src/software/export/main_exportMVE2.cpp
index 9ed1300e13..db6be03caf 100644
--- a/src/software/export/main_exportMVE2.cpp
+++ b/src/software/export/main_exportMVE2.cpp
@@ -10,7 +10,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/system/ProgressDisplay.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
 
diff --git a/src/software/export/main_exportMVSTexturing.cpp b/src/software/export/main_exportMVSTexturing.cpp
index 4ac53f2e63..b3b8a72903 100644
--- a/src/software/export/main_exportMVSTexturing.cpp
+++ b/src/software/export/main_exportMVSTexturing.cpp
@@ -9,7 +9,7 @@
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
 
diff --git a/src/software/export/main_exportMatches.cpp b/src/software/export/main_exportMatches.cpp
index 2fb4f4b84d..763360c833 100644
--- a/src/software/export/main_exportMatches.cpp
+++ b/src/software/export/main_exportMatches.cpp
@@ -15,7 +15,7 @@
 #include <aliceVision/matching/svgVisualization.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/ProgressDisplay.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <dependencies/vectorGraphics/svgDrawer.hpp>
diff --git a/src/software/export/main_exportMatlab.cpp b/src/software/export/main_exportMatlab.cpp
index 722c93f2cb..af79b3aa97 100644
--- a/src/software/export/main_exportMatlab.cpp
+++ b/src/software/export/main_exportMatlab.cpp
@@ -9,7 +9,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/image/convertion.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
 
diff --git a/src/software/export/main_exportMeshlab.cpp b/src/software/export/main_exportMeshlab.cpp
index 330ebc5837..b7d3067ec0 100644
--- a/src/software/export/main_exportMeshlab.cpp
+++ b/src/software/export/main_exportMeshlab.cpp
@@ -10,7 +10,7 @@
 #include <aliceVision/numeric/numeric.hpp>
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
 
diff --git a/src/software/export/main_exportMeshroomMaya.cpp b/src/software/export/main_exportMeshroomMaya.cpp
index 331ca551e3..ca7a73402c 100644
--- a/src/software/export/main_exportMeshroomMaya.cpp
+++ b/src/software/export/main_exportMeshroomMaya.cpp
@@ -9,7 +9,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/ProgressDisplay.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
 
diff --git a/src/software/export/main_exportPMVS.cpp b/src/software/export/main_exportPMVS.cpp
index 2b779c20af..83b5479065 100644
--- a/src/software/export/main_exportPMVS.cpp
+++ b/src/software/export/main_exportPMVS.cpp
@@ -10,7 +10,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/system/ProgressDisplay.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
 
diff --git a/src/software/export/main_exportTracks.cpp b/src/software/export/main_exportTracks.cpp
index e68466e73e..c0854271ce 100644
--- a/src/software/export/main_exportTracks.cpp
+++ b/src/software/export/main_exportTracks.cpp
@@ -18,7 +18,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/ProgressDisplay.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <software/utils/sfmHelper/sfmIOHelper.hpp>
diff --git a/src/software/pipeline/CMakeLists.txt b/src/software/pipeline/CMakeLists.txt
index b21855bde7..f069addb9f 100644
--- a/src/software/pipeline/CMakeLists.txt
+++ b/src/software/pipeline/CMakeLists.txt
@@ -12,6 +12,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_cameraInit.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_sensorDB
           aliceVision_image
           aliceVision_feature
@@ -31,6 +32,7 @@ if(ALICEVISION_BUILD_SFM)
       LINKS aliceVision_image
             aliceVision_imageMasking
             aliceVision_system
+            aliceVision_cmdline
             aliceVision_sfmData
             aliceVision_sfmDataIO
             ${OpenCV_LIBRARIES}
@@ -43,6 +45,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_panoramaPrepareImages.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_sensorDB
           aliceVision_image
           aliceVision_feature
@@ -58,6 +61,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_featureExtraction.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_gpu
           aliceVision_image
           aliceVision_feature
@@ -77,6 +81,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_imageMatching.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_imageMatching
           aliceVision_matchingImageCollection
           aliceVision_sfm
@@ -93,6 +98,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_featureMatching.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_feature
           aliceVision_multiview
           aliceVision_matchingImageCollection
@@ -108,6 +114,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_incrementalSfM.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_image
           aliceVision_feature
           aliceVision_sfm
@@ -122,6 +129,7 @@ if(ALICEVISION_BUILD_SFM)
   SOURCE main_sfmTriangulation.cpp
   FOLDER ${FOLDER_SOFTWARE_PIPELINE}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_feature
         aliceVision_sfm
@@ -136,6 +144,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_globalSfM.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_image
           aliceVision_feature
           aliceVision_sfm
@@ -150,6 +159,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_panoramaEstimation.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_image
           aliceVision_feature
           aliceVision_sfm
@@ -161,6 +171,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_panoramaWarping.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_image
           aliceVision_feature
           aliceVision_sfm
@@ -173,6 +184,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_panoramaMerging.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_image
           aliceVision_sfmData
           aliceVision_sfmDataIO
@@ -183,6 +195,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_panoramaPostProcessing.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_image
           ${Boost_LIBRARIES}
   )
@@ -190,6 +203,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_panoramaCompositing.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_image
           aliceVision_sfmData
           aliceVision_sfmDataIO
@@ -200,6 +214,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_panoramaSeams.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_image
           aliceVision_sfmData
           aliceVision_sfmDataIO
@@ -210,6 +225,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_panoramaInit.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_image
           aliceVision_feature
           aliceVision_sfm
@@ -222,6 +238,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_computeStructureFromKnownPoses.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_feature
           aliceVision_sfm
           aliceVision_sfmData
@@ -239,6 +256,7 @@ if(ALICEVISION_BUILD_SFM)
             aliceVision_image
             aliceVision_calibration
             aliceVision_system
+            aliceVision_cmdline
             Boost::program_options
             Boost::filesystem
             Boost::boost
@@ -252,6 +270,7 @@ if(ALICEVISION_BUILD_SFM)
           aliceVision_image
           aliceVision_calibration
           aliceVision_system
+          aliceVision_cmdline
           aliceVision_sfmDataIO
           Boost::program_options
           Boost::filesystem
@@ -267,6 +286,7 @@ if(ALICEVISION_BUILD_SFM)
           aliceVision_dataio
           aliceVision_image
           aliceVision_feature
+          aliceVision_cmdline
           Boost::program_options
           Boost::filesystem
           Boost::boost
@@ -281,6 +301,7 @@ if(ALICEVISION_BUILD_SFM)
           aliceVision_calibration
           aliceVision_system
           aliceVision_sfmDataIO
+          aliceVision_cmdline
           Boost::program_options
           Boost::filesystem
           Boost::boost
@@ -299,6 +320,7 @@ if(ALICEVISION_BUILD_SFM)
           aliceVision_dataio
           aliceVision_image
           aliceVision_feature
+          aliceVision_cmdline
           Boost::program_options
           Boost::filesystem
           Boost::boost
@@ -318,6 +340,7 @@ if(ALICEVISION_BUILD_SFM)
           aliceVision_rig
           aliceVision_image
           aliceVision_feature
+          aliceVision_cmdline
           Boost::program_options
           Boost::filesystem
           Boost::boost
@@ -333,6 +356,7 @@ if(ALICEVISION_BUILD_SFM)
     SOURCE main_prepareDenseScene.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_image
           aliceVision_feature
           aliceVision_sfmData
@@ -353,6 +377,7 @@ if(ALICEVISION_BUILD_MVS)
       SOURCE main_depthMapEstimation.cpp
       FOLDER ${FOLDER_SOFTWARE_PIPELINE}
       LINKS aliceVision_system
+          aliceVision_cmdline
             aliceVision_gpu
             aliceVision_mvsData
             aliceVision_mvsUtils
@@ -368,6 +393,7 @@ if(ALICEVISION_BUILD_MVS)
       SOURCE main_depthMapFiltering.cpp
       FOLDER ${FOLDER_SOFTWARE_PIPELINE}
       LINKS aliceVision_system
+            aliceVision_cmdline
             aliceVision_mvsData
             aliceVision_mvsUtils
             aliceVision_fuseCut
@@ -384,6 +410,7 @@ if(ALICEVISION_BUILD_MVS)
     SOURCE main_meshing.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_mvsData
           aliceVision_mvsUtils
           aliceVision_mesh
@@ -401,6 +428,7 @@ if(ALICEVISION_BUILD_MVS)
       SOURCE main_meshDenoising.cpp
       FOLDER ${FOLDER_SOFTWARE_PIPELINE}
       LINKS aliceVision_system
+            aliceVision_cmdline
             aliceVision_mvsUtils
             MeshSDLibrary
             Eigen3::Eigen
@@ -413,6 +441,7 @@ if(ALICEVISION_BUILD_MVS)
       SOURCE main_meshDecimate.cpp
       FOLDER ${FOLDER_SOFTWARE_PIPELINE}
       LINKS aliceVision_system
+            aliceVision_cmdline
             aliceVision_mvsUtils
             OpenMesh
             Boost::program_options
@@ -425,6 +454,7 @@ if(ALICEVISION_BUILD_MVS)
     SOURCE main_meshFiltering.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_mvsUtils
           aliceVision_mesh
           Boost::program_options
@@ -436,6 +466,7 @@ if(ALICEVISION_BUILD_MVS)
     SOURCE main_meshMasking.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_sfmMvsUtils
           aliceVision_mvsUtils
           aliceVision_mesh
@@ -450,6 +481,7 @@ if(ALICEVISION_BUILD_MVS)
     SOURCE main_meshResampling.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_mvsUtils
           Geogram::geogram
           Boost::program_options
@@ -461,6 +493,7 @@ if(ALICEVISION_BUILD_MVS)
     SOURCE main_texturing.cpp
     FOLDER ${FOLDER_SOFTWARE_PIPELINE}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_mvsData
           aliceVision_sfmMvsUtils
           aliceVision_mvsUtils
@@ -479,6 +512,7 @@ alicevision_add_software(aliceVision_LdrToHdrSampling
   SOURCE main_LdrToHdrSampling.cpp
   FOLDER ${FOLDER_SOFTWARE_PIPELINE}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_hdr
         aliceVision_sfmData
@@ -492,6 +526,7 @@ alicevision_add_software(aliceVision_LdrToHdrCalibration
   SOURCE main_LdrToHdrCalibration.cpp
   FOLDER ${FOLDER_SOFTWARE_PIPELINE}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_hdr
         aliceVision_sfmData
@@ -504,6 +539,7 @@ alicevision_add_software(aliceVision_LdrToHdrMerge
   SOURCE main_LdrToHdrMerge.cpp
   FOLDER ${FOLDER_SOFTWARE_PIPELINE}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_hdr
         aliceVision_sfmData
diff --git a/src/software/pipeline/main_LdrToHdrCalibration.cpp b/src/software/pipeline/main_LdrToHdrCalibration.cpp
index 1eb73d1729..f397235853 100644
--- a/src/software/pipeline/main_LdrToHdrCalibration.cpp
+++ b/src/software/pipeline/main_LdrToHdrCalibration.cpp
@@ -7,7 +7,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/image/io.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <OpenImageIO/imagebufalgo.h>
 
@@ -93,7 +93,7 @@ void computeLuminanceStatFromSamples(const std::vector<hdr::ImageSample>& sample
 
 void computeLuminanceInfoFromImage(image::Image<image::RGBfColor>& image, luminanceInfo& lumaInfo)
 {
-    // Luminance statistics are calculated from a subsampled square, centered and rotated by 45�.
+    // Luminance statistics are calculated from a subsampled square, centered and rotated by 45 degree.
     // 2 vertices of this square are the centers of the longest sides of the image.
     // Such a shape is suitable for both fisheye and classic images.
 
diff --git a/src/software/pipeline/main_LdrToHdrMerge.cpp b/src/software/pipeline/main_LdrToHdrMerge.cpp
index 04a53a52b0..690908257e 100644
--- a/src/software/pipeline/main_LdrToHdrMerge.cpp
+++ b/src/software/pipeline/main_LdrToHdrMerge.cpp
@@ -7,7 +7,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/image/io.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <OpenImageIO/imagebufalgo.h>
 
diff --git a/src/software/pipeline/main_LdrToHdrSampling.cpp b/src/software/pipeline/main_LdrToHdrSampling.cpp
index 1d98092bd5..be493a667b 100644
--- a/src/software/pipeline/main_LdrToHdrSampling.cpp
+++ b/src/software/pipeline/main_LdrToHdrSampling.cpp
@@ -7,7 +7,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/image/io.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 // SFMData
diff --git a/src/software/pipeline/main_cameraCalibration.cpp b/src/software/pipeline/main_cameraCalibration.cpp
index b46d7bee49..c20213ce16 100644
--- a/src/software/pipeline/main_cameraCalibration.cpp
+++ b/src/software/pipeline/main_cameraCalibration.cpp
@@ -15,7 +15,7 @@
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/config.hpp>
 
 #include <boost/program_options.hpp>
diff --git a/src/software/pipeline/main_cameraInit.cpp b/src/software/pipeline/main_cameraInit.cpp
index 775f907e5e..c8eafcb29b 100644
--- a/src/software/pipeline/main_cameraInit.cpp
+++ b/src/software/pipeline/main_cameraInit.cpp
@@ -12,7 +12,7 @@
 #include <aliceVision/lensCorrectionProfile/lcp.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/image/io.cpp>
 #include <aliceVision/image/dcp.hpp>
 
diff --git a/src/software/pipeline/main_cameraLocalization.cpp b/src/software/pipeline/main_cameraLocalization.cpp
index 782e348bd1..45b018f11d 100644
--- a/src/software/pipeline/main_cameraLocalization.cpp
+++ b/src/software/pipeline/main_cameraLocalization.cpp
@@ -21,7 +21,7 @@
 #include <aliceVision/robustEstimation/estimators.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/utils/convert.hpp>
 
 #include <boost/filesystem.hpp>
diff --git a/src/software/pipeline/main_checkerboardDetection.cpp b/src/software/pipeline/main_checkerboardDetection.cpp
index a609c7e228..daeda801ee 100644
--- a/src/software/pipeline/main_checkerboardDetection.cpp
+++ b/src/software/pipeline/main_checkerboardDetection.cpp
@@ -4,7 +4,7 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
diff --git a/src/software/pipeline/main_computeStructureFromKnownPoses.cpp b/src/software/pipeline/main_computeStructureFromKnownPoses.cpp
index 168b08901a..a455bdda09 100644
--- a/src/software/pipeline/main_computeStructureFromKnownPoses.cpp
+++ b/src/software/pipeline/main_computeStructureFromKnownPoses.cpp
@@ -13,7 +13,7 @@
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/config.hpp>
 
 #include <boost/program_options.hpp>
diff --git a/src/software/pipeline/main_depthMapEstimation.cpp b/src/software/pipeline/main_depthMapEstimation.cpp
index 5a3d18d5d8..29c5717ce6 100644
--- a/src/software/pipeline/main_depthMapEstimation.cpp
+++ b/src/software/pipeline/main_depthMapEstimation.cpp
@@ -5,7 +5,7 @@
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/sfmData/SfMData.hpp>
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
diff --git a/src/software/pipeline/main_depthMapFiltering.cpp b/src/software/pipeline/main_depthMapFiltering.cpp
index 5107954d37..a2637c99fc 100644
--- a/src/software/pipeline/main_depthMapFiltering.cpp
+++ b/src/software/pipeline/main_depthMapFiltering.cpp
@@ -10,7 +10,7 @@
 #include <aliceVision/mvsData/StaticVector.hpp>
 #include <aliceVision/mvsUtils/common.hpp>
 #include <aliceVision/mvsUtils/MultiViewParams.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
diff --git a/src/software/pipeline/main_distortionCalibration.cpp b/src/software/pipeline/main_distortionCalibration.cpp
index a8d45b47c3..ffdacf7f62 100644
--- a/src/software/pipeline/main_distortionCalibration.cpp
+++ b/src/software/pipeline/main_distortionCalibration.cpp
@@ -10,7 +10,7 @@
 #include <boost/filesystem.hpp>
 #include <sstream>
 
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
diff --git a/src/software/pipeline/main_featureExtraction.cpp b/src/software/pipeline/main_featureExtraction.cpp
index c690072aaf..97570e2225 100644
--- a/src/software/pipeline/main_featureExtraction.cpp
+++ b/src/software/pipeline/main_featureExtraction.cpp
@@ -19,7 +19,7 @@
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
diff --git a/src/software/pipeline/main_featureMatching.cpp b/src/software/pipeline/main_featureMatching.cpp
index 8628a60956..31bb297e78 100644
--- a/src/software/pipeline/main_featureMatching.cpp
+++ b/src/software/pipeline/main_featureMatching.cpp
@@ -29,7 +29,7 @@
 #include <aliceVision/matching/io.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/graph/graph.hpp>
 #include <aliceVision/stl/stl.hpp>
 
diff --git a/src/software/pipeline/main_globalSfM.cpp b/src/software/pipeline/main_globalSfM.cpp
index 321c4c9257..6151b11e71 100644
--- a/src/software/pipeline/main_globalSfM.cpp
+++ b/src/software/pipeline/main_globalSfM.cpp
@@ -13,7 +13,7 @@
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
diff --git a/src/software/pipeline/main_imageMasking.cpp b/src/software/pipeline/main_imageMasking.cpp
index f753e6fa2a..96aff32b6a 100644
--- a/src/software/pipeline/main_imageMasking.cpp
+++ b/src/software/pipeline/main_imageMasking.cpp
@@ -11,7 +11,7 @@
 #include <aliceVision/imageMasking/imageMasking.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/Timer.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 
 #include <OpenImageIO/imagebuf.h>
 #include <OpenImageIO/imagebufalgo.h>
diff --git a/src/software/pipeline/main_imageMatching.cpp b/src/software/pipeline/main_imageMatching.cpp
index e7aeafb18a..d7d505d040 100644
--- a/src/software/pipeline/main_imageMatching.cpp
+++ b/src/software/pipeline/main_imageMatching.cpp
@@ -12,7 +12,7 @@
 #include <aliceVision/sfm/FrustumFilter.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/config.hpp>
 
 #include <Eigen/Core>
diff --git a/src/software/pipeline/main_incrementalSfM.cpp b/src/software/pipeline/main_incrementalSfM.cpp
index ff0fb50152..73029b696e 100644
--- a/src/software/pipeline/main_incrementalSfM.cpp
+++ b/src/software/pipeline/main_incrementalSfM.cpp
@@ -13,7 +13,7 @@
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/types.hpp>
 #include <aliceVision/config.hpp>
 #include <aliceVision/track/TracksBuilder.hpp>
diff --git a/src/software/pipeline/main_meshDecimate.cpp b/src/software/pipeline/main_meshDecimate.cpp
index 8f55223e52..131f6c1db3 100644
--- a/src/software/pipeline/main_meshDecimate.cpp
+++ b/src/software/pipeline/main_meshDecimate.cpp
@@ -4,7 +4,7 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
diff --git a/src/software/pipeline/main_meshDenoising.cpp b/src/software/pipeline/main_meshDenoising.cpp
index dff0033888..377c35bdf6 100644
--- a/src/software/pipeline/main_meshDenoising.cpp
+++ b/src/software/pipeline/main_meshDenoising.cpp
@@ -4,7 +4,7 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
diff --git a/src/software/pipeline/main_meshFiltering.cpp b/src/software/pipeline/main_meshFiltering.cpp
index fdb146e89b..e749dbe7f9 100644
--- a/src/software/pipeline/main_meshFiltering.cpp
+++ b/src/software/pipeline/main_meshFiltering.cpp
@@ -4,7 +4,7 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
diff --git a/src/software/pipeline/main_meshMasking.cpp b/src/software/pipeline/main_meshMasking.cpp
index bbe7bf3492..1ce6b92aaa 100644
--- a/src/software/pipeline/main_meshMasking.cpp
+++ b/src/software/pipeline/main_meshMasking.cpp
@@ -9,7 +9,7 @@
 #include <aliceVision/image/io.hpp>
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/mesh/Mesh.hpp>
 #include <aliceVision/mvsUtils/common.hpp>
 #include <aliceVision/sfmMvsUtils/visibility.hpp>
diff --git a/src/software/pipeline/main_meshResampling.cpp b/src/software/pipeline/main_meshResampling.cpp
index 66a314c038..7dc2dfe50e 100644
--- a/src/software/pipeline/main_meshResampling.cpp
+++ b/src/software/pipeline/main_meshResampling.cpp
@@ -4,7 +4,7 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
diff --git a/src/software/pipeline/main_meshing.cpp b/src/software/pipeline/main_meshing.cpp
index 1ea9645b9f..13d759982c 100644
--- a/src/software/pipeline/main_meshing.cpp
+++ b/src/software/pipeline/main_meshing.cpp
@@ -17,7 +17,7 @@
 #include <aliceVision/mvsUtils/common.hpp>
 #include <aliceVision/mvsUtils/MultiViewParams.hpp>
 #include <aliceVision/mvsUtils/fileIO.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
diff --git a/src/software/pipeline/main_panoramaCompositing.cpp b/src/software/pipeline/main_panoramaCompositing.cpp
index 72d56a4f5d..dac0aac633 100644
--- a/src/software/pipeline/main_panoramaCompositing.cpp
+++ b/src/software/pipeline/main_panoramaCompositing.cpp
@@ -23,7 +23,7 @@
 
 // Reading command line options
 #include <boost/program_options.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 // Numeric utils
diff --git a/src/software/pipeline/main_panoramaEstimation.cpp b/src/software/pipeline/main_panoramaEstimation.cpp
index e6890b09bb..07bf3b1e45 100644
--- a/src/software/pipeline/main_panoramaEstimation.cpp
+++ b/src/software/pipeline/main_panoramaEstimation.cpp
@@ -14,7 +14,7 @@
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/image/all.hpp>
 
 #include <boost/program_options.hpp>
diff --git a/src/software/pipeline/main_panoramaInit.cpp b/src/software/pipeline/main_panoramaInit.cpp
index 5d93658cdf..f244f46802 100644
--- a/src/software/pipeline/main_panoramaInit.cpp
+++ b/src/software/pipeline/main_panoramaInit.cpp
@@ -1,5 +1,5 @@
 #include <aliceVision/image/all.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/numeric/numeric.hpp>
 #include <aliceVision/sfmData/SfMData.hpp>
diff --git a/src/software/pipeline/main_panoramaMerging.cpp b/src/software/pipeline/main_panoramaMerging.cpp
index 4a4100fe16..85ccef81fa 100644
--- a/src/software/pipeline/main_panoramaMerging.cpp
+++ b/src/software/pipeline/main_panoramaMerging.cpp
@@ -18,7 +18,7 @@
 
 // Reading command line options
 #include <boost/program_options.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 // IO
diff --git a/src/software/pipeline/main_panoramaPostProcessing.cpp b/src/software/pipeline/main_panoramaPostProcessing.cpp
index 1bc6de326f..cbe3a14315 100644
--- a/src/software/pipeline/main_panoramaPostProcessing.cpp
+++ b/src/software/pipeline/main_panoramaPostProcessing.cpp
@@ -14,7 +14,7 @@
 
 // Reading command line options
 #include <boost/program_options.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <aliceVision/stl/mapUtils.hpp>
diff --git a/src/software/pipeline/main_panoramaPrepareImages.cpp b/src/software/pipeline/main_panoramaPrepareImages.cpp
index 85dc5b50cf..977f344a9f 100644
--- a/src/software/pipeline/main_panoramaPrepareImages.cpp
+++ b/src/software/pipeline/main_panoramaPrepareImages.cpp
@@ -7,7 +7,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/image/io.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <OpenImageIO/imagebufalgo.h>
 
diff --git a/src/software/pipeline/main_panoramaSeams.cpp b/src/software/pipeline/main_panoramaSeams.cpp
index 4456ff072a..f08f60f1ae 100644
--- a/src/software/pipeline/main_panoramaSeams.cpp
+++ b/src/software/pipeline/main_panoramaSeams.cpp
@@ -22,7 +22,7 @@
 
 // Reading command line options
 #include <boost/program_options.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 // IO
diff --git a/src/software/pipeline/main_panoramaWarping.cpp b/src/software/pipeline/main_panoramaWarping.cpp
index 564ad013e1..696be04870 100644
--- a/src/software/pipeline/main_panoramaWarping.cpp
+++ b/src/software/pipeline/main_panoramaWarping.cpp
@@ -7,7 +7,7 @@
 // Reading command line options
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 // Image related
diff --git a/src/software/pipeline/main_prepareDenseScene.cpp b/src/software/pipeline/main_prepareDenseScene.cpp
index 9122fb9e2f..a9c67fb202 100644
--- a/src/software/pipeline/main_prepareDenseScene.cpp
+++ b/src/software/pipeline/main_prepareDenseScene.cpp
@@ -9,7 +9,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/ProgressDisplay.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/config.hpp>
 #include <aliceVision/sfmDataIO/viewIO.hpp>
diff --git a/src/software/pipeline/main_rigCalibration.cpp b/src/software/pipeline/main_rigCalibration.cpp
index cbcdbb2947..6d47241d1f 100644
--- a/src/software/pipeline/main_rigCalibration.cpp
+++ b/src/software/pipeline/main_rigCalibration.cpp
@@ -17,7 +17,7 @@
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/robustEstimation/estimators.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/utils/convert.hpp>
 
diff --git a/src/software/pipeline/main_rigLocalization.cpp b/src/software/pipeline/main_rigLocalization.cpp
index d0152d4c62..bff20f9496 100644
--- a/src/software/pipeline/main_rigLocalization.cpp
+++ b/src/software/pipeline/main_rigLocalization.cpp
@@ -17,7 +17,7 @@
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/robustEstimation/estimators.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/utils/convert.hpp>
 
diff --git a/src/software/pipeline/main_sfmTriangulation.cpp b/src/software/pipeline/main_sfmTriangulation.cpp
index 78d71cc942..36522cf124 100644
--- a/src/software/pipeline/main_sfmTriangulation.cpp
+++ b/src/software/pipeline/main_sfmTriangulation.cpp
@@ -12,7 +12,7 @@
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/types.hpp>
 #include <aliceVision/config.hpp>
 #include <aliceVision/track/TracksBuilder.hpp>
diff --git a/src/software/pipeline/main_texturing.cpp b/src/software/pipeline/main_texturing.cpp
index 7cb9b90b10..e63c020956 100644
--- a/src/software/pipeline/main_texturing.cpp
+++ b/src/software/pipeline/main_texturing.cpp
@@ -15,7 +15,7 @@
 #include <aliceVision/mvsUtils/MultiViewParams.hpp>
 #include <aliceVision/mvsUtils/ImagesCache.hpp>
 #include <aliceVision/sfmMvsUtils/visibility.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
diff --git a/src/software/utils/CMakeLists.txt b/src/software/utils/CMakeLists.txt
index 561ee04e30..022bd5bb7c 100644
--- a/src/software/utils/CMakeLists.txt
+++ b/src/software/utils/CMakeLists.txt
@@ -10,6 +10,7 @@ alicevision_add_software(aliceVision_hardwareResources
   SOURCE main_hardwareResources.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_gpu
         Boost::program_options
 )
@@ -23,6 +24,7 @@ if(ALICEVISION_HAVE_UNCERTAINTYTE)
       FOLDER ${FOLDER_SOFTWARE_UTILS}
       LINKS aliceVision_sfm
             aliceVision_system
+            aliceVision_cmdline
             ${CUDA_LIBRARIES}
             ${CUDA_CUBLAS_LIBRARIES}
             ${CUDA_cusparse_LIBRARY}
@@ -40,6 +42,7 @@ alicevision_add_software(aliceVision_imageProcessing
     SOURCE main_imageProcessing.cpp
     FOLDER ${FOLDER_SOFTWARE_UTILS}
     LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_feature
         aliceVision_sfm
@@ -61,6 +64,7 @@ alicevision_add_software(aliceVision_importMiddlebury
         aliceVision_sfmData
         aliceVision_sfmDataIO
         aliceVision_system
+        aliceVision_cmdline
         ${Boost_LIBRARIES}
         )
 
@@ -73,6 +77,7 @@ alicevision_add_software(aliceVision_voctreeCreation
         aliceVision_sfmData
         aliceVision_sfmDataIO
         aliceVision_system
+        aliceVision_cmdline
         Boost::program_options
 )
 
@@ -85,6 +90,7 @@ alicevision_add_software(aliceVision_voctreeQueryUtility
         aliceVision_sfmData
         aliceVision_sfmDataIO
         aliceVision_system
+        aliceVision_cmdline
         Boost::program_options
         Boost::boost
         Boost::timer
@@ -97,6 +103,7 @@ alicevision_add_software(aliceVision_voctreeStatistics
   LINKS aliceVision_voctree
         aliceVision_sfmData
         aliceVision_system
+        aliceVision_cmdline
         aliceVision_sfmDataIO
         Boost::program_options
         Boost::boost
@@ -107,6 +114,7 @@ alicevision_add_software(aliceVision_frustumFiltering
   SOURCE main_frustumFiltering.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_feature
         aliceVision_matchingImageCollection
         aliceVision_sfm
@@ -127,6 +135,7 @@ if(ALICEVISION_HAVE_ALEMBIC)
           aliceVision_dataio
           aliceVision_rig
           aliceVision_system
+          aliceVision_cmdline
           Boost::program_options
           Boost::filesystem
   )
@@ -138,6 +147,7 @@ alicevision_add_software(aliceVision_qualityEvaluation
   SOURCE main_qualityEvaluation.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_feature
         aliceVision_sfmData
         aliceVision_sfmDataIO
@@ -150,6 +160,7 @@ alicevision_add_software(aliceVision_sfmAlignment
   SOURCE main_sfmAlignment.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_feature
         aliceVision_sfm
         aliceVision_sfmData
@@ -162,6 +173,7 @@ alicevision_add_software(aliceVision_sfmTransfer
   SOURCE main_sfmTransfer.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_feature
         aliceVision_sfm
         aliceVision_sfmData
@@ -174,6 +186,7 @@ alicevision_add_software(aliceVision_sfmTransform
   SOURCE main_sfmTransform.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_feature
         aliceVision_sfm
         aliceVision_sfmData
@@ -187,6 +200,7 @@ alicevision_add_software(aliceVision_sfmColorHarmonize
          sfmColorHarmonize/colorHarmonizeEngineGlobal.cpp # TODO
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_image
         aliceVision_feature
         aliceVision_kvld
@@ -208,6 +222,7 @@ alicevision_add_software(aliceVision_sfmLocalization
   SOURCE main_sfmLocalization.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_feature
         aliceVision_sfm
         aliceVision_sfmData
@@ -223,6 +238,7 @@ if(ALICEVISION_HAVE_OPENCV)
     SOURCE main_keyframeSelection.cpp
     FOLDER ${FOLDER_SOFTWARE_UTILS}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_image
           aliceVision_keyframe
           ${OPENIMAGEIO_LIBRARIES}
@@ -240,6 +256,7 @@ alicevision_add_software(aliceVision_sfmDistances
         aliceVision_sfmData
         aliceVision_sfmDataIO
         aliceVision_system
+        aliceVision_cmdline
         ${Boost_LIBRARIES}
 )
 
@@ -248,6 +265,7 @@ alicevision_add_software(aliceVision_split360Images
   SOURCE main_split360Images.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_numeric
         aliceVision_image
         aliceVision_panorama
@@ -262,6 +280,7 @@ alicevision_add_software(aliceVision_fisheyeProjection
   SOURCE main_fisheyeProjection.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_numeric
         aliceVision_image
         ${OPENIMAGEIO_LIBRARIES}
@@ -273,6 +292,7 @@ alicevision_add_software(aliceVision_lightingEstimation
   SOURCE main_lightingEstimation.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_numeric
         aliceVision_sfmData
         aliceVision_sfmDataIO
@@ -288,6 +308,7 @@ alicevision_add_software(aliceVision_generateSampleScene
   SOURCE main_generateSampleScene.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_numeric
         aliceVision_sfmData
         aliceVision_sfmDataIO
@@ -302,6 +323,7 @@ if(ALICEVISION_HAVE_OPENCV_CONTRIB)
     SOURCE main_colorCheckerDetection.cpp
     FOLDER ${FOLDER_SOFTWARE_UTILS}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_sfmData
           aliceVision_sfmDataIO
           Boost::program_options
@@ -318,6 +340,7 @@ if(ALICEVISION_HAVE_OPENCV_CONTRIB)
     SOURCE main_colorCheckerCorrection.cpp
     FOLDER ${FOLDER_SOFTWARE_UTILS}
     LINKS aliceVision_system
+          aliceVision_cmdline
           aliceVision_sfmData
           aliceVision_sfmDataIO
           Boost::program_options
@@ -336,6 +359,7 @@ alicevision_add_software(aliceVision_mergeMeshes
   SOURCE main_mergeMeshes.cpp
   FOLDER ${FOLDER_SOFTWARE_UTILS}
   LINKS aliceVision_system
+        aliceVision_cmdline
         aliceVision_numeric
 	Geogram::geogram
         ${Boost_LIBRARIES}
diff --git a/src/software/utils/main_colorCheckerCorrection.cpp b/src/software/utils/main_colorCheckerCorrection.cpp
index 107e652cec..30e8247043 100644
--- a/src/software/utils/main_colorCheckerCorrection.cpp
+++ b/src/software/utils/main_colorCheckerCorrection.cpp
@@ -11,7 +11,7 @@
 #include <aliceVision/utils/regexFilter.hpp>
 #include <aliceVision/utils/filesIO.hpp>
 
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/config.hpp>
 
diff --git a/src/software/utils/main_colorCheckerDetection.cpp b/src/software/utils/main_colorCheckerDetection.cpp
index b042176d96..79c65d2943 100644
--- a/src/software/utils/main_colorCheckerDetection.cpp
+++ b/src/software/utils/main_colorCheckerDetection.cpp
@@ -8,7 +8,7 @@
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 
 #include <aliceVision/image/all.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/config.hpp>
 #include <aliceVision/utils/filesIO.hpp>
diff --git a/src/software/utils/main_computeUncertainty.cpp b/src/software/utils/main_computeUncertainty.cpp
index 7c2e6bc2cb..6545aa5ba8 100644
--- a/src/software/utils/main_computeUncertainty.cpp
+++ b/src/software/utils/main_computeUncertainty.cpp
@@ -7,7 +7,7 @@
 #include <aliceVision/sfm/BundleAdjustmentCeres.hpp>
 #include <aliceVision/sfmData/SfMData.hpp>
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/config.hpp>
 
diff --git a/src/software/utils/main_fisheyeProjection.cpp b/src/software/utils/main_fisheyeProjection.cpp
index 36b87806a7..97fbe72784 100644
--- a/src/software/utils/main_fisheyeProjection.cpp
+++ b/src/software/utils/main_fisheyeProjection.cpp
@@ -10,7 +10,7 @@
 #include <aliceVision/image/Sampler.hpp>
 #include <aliceVision/image/convertion.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/camera/camera.hpp>
 
diff --git a/src/software/utils/main_frustumFiltering.cpp b/src/software/utils/main_frustumFiltering.cpp
index 01b8ec2bd0..b0a3d76c57 100644
--- a/src/software/utils/main_frustumFiltering.cpp
+++ b/src/software/utils/main_frustumFiltering.cpp
@@ -11,7 +11,7 @@
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/matchingImageCollection/ImagePairListIO.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <boost/program_options.hpp>
diff --git a/src/software/utils/main_generateSampleScene.cpp b/src/software/utils/main_generateSampleScene.cpp
index f6d49cdb1c..4577d459d0 100644
--- a/src/software/utils/main_generateSampleScene.cpp
+++ b/src/software/utils/main_generateSampleScene.cpp
@@ -6,7 +6,7 @@
 
 #include <aliceVision/numeric/numeric.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/sfmDataIO/sceneSample.hpp>
diff --git a/src/software/utils/main_hardwareResources.cpp b/src/software/utils/main_hardwareResources.cpp
index 0bfe6494f3..bd6aebe61e 100644
--- a/src/software/utils/main_hardwareResources.cpp
+++ b/src/software/utils/main_hardwareResources.cpp
@@ -5,7 +5,7 @@
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/MemoryInfo.hpp>
 #include <aliceVision/gpu/gpu.hpp>
diff --git a/src/software/utils/main_imageProcessing.cpp b/src/software/utils/main_imageProcessing.cpp
index 2207e4a21e..1e1e55b7bd 100644
--- a/src/software/utils/main_imageProcessing.cpp
+++ b/src/software/utils/main_imageProcessing.cpp
@@ -1,5 +1,5 @@
 #include <aliceVision/image/all.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/Logger.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/numeric/numeric.hpp>
diff --git a/src/software/utils/main_importMiddlebury.cpp b/src/software/utils/main_importMiddlebury.cpp
index f2f844e986..1f7191f32f 100644
--- a/src/software/utils/main_importMiddlebury.cpp
+++ b/src/software/utils/main_importMiddlebury.cpp
@@ -9,7 +9,7 @@
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <boost/program_options.hpp>
diff --git a/src/software/utils/main_keyframeSelection.cpp b/src/software/utils/main_keyframeSelection.cpp
index 446f0c5ae9..6da59a00b3 100644
--- a/src/software/utils/main_keyframeSelection.cpp
+++ b/src/software/utils/main_keyframeSelection.cpp
@@ -7,7 +7,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/keyframe/KeyframeSelector.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <boost/program_options.hpp> 
diff --git a/src/software/utils/main_lightingEstimation.cpp b/src/software/utils/main_lightingEstimation.cpp
index 4770f28433..9226b75726 100644
--- a/src/software/utils/main_lightingEstimation.cpp
+++ b/src/software/utils/main_lightingEstimation.cpp
@@ -5,7 +5,7 @@
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/sfmData/SfMData.hpp>
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
diff --git a/src/software/utils/main_mergeMeshes.cpp b/src/software/utils/main_mergeMeshes.cpp
index 0ec53a6b87..41a9ce8edf 100644
--- a/src/software/utils/main_mergeMeshes.cpp
+++ b/src/software/utils/main_mergeMeshes.cpp
@@ -5,7 +5,7 @@
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/system/Timer.hpp>
 
diff --git a/src/software/utils/main_qualityEvaluation.cpp b/src/software/utils/main_qualityEvaluation.cpp
index 46a9eaccb3..691954e599 100644
--- a/src/software/utils/main_qualityEvaluation.cpp
+++ b/src/software/utils/main_qualityEvaluation.cpp
@@ -8,7 +8,7 @@
 #include <aliceVision/sfmData/SfMData.hpp>
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/config.hpp>
 
diff --git a/src/software/utils/main_rigTransform.cpp b/src/software/utils/main_rigTransform.cpp
index fba417b1ba..30a0b6cadd 100644
--- a/src/software/utils/main_rigTransform.cpp
+++ b/src/software/utils/main_rigTransform.cpp
@@ -9,7 +9,7 @@
 #include <aliceVision/sfmDataIO/AlembicExporter.hpp>
 #include <aliceVision/rig/Rig.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <boost/program_options.hpp> 
diff --git a/src/software/utils/main_sfmAlignment.cpp b/src/software/utils/main_sfmAlignment.cpp
index 02abcc6dfc..e5997b0053 100644
--- a/src/software/utils/main_sfmAlignment.cpp
+++ b/src/software/utils/main_sfmAlignment.cpp
@@ -8,7 +8,7 @@
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/sfm/utils/alignment.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/config.hpp>
 
diff --git a/src/software/utils/main_sfmColorHarmonize.cpp b/src/software/utils/main_sfmColorHarmonize.cpp
index 059974e4e8..fc3675eb2e 100644
--- a/src/software/utils/main_sfmColorHarmonize.cpp
+++ b/src/software/utils/main_sfmColorHarmonize.cpp
@@ -7,7 +7,7 @@
 
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <software/utils/sfmColorHarmonize/colorHarmonizeEngineGlobal.hpp>
diff --git a/src/software/utils/main_sfmDistances.cpp b/src/software/utils/main_sfmDistances.cpp
index b101745df8..f405062947 100644
--- a/src/software/utils/main_sfmDistances.cpp
+++ b/src/software/utils/main_sfmDistances.cpp
@@ -8,7 +8,7 @@
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/sfm/utils/alignment.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/config.hpp>
 
 #include <boost/program_options.hpp>
diff --git a/src/software/utils/main_sfmLocalization.cpp b/src/software/utils/main_sfmLocalization.cpp
index c2fdda99cf..0a80e21f6e 100644
--- a/src/software/utils/main_sfmLocalization.cpp
+++ b/src/software/utils/main_sfmLocalization.cpp
@@ -13,7 +13,7 @@
 #include <aliceVision/image/all.hpp>
 #include <aliceVision/system/Timer.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <boost/program_options.hpp>
diff --git a/src/software/utils/main_sfmTransfer.cpp b/src/software/utils/main_sfmTransfer.cpp
index 03334b22d9..721dda5046 100644
--- a/src/software/utils/main_sfmTransfer.cpp
+++ b/src/software/utils/main_sfmTransfer.cpp
@@ -9,7 +9,7 @@
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/sfm/utils/alignment.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/config.hpp>
 
diff --git a/src/software/utils/main_sfmTransform.cpp b/src/software/utils/main_sfmTransform.cpp
index 77943b50be..b48a4a5ec5 100644
--- a/src/software/utils/main_sfmTransform.cpp
+++ b/src/software/utils/main_sfmTransform.cpp
@@ -8,7 +8,7 @@
 #include <aliceVision/sfmDataIO/sfmDataIO.hpp>
 #include <aliceVision/sfm/utils/alignment.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/config.hpp>
 
diff --git a/src/software/utils/main_split360Images.cpp b/src/software/utils/main_split360Images.cpp
index 4419d9a414..a280af4235 100644
--- a/src/software/utils/main_split360Images.cpp
+++ b/src/software/utils/main_split360Images.cpp
@@ -9,7 +9,7 @@
 #include <aliceVision/image/io.hpp>
 #include <aliceVision/image/Sampler.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <dependencies/vectorGraphics/svgDrawer.hpp>
diff --git a/src/software/utils/main_voctreeCreation.cpp b/src/software/utils/main_voctreeCreation.cpp
index 8971c6d792..76a15f23b9 100644
--- a/src/software/utils/main_voctreeCreation.cpp
+++ b/src/software/utils/main_voctreeCreation.cpp
@@ -12,7 +12,7 @@
 #include <aliceVision/voctree/descriptorLoader.hpp>
 #include <aliceVision/feature/Descriptor.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <Eigen/Core>
diff --git a/src/software/utils/main_voctreeQueryUtility.cpp b/src/software/utils/main_voctreeQueryUtility.cpp
index ae3a28cf9d..cfff409c61 100644
--- a/src/software/utils/main_voctreeQueryUtility.cpp
+++ b/src/software/utils/main_voctreeQueryUtility.cpp
@@ -13,7 +13,7 @@
 #include <aliceVision/voctree/descriptorLoader.hpp>
 #include <aliceVision/matching/IndMatch.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 #include <aliceVision/types.hpp>
 #include <aliceVision/utils/convert.hpp>
diff --git a/src/software/utils/main_voctreeStatistics.cpp b/src/software/utils/main_voctreeStatistics.cpp
index 2d08105f23..8eed147b2d 100644
--- a/src/software/utils/main_voctreeStatistics.cpp
+++ b/src/software/utils/main_voctreeStatistics.cpp
@@ -11,7 +11,7 @@
 #include <aliceVision/voctree/VocabularyTree.hpp>
 #include <aliceVision/voctree/descriptorLoader.hpp>
 #include <aliceVision/system/Logger.hpp>
-#include <aliceVision/system/cmdline.hpp>
+#include <aliceVision/cmdline/cmdline.hpp>
 #include <aliceVision/system/main.hpp>
 
 #include <boost/program_options.hpp>