diff --git a/CMakeLists.txt b/CMakeLists.txt
index fccf8971..3345982f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@ if (MSVC)
     add_definitions(-DWIN32_LEAN_AND_MEAN)
 endif()
 
+option(BUILD_WITH_CLI_TOOLS "Build with command line tools" ON)
 option(UTL_PROFILER_DISABLE "Disable UTL profiler (zero overhead when ON)" ON)
 
 get_filename_component(REPOSITORY_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} ABSOLUTE)
@@ -409,9 +410,13 @@ set(CORE_LIBRARIES core core-hd-mapping)
 set(GUI_LIBRARIES imgui imguizmo implot)
 
 #add_subdirectory(apps/hd_mapper)
+
+if(BUILD_WITH_CLI_TOOLS)
+    add_subdirectory(apps/console_tools)
+endif()
+
 add_subdirectory(apps/lidar_odometry_step_1)    
 add_subdirectory(apps/manual_color)
-add_subdirectory(apps/console_tools)
 add_subdirectory(apps/multi_session_registration)
 add_subdirectory(apps/multi_view_tls_registration)
 add_subdirectory(apps/split_multi_livox)
@@ -424,10 +429,7 @@ add_subdirectory(apps/mandeye_single_session_viewer)
 add_subdirectory(apps/livox_mid_360_intrinsic_calibration)
 add_subdirectory(apps/single_session_manual_coloring)
 add_subdirectory(apps/concatenate_multi_livox)
-add_subdirectory(apps/laz_to_ply)
-add_subdirectory(apps/laz_to_pcd)
 
- 
 # CPack configuration
 set(CPACK_PACKAGE_NAME "hd_mapping")
 set(CPACK_PACKAGE_VERSION "${HDMAPPING_VERSION_MAJOR}.${HDMAPPING_VERSION_MINOR}.${HDMAPPING_VERSION_PATCH}")
diff --git a/apps/console_tools/CMakeLists.txt b/apps/console_tools/CMakeLists.txt
index 3ed8e2a9..12473614 100644
--- a/apps/console_tools/CMakeLists.txt
+++ b/apps/console_tools/CMakeLists.txt
@@ -26,4 +26,12 @@ target_include_directories(
   multiply_timestamps_session_trajectory_csv PRIVATE include ${REPOSITORY_DIRECTORY}/core/include
                      ${EIGEN3_INCLUDE_DIR})
 
-target_link_libraries(multiply_timestamps_session_trajectory_csv PRIVATE ${PLATFORM_MISCELLANEOUS_LIBS})
\ No newline at end of file
+target_link_libraries(multiply_timestamps_session_trajectory_csv PRIVATE ${PLATFORM_MISCELLANEOUS_LIBS})
+
+add_executable(laz_to_ply laz_to_ply.cpp)
+target_link_libraries(laz_to_ply PRIVATE ${PLATFORM_LASZIP_LIB})
+target_include_directories(laz_to_ply PRIVATE ${LASZIP_INCLUDE_DIR}/LASzip/include ${PROJECT_BINARY_DIR}/include)
+
+add_executable(laz_to_pcd laz_to_pcd.cpp)
+target_link_libraries(laz_to_pcd PRIVATE ${PLATFORM_LASZIP_LIB})
+target_include_directories(laz_to_pcd PRIVATE ${LASZIP_INCLUDE_DIR}/LASzip/include ${PROJECT_BINARY_DIR}/include)
\ No newline at end of file
diff --git a/apps/laz_to_pcd/laz_to_pcd.cpp b/apps/console_tools/laz_to_pcd.cpp
similarity index 100%
rename from apps/laz_to_pcd/laz_to_pcd.cpp
rename to apps/console_tools/laz_to_pcd.cpp
diff --git a/apps/laz_to_ply/main.cpp b/apps/console_tools/laz_to_ply.cpp
similarity index 100%
rename from apps/laz_to_ply/main.cpp
rename to apps/console_tools/laz_to_ply.cpp
diff --git a/apps/laz_to_pcd/CMakeLists.txt b/apps/laz_to_pcd/CMakeLists.txt
deleted file mode 100644
index ed6bf0ec..00000000
--- a/apps/laz_to_pcd/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.15.0)
-
-project(laz_to_pcd)
-
-add_executable(laz_to_pcd laz_to_pcd.cpp)
-target_link_libraries(laz_to_pcd PRIVATE ${PLATFORM_LASZIP_LIB})
-target_include_directories(laz_to_pcd PRIVATE ${LASZIP_INCLUDE_DIR}/LASzip/include ${PROJECT_BINARY_DIR}/include)
\ No newline at end of file
diff --git a/apps/laz_to_ply/CMakeLists.txt b/apps/laz_to_ply/CMakeLists.txt
deleted file mode 100644
index 6e98c971..00000000
--- a/apps/laz_to_ply/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-cmake_minimum_required(VERSION 3.15.0)
-
-project(laz_to_ply)
-
-add_executable(laz_to_ply main.cpp)
-target_link_libraries(laz_to_ply PRIVATE ${PLATFORM_LASZIP_LIB})
-target_include_directories(laz_to_ply PRIVATE ${LASZIP_INCLUDE_DIR}/LASzip/include ${PROJECT_BINARY_DIR}/include)
\ No newline at end of file