diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29462cf8..656376d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@ set_property(CACHE HD_CPU_OPTIMIZATION PROPERTY STRINGS AUTO INTEL AMD ARM GENER
 
 # Options to enable / disable specific components
 option(BUILD_WITH_CLI_TOOLS "Build with command line tools" ON)
+option(BUILD_WITH_HD_MAPPER_APPLICATION "Build with hd_mapper tool" OFF)
 option(UTL_PROFILER_DISABLE "Disable UTL profiler (zero overhead when ON)" ON)
 option(BUILD_WITH_BUNDLED_FREEGLUT "Build with bundled FreeGlut" ON)
 option(BUILD_WITH_BUNDLED_GLEW "Build with bundled GLEW" ON)
@@ -200,17 +201,18 @@ add_subdirectory(${THIRDPARTY_DIRECTORY}/vqf/vqf/cpp)
 add_subdirectory(${THIRDPARTY_DIRECTORY}/Fusion/Fusion)
 
 add_subdirectory(core)
-add_subdirectory(core_hd_mapping)
 
-set(CORE_LIBRARIES core core-hd-mapping)
+set(CORE_LIBRARIES core)
 set(GUI_LIBRARIES imgui imguizmo implot)
 
-#add_subdirectory(apps/hd_mapper)
-
 if(BUILD_WITH_CLI_TOOLS)
     add_subdirectory(apps/console_tools)
 endif()
 
+if(BUILD_WITH_HD_MAPPER_APPLICATION)
+    add_subdirectory(apps/hd_mapper)
+endif()
+
 add_subdirectory(apps/lidar_odometry_step_1)    
 add_subdirectory(apps/manual_color)
 add_subdirectory(apps/multi_session_registration)
@@ -240,7 +242,6 @@ else()
     disable_target_warnings(laszip_api3)
 endif()
 
-
 if(NOT WIN32)
     disable_target_warnings(tbb)
     disable_target_warnings(tbbbind_2_5)
diff --git a/apps/hd_mapper/CMakeLists.txt b/apps/hd_mapper/CMakeLists.txt
index 2ee5fee5..c800bc9d 100644
--- a/apps/hd_mapper/CMakeLists.txt
+++ b/apps/hd_mapper/CMakeLists.txt
@@ -2,13 +2,21 @@ cmake_minimum_required(VERSION 4.0.0)
 
 project(hd_mapper)
 
-add_executable(hd_mapper hd_mapper.cpp)
+add_executable(hd_mapper
+  hd_mapper.cpp
+  laz_wrapper.cpp
+  odo_with_gnss_fusion.cpp
+  project_settings.cpp
+  roi_exporter.cpp
+  single_trajectory_viewer.cpp
+  ${EXTERNAL_LIBRARIES_DIRECTORY}/src/plycpp.cpp)
+
 target_link_libraries(
   hd_mapper
-  PRIVATE
+  PRIVATE spdlog::spdlog
+          OpenGL::GLU
           ${FREEGLUT_LIBRARY}
           ${OPENGL_gl_LIBRARY}
-          OpenGL::GLU
           ${PLATFORM_LASZIP_LIB}
           ${PLATFORM_MISCELLANEOUS_LIBS}
           ${CORE_LIBRARIES}
@@ -17,18 +25,19 @@ target_link_libraries(
 target_include_directories(
   hd_mapper
   PRIVATE include
+          ${EXTERNAL_LIBRARIES_DIRECTORY}/include
           ${REPOSITORY_DIRECTORY}/core/include
-          ${REPOSITORY_DIRECTORY}/core_hd_mapping/include
-          ${THIRDPARTY_DIRECTORY}/glm
           ${EIGEN3_INCLUDE_DIR}
+          ${FREEGLUT_INCLUDE_DIR}
+          ${THIRDPARTY_DIRECTORY}/glm
           ${THIRDPARTY_DIRECTORY}/imgui
           ${THIRDPARTY_DIRECTORY}/imgui/backends
           ${THIRDPARTY_DIRECTORY}/ImGuizmo
           ${THIRDPARTY_DIRECTORY}/glew-cmake/include
-          ${FREEGLUT_INCLUDE_DIR}
           ${THIRDPARTY_DIRECTORY}/json/include
           ${THIRDPARTY_DIRECTORY}/portable-file-dialogs-master
-          ${LASZIP_INCLUDE_DIR}/LASzip/include)
+          ${LASZIP_INCLUDE_DIR}/LASzip/include
+          ${THIRDPARTY_DIRECTORY}/observation_equations/codes)
 
 if(WIN32)
   add_custom_command(
diff --git a/apps/hd_mapper/hd_mapper.cpp b/apps/hd_mapper/hd_mapper.cpp
index 1b082e97..813067d1 100644
--- a/apps/hd_mapper/hd_mapper.cpp
+++ b/apps/hd_mapper/hd_mapper.cpp
@@ -1,3 +1,8 @@
+// clang-format off
+#include <GL/glew.h>
+#include <GL/freeglut.h>
+// clang-format on
+
 #include <imgui.h>
 #include <imgui_impl_glut.h>
 #include <imgui_impl_opengl2.h>
@@ -5,19 +10,15 @@
 
 #include <ImGuizmo.h>
 
-// clang-format off
-#include <GL/glew.h>
-#include <GL/freeglut.h>
-// clang-format on
-
 #include <Eigen/Eigen>
 
-#include <laz_wrapper.h>
-#include <odo_with_gnss_fusion.h>
-#include <project_settings.h>
-#include <roi_exporter.h>
-#include <single_trajectory_viewer.h>
-#include <transformations.h>
+#include "laz_wrapper.h"
+#include "odo_with_gnss_fusion.h"
+#include "project_settings.h"
+#include "roi_exporter.h"
+#include "single_trajectory_viewer.h"
+
+#include <Core/transformations.h>
 
 #include <HDMapping/Version.hpp>
 
diff --git a/core_hd_mapping/src/laz_wrapper.cpp b/apps/hd_mapper/laz_wrapper.cpp
similarity index 99%
rename from core_hd_mapping/src/laz_wrapper.cpp
rename to apps/hd_mapper/laz_wrapper.cpp
index 684b4568..c36c104e 100644
--- a/core_hd_mapping/src/laz_wrapper.cpp
+++ b/apps/hd_mapper/laz_wrapper.cpp
@@ -1,6 +1,6 @@
 #include <pch/pch.h>
 
-#include <CoreHDMapping/laz_wrapper.h>
+#include "laz_wrapper.h"
 
 #include <GL/freeglut.h>
 #include <laszip/laszip_api.h>
diff --git a/core_hd_mapping/include/CoreHDMapping/laz_wrapper.h b/apps/hd_mapper/laz_wrapper.h
similarity index 94%
rename from core_hd_mapping/include/CoreHDMapping/laz_wrapper.h
rename to apps/hd_mapper/laz_wrapper.h
index dead6210..4aab2f04 100644
--- a/core_hd_mapping/include/CoreHDMapping/laz_wrapper.h
+++ b/apps/hd_mapper/laz_wrapper.h
@@ -7,7 +7,7 @@
 
 #include <ImGuizmo.h>
 
-#include <CoreHDMapping/project_settings.h>
+#include "project_settings.h"
 
 // TODO(mwlasiuk) : cross includes ???
 #include <Core/structures.h>
diff --git a/core_hd_mapping/src/odo_with_gnss_fusion.cpp b/apps/hd_mapper/odo_with_gnss_fusion.cpp
similarity index 99%
rename from core_hd_mapping/src/odo_with_gnss_fusion.cpp
rename to apps/hd_mapper/odo_with_gnss_fusion.cpp
index 92273459..283e896e 100644
--- a/core_hd_mapping/src/odo_with_gnss_fusion.cpp
+++ b/apps/hd_mapper/odo_with_gnss_fusion.cpp
@@ -1,6 +1,6 @@
 #include <pch/pch.h>
 
-#include <CoreHDMapping/odo_with_gnss_fusion.h>
+#include "odo_with_gnss_fusion.h"
 
 #include <GL/freeglut.h>
 #include <portable-file-dialogs.h>
diff --git a/core_hd_mapping/include/CoreHDMapping/odo_with_gnss_fusion.h b/apps/hd_mapper/odo_with_gnss_fusion.h
similarity index 100%
rename from core_hd_mapping/include/CoreHDMapping/odo_with_gnss_fusion.h
rename to apps/hd_mapper/odo_with_gnss_fusion.h
diff --git a/core_hd_mapping/src/project_settings.cpp b/apps/hd_mapper/project_settings.cpp
similarity index 99%
rename from core_hd_mapping/src/project_settings.cpp
rename to apps/hd_mapper/project_settings.cpp
index aec7783f..047d0093 100644
--- a/core_hd_mapping/src/project_settings.cpp
+++ b/apps/hd_mapper/project_settings.cpp
@@ -1,6 +1,6 @@
 #include <pch/pch.h>
 
-#include <CoreHDMapping/project_settings.h>
+#include "project_settings.h"
 
 #include <GL/freeglut.h>
 #include <nlohmann/json.hpp>
diff --git a/core_hd_mapping/include/CoreHDMapping/project_settings.h b/apps/hd_mapper/project_settings.h
similarity index 97%
rename from core_hd_mapping/include/CoreHDMapping/project_settings.h
rename to apps/hd_mapper/project_settings.h
index 78d0c8ba..ae6eeec1 100644
--- a/core_hd_mapping/include/CoreHDMapping/project_settings.h
+++ b/apps/hd_mapper/project_settings.h
@@ -7,7 +7,7 @@
 
 #include <ImGuizmo.h>
 
-#include <CoreHDMapping/odo_with_gnss_fusion.h>
+#include "odo_with_gnss_fusion.h"
 
 // TODO(mwlasiuk) : cross includes ???
 #include <Core/structures.h>
diff --git a/core_hd_mapping/src/roi_exporter.cpp b/apps/hd_mapper/roi_exporter.cpp
similarity index 99%
rename from core_hd_mapping/src/roi_exporter.cpp
rename to apps/hd_mapper/roi_exporter.cpp
index b7c18220..c32e2a8f 100644
--- a/core_hd_mapping/src/roi_exporter.cpp
+++ b/apps/hd_mapper/roi_exporter.cpp
@@ -2,9 +2,9 @@
 
 #include <Core/pfd_wrapper.hpp>
 
-#include <CoreHDMapping/laz_wrapper.h>
-#include <CoreHDMapping/roi_exporter.h>
-#include <CoreHDMapping/single_trajectory_viewer.h>
+#include "laz_wrapper.h"
+#include "roi_exporter.h"
+#include "single_trajectory_viewer.h"
 
 #include <GL/freeglut.h>
 #include <plycpp.h>
diff --git a/core_hd_mapping/include/CoreHDMapping/roi_exporter.h b/apps/hd_mapper/roi_exporter.h
similarity index 95%
rename from core_hd_mapping/include/CoreHDMapping/roi_exporter.h
rename to apps/hd_mapper/roi_exporter.h
index 059fce22..d39e8469 100644
--- a/core_hd_mapping/include/CoreHDMapping/roi_exporter.h
+++ b/apps/hd_mapper/roi_exporter.h
@@ -7,7 +7,7 @@
 
 #include <ImGuizmo.h>
 
-#include <CoreHDMapping/project_settings.h>
+#include "project_settings.h"
 
 // TODO(mwlasiuk) : cross includes ???
 #include <Core/structures.h>
diff --git a/core_hd_mapping/src/single_trajectory_viewer.cpp b/apps/hd_mapper/single_trajectory_viewer.cpp
similarity index 99%
rename from core_hd_mapping/src/single_trajectory_viewer.cpp
rename to apps/hd_mapper/single_trajectory_viewer.cpp
index b9040586..2d0f032b 100644
--- a/core_hd_mapping/src/single_trajectory_viewer.cpp
+++ b/apps/hd_mapper/single_trajectory_viewer.cpp
@@ -2,7 +2,8 @@
 
 #include <Core/pfd_wrapper.hpp>
 #include <Core/transformations.h>
-#include <CoreHDMapping/single_trajectory_viewer.h>
+
+#include "single_trajectory_viewer.h"
 
 #include <GL/freeglut.h>
 
diff --git a/core_hd_mapping/include/CoreHDMapping/single_trajectory_viewer.h b/apps/hd_mapper/single_trajectory_viewer.h
similarity index 95%
rename from core_hd_mapping/include/CoreHDMapping/single_trajectory_viewer.h
rename to apps/hd_mapper/single_trajectory_viewer.h
index a36cc058..7eb0f34d 100644
--- a/core_hd_mapping/include/CoreHDMapping/single_trajectory_viewer.h
+++ b/apps/hd_mapper/single_trajectory_viewer.h
@@ -7,7 +7,7 @@
 
 #include <ImGuizmo.h>
 
-#include <CoreHDMapping/odo_with_gnss_fusion.h>
+#include "odo_with_gnss_fusion.h"
 
 #include <Core/structures.h>
 
diff --git a/core_hd_mapping/CMakeLists.txt b/core_hd_mapping/CMakeLists.txt
deleted file mode 100644
index 75048e1a..00000000
--- a/core_hd_mapping/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-cmake_minimum_required(VERSION 4.0.0)
-
-project(core-hd-mapping)
-
-add_library(core-hd-mapping STATIC
-    src/laz_wrapper.cpp
-    src/odo_with_gnss_fusion.cpp
-    src/project_settings.cpp
-    src/roi_exporter.cpp
-    src/single_trajectory_viewer.cpp
-)
-
-target_precompile_headers(core-hd-mapping
-    PRIVATE include/pch/pch.h
-)
-
-target_include_directories(core-hd-mapping
-    PRIVATE
-        include
-        ${EIGEN3_INCLUDE_DIR}
-        ${THIRDPARTY_DIRECTORY}/freeglut/include
-        ${THIRDPARTY_DIRECTORY}/ImGuizmo
-        ${THIRDPARTY_DIRECTORY}/imgui
-        ${THIRDPARTY_DIRECTORY}/imgui/backends
-        ${THIRDPARTY_DIRECTORY}/json/include
-        ${THIRDPARTY_DIRECTORY}/observation_equations/codes
-        ${THIRDPARTY_DIRECTORY}/portable-file-dialogs-master
-        ${LASZIP_INCLUDE_DIR}/LASzip/include
-        ${REPOSITORY_DIRECTORY}/core/include
-        ${EXTERNAL_LIBRARIES_DIRECTORY}/include
-)
-
-target_link_libraries(core-hd-mapping
-    PRIVATE
-        core
-        ${PLATFORM_MISCELLANEOUS_LIBS}
-        Threads::Threads
-        spdlog::spdlog
-)
diff --git a/core_hd_mapping/include/pch/pch.h b/core_hd_mapping/include/pch/pch.h
deleted file mode 100644
index f89aca50..00000000
--- a/core_hd_mapping/include/pch/pch.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <filesystem>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <iterator>
-#include <limits>
-#include <string>
-#include <thread>
\ No newline at end of file