diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD
index 5eba0d75f..d86aec34c 100644
--- a/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD
+++ b/score/launch_manager/src/daemon/src/alive_monitor/details/daemon/BUILD
@@ -73,8 +73,8 @@ cc_library(
         "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:cycle_time_validator",
         "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:cycle_timer",
         "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock",
-        "//score/launch_manager/src/daemon/src/alive_monitor/details/watchdog:i_watchdog_if",
         "//score/launch_manager/src/daemon/src/common:log",
+        "//score/launch_manager/src/daemon/src/watchdog:i_watchdog_if",
         "//score/launch_manager/src/lifecycle_client",
     ] + select({
         "//config:lm_use_new_configuration": [
@@ -106,7 +106,7 @@ cc_library(
     visibility = ["//score/launch_manager/src/daemon:__subpackages__"],
     deps = [
         ":i_health_monitor",
-        "//score/launch_manager/src/daemon/src/alive_monitor/details/watchdog:watchdog_impl",
+        "//score/launch_manager/src/daemon/src/watchdog/details:watchdog_impl",
         "@score_baselibs//score/language/futurecpp",
     ],
 )
diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD
index c6d7c839f..df83b0384 100644
--- a/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD
+++ b/score/launch_manager/src/daemon/src/alive_monitor/details/factory/BUILD
@@ -32,7 +32,7 @@ cc_library(
     deps = [
         "//score/launch_manager/src/daemon/src/alive_monitor/details/ifappl:data_structures",
         "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock",
-        "//score/launch_manager/src/daemon/src/alive_monitor/details/watchdog:i_device_config_factory",
+        "//score/launch_manager/src/daemon/src/watchdog:i_device_config_factory",
     ],
 )
 
@@ -55,8 +55,8 @@ cc_library(
         "//score/launch_manager/src/daemon/src/alive_monitor/config",
         "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:time_conversion",
         "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:timers_os_clock",
-        "//score/launch_manager/src/daemon/src/alive_monitor/details/watchdog:i_device_config_factory",
         "//score/launch_manager/src/daemon/src/common:log",
+        "//score/launch_manager/src/daemon/src/watchdog:i_device_config_factory",
         "@score_baselibs//score/flatbuffers:flatbufferscpp",
         "@score_baselibs//score/language/futurecpp",
     ] + select({
diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD
index 4e5733631..6dda7a1ad 100644
--- a/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD
+++ b/score/launch_manager/src/daemon/src/alive_monitor/details/timers/BUILD
@@ -17,7 +17,10 @@ cc_library(
     hdrs = ["OsClockInterface.hpp"],
     include_prefix = "score/mw/launch_manager/alive_monitor/details/timers",
     strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/timers",
-    visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"],
+    visibility = [
+        "//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__",
+        "//score/launch_manager/src/daemon/src/watchdog:__subpackages__",
+    ],
 )
 
 cc_library(
diff --git a/score/launch_manager/src/daemon/src/watchdog/BUILD b/score/launch_manager/src/daemon/src/watchdog/BUILD
new file mode 100644
index 000000000..1c5703fbc
--- /dev/null
+++ b/score/launch_manager/src/daemon/src/watchdog/BUILD
@@ -0,0 +1,30 @@
+# *******************************************************************************
+# Copyright (c) 2026 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
+cc_library(
+    name = "i_device_config_factory",
+    hdrs = ["IDeviceConfigFactory.hpp"],
+    include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog",
+    strip_include_prefix = "/score/launch_manager/src/daemon/src/watchdog",
+    visibility = ["//score:__subpackages__"],
+)
+
+cc_library(
+    name = "i_watchdog_if",
+    hdrs = ["IWatchdogIf.hpp"],
+    include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog",
+    strip_include_prefix = "/score/launch_manager/src/daemon/src/watchdog",
+    visibility = ["//score:__subpackages__"],
+    deps = [":i_device_config_factory"],
+)
diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/IDeviceConfigFactory.hpp b/score/launch_manager/src/daemon/src/watchdog/IDeviceConfigFactory.hpp
similarity index 100%
rename from score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/IDeviceConfigFactory.hpp
rename to score/launch_manager/src/daemon/src/watchdog/IDeviceConfigFactory.hpp
diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/IWatchdogIf.hpp b/score/launch_manager/src/daemon/src/watchdog/IWatchdogIf.hpp
similarity index 100%
rename from score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/IWatchdogIf.hpp
rename to score/launch_manager/src/daemon/src/watchdog/IWatchdogIf.hpp
diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/BUILD b/score/launch_manager/src/daemon/src/watchdog/details/BUILD
similarity index 58%
rename from score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/BUILD
rename to score/launch_manager/src/daemon/src/watchdog/details/BUILD
index 2686257f0..23fa23b73 100644
--- a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/BUILD
+++ b/score/launch_manager/src/daemon/src/watchdog/details/BUILD
@@ -12,29 +12,12 @@
 # *******************************************************************************
 load("@rules_cc//cc:defs.bzl", "cc_library")
 
-cc_library(
-    name = "i_device_config_factory",
-    hdrs = ["IDeviceConfigFactory.hpp"],
-    include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog",
-    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog",
-    visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"],
-)
-
-cc_library(
-    name = "i_watchdog_if",
-    hdrs = ["IWatchdogIf.hpp"],
-    include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog",
-    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog",
-    visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"],
-    deps = [":i_device_config_factory"],
-)
-
 cc_library(
     name = "watchdog",
     hdrs = ["Watchdog.hpp"],
     include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog",
-    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog",
-    visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"],
+    strip_include_prefix = "/score/launch_manager/src/daemon/src/watchdog/details",
+    visibility = ["//score:__subpackages__"],
 )
 
 cc_library(
@@ -42,8 +25,8 @@ cc_library(
     srcs = ["DeviceIf.cpp"],
     hdrs = ["DeviceIf.hpp"],
     include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog",
-    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog",
-    visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"],
+    strip_include_prefix = "/score/launch_manager/src/daemon/src/watchdog/details",
+    visibility = ["//score:__subpackages__"],
     deps = ["@score_baselibs//score/language/futurecpp"],
 )
 
@@ -52,15 +35,15 @@ cc_library(
     srcs = ["WatchdogImpl.cpp"],
     hdrs = ["WatchdogImpl.hpp"],
     include_prefix = "score/mw/launch_manager/alive_monitor/details/watchdog",
-    strip_include_prefix = "/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog",
-    visibility = ["//score/launch_manager/src/daemon/src/alive_monitor:__subpackages__"],
+    strip_include_prefix = "/score/launch_manager/src/daemon/src/watchdog/details",
+    visibility = ["//score:__subpackages__"],
     deps = [
         ":device_if",
-        ":i_device_config_factory",
-        ":i_watchdog_if",
         ":watchdog",
         "//score/launch_manager/src/daemon/src/alive_monitor/details/timers:os_clock_interface",
         "//score/launch_manager/src/daemon/src/common:log",
+        "//score/launch_manager/src/daemon/src/watchdog:i_device_config_factory",
+        "//score/launch_manager/src/daemon/src/watchdog:i_watchdog_if",
         "@score_baselibs//score/language/futurecpp",
     ],
 )
diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/DeviceIf.cpp b/score/launch_manager/src/daemon/src/watchdog/details/DeviceIf.cpp
similarity index 100%
rename from score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/DeviceIf.cpp
rename to score/launch_manager/src/daemon/src/watchdog/details/DeviceIf.cpp
diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/DeviceIf.hpp b/score/launch_manager/src/daemon/src/watchdog/details/DeviceIf.hpp
similarity index 100%
rename from score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/DeviceIf.hpp
rename to score/launch_manager/src/daemon/src/watchdog/details/DeviceIf.hpp
diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/Watchdog.hpp b/score/launch_manager/src/daemon/src/watchdog/details/Watchdog.hpp
similarity index 100%
rename from score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/Watchdog.hpp
rename to score/launch_manager/src/daemon/src/watchdog/details/Watchdog.hpp
diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.cpp b/score/launch_manager/src/daemon/src/watchdog/details/WatchdogImpl.cpp
similarity index 100%
rename from score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.cpp
rename to score/launch_manager/src/daemon/src/watchdog/details/WatchdogImpl.cpp
diff --git a/score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.hpp b/score/launch_manager/src/daemon/src/watchdog/details/WatchdogImpl.hpp
similarity index 100%
rename from score/launch_manager/src/daemon/src/alive_monitor/details/watchdog/WatchdogImpl.hpp
rename to score/launch_manager/src/daemon/src/watchdog/details/WatchdogImpl.hpp