diff --git a/CMakeLists.txt b/CMakeLists.txt
index 541b55eef7..a35a4014e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,11 @@
 if(CONFIG_NCS_BM)
   zephyr_include_directories(include)
 
+  # SoftDevice headers are accesible without specifying the path.
+  if(CONFIG_SOFTDEVICE_S115)
+    zephyr_include_directories(include/bm/softdevice/s115)
+  endif()
+
   include(cmake/version.cmake)
 
   add_subdirectory(drivers)
diff --git a/CODEOWNERS b/CODEOWNERS
index 894d9bf784..2b2d29dba6 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -36,9 +36,11 @@
 /drivers/console/                         @nrfconnect/ncs-bm
 
 # Include
-/include/*.h                              @nrfconnect/ncs-bm
-/include/bluetooth/                       @nrfconnect/ncs-bm
-/include/s115/                            @nrfconnect/ncs-bm @nrfconnect/ncs-dragoon
+/include/bm/*.h                           @nrfconnect/ncs-bm
+/include/bm/ble/                          @nrfconnect/ncs-bm
+/include/bm/lib/                          @nrfconnect/ncs-bm
+/include/bm/sdh/                          @nrfconnect/ncs-bm
+/include/bm/softdevice/                   @nrfconnect/ncs-bm @nrfconnect/ncs-dragoon
 
 # Libraries
 /lib/ble_adv/                             @nrfconnect/ncs-bm
@@ -54,14 +56,14 @@
 /lib/zephyr_queue/                        @nrfconnect/ncs-pluto
 
 # Samples
-/samples/bluetooth/                       @nrfconnect/ncs-bm
+/samples/ble/                             @nrfconnect/ncs-bm
 /samples/boot/                            @nrfconnect/ncs-pluto
 /samples/mcumgr/                          @nrfconnect/ncs-pluto
 /samples/peripherals/                     @nrfconnect/ncs-bm
 
 # Samples documentation
 /samples/**/*.rst                         @nrfconnect/ncs-bm-doc
-/samples/bluetooth/**/*.rst               @nrfconnect/ncs-bm-doc
+/samples/ble/**/*.rst                     @nrfconnect/ncs-bm-doc
 /samples/peripherals/**/*.rst             @nrfconnect/ncs-bm-doc
 
 # Scripts
@@ -69,12 +71,12 @@
 /scripts/requirements-*.txt               @nrfconnect/ncs-co-build-system
 
 # Subsystems
-/subsys/bluetooth/                        @nrfconnect/ncs-bm
+/subsys/ble/                              @nrfconnect/ncs-bm
 /subsys/bm_installs/                      @nrfconnect/ncs-pluto
 /subsys/logging/                          @nrfconnect/ncs-bm
 /subsys/mgmt/mcumgr/                      @nrfconnect/ncs-pluto
 /subsys/softdevice/                       @nrfconnect/ncs-bm @nrfconnect/ncs-dragoon
-/subsys/softdevice_handler/               @nrfconnect/ncs-bm
+/subsys/nrf_sdh/                          @nrfconnect/ncs-bm
 /subsys/storage/flash_map/                @nrfconnect/ncs-pluto
 
 # Sysbuild
diff --git a/doc/nrf-bm/doxygen/nrf-bm.doxyfile b/doc/nrf-bm/doxygen/nrf-bm.doxyfile
index ab5556fefd..562d6a787e 100644
--- a/doc/nrf-bm/doxygen/nrf-bm.doxyfile
+++ b/doc/nrf-bm/doxygen/nrf-bm.doxyfile
@@ -956,7 +956,7 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = ../../../include/ \
-                         ../../../include/bluetooth/services \
+                         ../../../include/bm/ble/services \
                          mainpage.dox
 
 # This tag can be used to specify the character encoding of the source files
diff --git a/doc/nrf-bm/install_nrf_bm.rst b/doc/nrf-bm/install_nrf_bm.rst
index e28298dbe0..98fcffc816 100644
--- a/doc/nrf-bm/install_nrf_bm.rst
+++ b/doc/nrf-bm/install_nrf_bm.rst
@@ -253,7 +253,7 @@ You can now proceed to test the :ref:`samples` included in this version of |BMsh
 
 The samples can be found in the :file:`nrf-bm/samples` folder, and are divided into two subfolders:
 
-* :file:`bluetooth` for the samples showcasing Bluetooth® LE functionalities using the SoftDevice.
+* :file:`ble` for the samples showcasing Bluetooth® LE functionalities using the SoftDevice.
   See :ref:`ble_samples`.
 * :file:`peripherals` for the samples showcasing various peripheral functionalities that do not require the SoftDevice.
   See :ref:`peripheral_samples`.
diff --git a/doc/nrf-bm/sample/ble.rst b/doc/nrf-bm/sample/ble.rst
index 55363be5af..47844fcf6f 100644
--- a/doc/nrf-bm/sample/ble.rst
+++ b/doc/nrf-bm/sample/ble.rst
@@ -10,8 +10,8 @@ This section lists the available samples for the Bluetooth® LE protocol.
    :caption: Subpages
    :glob:
 
-   ../samples/bluetooth/ble_cgms/README.rst
-   ../samples/bluetooth/ble_hrs/README.rst
-   ../samples/bluetooth/hello_softdevice/README.rst
-   ../samples/bluetooth/ble_lbs/README.rst
-   ../samples/bluetooth/ble_nus/README.rst
+   ../samples/ble/ble_cgms/README.rst
+   ../samples/ble/ble_hrs/README.rst
+   ../samples/ble/hello_softdevice/README.rst
+   ../samples/ble/ble_lbs/README.rst
+   ../samples/ble/ble_nus/README.rst
diff --git a/include/bluetooth/services/ble_bas.h b/include/bm/ble/services/ble_bas.h
similarity index 98%
rename from include/bluetooth/services/ble_bas.h
rename to include/bm/ble/services/ble_bas.h
index 99cdb7e8e5..be85b23550 100644
--- a/include/bluetooth/services/ble_bas.h
+++ b/include/bm/ble/services/ble_bas.h
@@ -14,8 +14,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <ble.h>
-#include <nrf_sdh_ble.h>
+#include <softdevice/ble.h>
+#include <bm/sdh/nrf_sdh_ble.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/bluetooth/services/ble_cgms.h b/include/bm/ble/services/ble_cgms.h
similarity index 99%
rename from include/bluetooth/services/ble_cgms.h
rename to include/bm/ble/services/ble_cgms.h
index d12c242128..326708b685 100644
--- a/include/bluetooth/services/ble_cgms.h
+++ b/include/bm/ble/services/ble_cgms.h
@@ -32,9 +32,9 @@
 
 #include <stdint.h>
 
-#include <ble_gq.h>
-#include <ble_racp.h>
-#include <nrf_sdh_ble.h>
+#include <bm/lib/ble_gq.h>
+#include <bm/lib/ble_racp.h>
+#include <bm/sdh/nrf_sdh_ble.h>
 #include <zephyr/sys/util.h>
 
 #ifdef __cplusplus
diff --git a/include/bluetooth/services/ble_date_time.h b/include/bm/ble/services/ble_date_time.h
similarity index 100%
rename from include/bluetooth/services/ble_date_time.h
rename to include/bm/ble/services/ble_date_time.h
diff --git a/include/bluetooth/services/ble_dis.h b/include/bm/ble/services/ble_dis.h
similarity index 100%
rename from include/bluetooth/services/ble_dis.h
rename to include/bm/ble/services/ble_dis.h
diff --git a/include/bluetooth/services/ble_hrs.h b/include/bm/ble/services/ble_hrs.h
similarity index 98%
rename from include/bluetooth/services/ble_hrs.h
rename to include/bm/ble/services/ble_hrs.h
index 1d6128d863..723420e4f1 100644
--- a/include/bluetooth/services/ble_hrs.h
+++ b/include/bm/ble/services/ble_hrs.h
@@ -14,8 +14,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <ble.h>
-#include <nrf_sdh_ble.h>
+#include <softdevice/ble.h>
+#include <bm/sdh/nrf_sdh_ble.h>
+#include <bm/lib/ble_conn_params.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/bluetooth/services/ble_lbs.h b/include/bm/ble/services/ble_lbs.h
similarity index 98%
rename from include/bluetooth/services/ble_lbs.h
rename to include/bm/ble/services/ble_lbs.h
index 06865a09c8..0de8f5ba77 100644
--- a/include/bluetooth/services/ble_lbs.h
+++ b/include/bm/ble/services/ble_lbs.h
@@ -13,8 +13,8 @@
 #define BLE_LBS_H__
 
 #include <stdint.h>
-#include <ble.h>
-#include <nrf_sdh_ble.h>
+#include <softdevice/ble.h>
+#include <bm/sdh/nrf_sdh_ble.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/bluetooth/services/ble_nus.h b/include/bm/ble/services/ble_nus.h
similarity index 99%
rename from include/bluetooth/services/ble_nus.h
rename to include/bm/ble/services/ble_nus.h
index 21c252b873..8c572ec639 100644
--- a/include/bluetooth/services/ble_nus.h
+++ b/include/bm/ble/services/ble_nus.h
@@ -16,8 +16,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <ble.h>
-#include <nrf_sdh_ble.h>
+#include <softdevice/ble.h>
+#include <bm/sdh/nrf_sdh_ble.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/bluetooth/services/common.h b/include/bm/ble/services/common.h
similarity index 97%
rename from include/bluetooth/services/common.h
rename to include/bm/ble/services/common.h
index 2cc874af99..28a2a1c6ab 100644
--- a/include/bluetooth/services/common.h
+++ b/include/bm/ble/services/common.h
@@ -7,7 +7,7 @@
 #ifndef BLE_SERVICES_COMMON_H__
 #define BLE_SERVICES_COMMON_H__
 
-#include <ble.h>
+#include <softdevice/ble.h>
 #include <zephyr/sys/byteorder.h>
 
 #ifdef __cplusplus
diff --git a/include/bluetooth/services/uuid.h b/include/bm/ble/services/uuid.h
similarity index 100%
rename from include/bluetooth/services/uuid.h
rename to include/bm/ble/services/uuid.h
diff --git a/include/ble_adv.h b/include/bm/lib/ble_adv.h
similarity index 98%
rename from include/ble_adv.h
rename to include/bm/lib/ble_adv.h
index 7c1812d2bb..247ca6ee7d 100644
--- a/include/ble_adv.h
+++ b/include/bm/lib/ble_adv.h
@@ -18,10 +18,10 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <ble_adv_data.h>
-#include <ble.h>
-#include <ble_gap.h>
-#include <ble_gattc.h>
+#include <bm/lib/ble_adv_data.h>
+#include <softdevice/ble.h>
+#include <softdevice/ble_gap.h>
+#include <softdevice/ble_gattc.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/ble_adv_data.h b/include/bm/lib/ble_adv_data.h
similarity index 99%
rename from include/ble_adv_data.h
rename to include/bm/lib/ble_adv_data.h
index db9705ebcb..775a8a0f2c 100644
--- a/include/ble_adv_data.h
+++ b/include/bm/lib/ble_adv_data.h
@@ -15,8 +15,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <ble.h>
-#include <ble_types.h>
+#include <softdevice/ble.h>
+#include <softdevice/ble_types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/ble_conn_params.h b/include/bm/lib/ble_conn_params.h
similarity index 99%
rename from include/ble_conn_params.h
rename to include/bm/lib/ble_conn_params.h
index 46d45a87fb..b26e361954 100644
--- a/include/ble_conn_params.h
+++ b/include/bm/lib/ble_conn_params.h
@@ -8,7 +8,7 @@
 #define BLE_CONN_PARAMS_H__
 
 #include <stdint.h>
-#include <ble_gap.h>
+#include <softdevice/ble_gap.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/ble_gq.h b/include/bm/lib/ble_gq.h
similarity index 99%
rename from include/ble_gq.h
rename to include/bm/lib/ble_gq.h
index 3cf8252e8a..6e6c8dcbe6 100644
--- a/include/ble_gq.h
+++ b/include/bm/lib/ble_gq.h
@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <nrf_sdh_ble.h>
+#include <bm/sdh/nrf_sdh_ble.h>
 
 #include <zephyr/kernel.h>
 #include <zephyr/sys/slist.h>
diff --git a/include/ble_qwr.h b/include/bm/lib/ble_qwr.h
similarity index 99%
rename from include/ble_qwr.h
rename to include/bm/lib/ble_qwr.h
index 78067d9372..09ca53ea82 100644
--- a/include/ble_qwr.h
+++ b/include/bm/lib/ble_qwr.h
@@ -27,8 +27,8 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <ble.h>
-#include <ble_gatts.h>
+#include <softdevice/ble.h>
+#include <softdevice/ble_gatts.h>
 
 /**
  * @brief Macro for defining a ble_qwr instance.
diff --git a/include/ble_racp.h b/include/bm/lib/ble_racp.h
similarity index 100%
rename from include/ble_racp.h
rename to include/bm/lib/ble_racp.h
diff --git a/include/bm_buttons.h b/include/bm/lib/bm_buttons.h
similarity index 99%
rename from include/bm_buttons.h
rename to include/bm/lib/bm_buttons.h
index 521e435d23..f1468dd567 100644
--- a/include/bm_buttons.h
+++ b/include/bm/lib/bm_buttons.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <bm_timer.h>
+#include <bm/lib/bm_timer.h>
 #include <nrfx_gpiote.h>
 
 #ifdef __cplusplus
diff --git a/include/bm_timer.h b/include/bm/lib/bm_timer.h
similarity index 100%
rename from include/bm_timer.h
rename to include/bm/lib/bm_timer.h
diff --git a/include/event_scheduler.h b/include/bm/lib/event_scheduler.h
similarity index 100%
rename from include/event_scheduler.h
rename to include/bm/lib/event_scheduler.h
diff --git a/include/sensorsim.h b/include/bm/lib/sensorsim.h
similarity index 100%
rename from include/sensorsim.h
rename to include/bm/lib/sensorsim.h
diff --git a/include/bm/nrf_error.h b/include/bm/nrf_error.h
new file mode 100644
index 0000000000..c79652705e
--- /dev/null
+++ b/include/bm/nrf_error.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/**
+ * @defgroup nrf_error Global Error Codes
+ * @{
+ *
+ * @brief Global Error definitions
+ */
+
+/* Note: When the SoftDevice is enabled we include the nrf_error.h from there. */
+#ifdef CONFIG_SOFTDEVICE
+#include <softdevice/nrf_error.h>
+#else /* CONFIG_SOFTDEVICE */
+
+/* Header guard */
+#ifndef NRF_ERROR_H__
+#define NRF_ERROR_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup NRF_ERRORS_BASE Error Codes Base number definitions
+ * @{
+ */
+
+/** Global error base */
+#define NRF_ERROR_BASE_NUM (0x0)
+/** @} */
+
+/** Successful command */
+#define NRF_SUCCESS                           (NRF_ERROR_BASE_NUM + 0)
+/** SVC handler is missing */
+#define NRF_ERROR_SVC_HANDLER_MISSING         (NRF_ERROR_BASE_NUM + 1)
+/** SoftDevice has not been enabled */
+#define NRF_ERROR_SOFTDEVICE_NOT_ENABLED      (NRF_ERROR_BASE_NUM + 2)
+/** Internal Error */
+#define NRF_ERROR_INTERNAL                    (NRF_ERROR_BASE_NUM + 3)
+/** No Memory for operation */
+#define NRF_ERROR_NO_MEM                      (NRF_ERROR_BASE_NUM + 4)
+/** Not found */
+#define NRF_ERROR_NOT_FOUND                   (NRF_ERROR_BASE_NUM + 5)
+/** Not supported */
+#define NRF_ERROR_NOT_SUPPORTED               (NRF_ERROR_BASE_NUM + 6)
+/** Invalid Parameter */
+#define NRF_ERROR_INVALID_PARAM               (NRF_ERROR_BASE_NUM + 7)
+/** Invalid state, operation disallowed in this state */
+#define NRF_ERROR_INVALID_STATE               (NRF_ERROR_BASE_NUM + 8)
+/** Invalid Length */
+#define NRF_ERROR_INVALID_LENGTH              (NRF_ERROR_BASE_NUM + 9)
+/** Invalid Flags */
+#define NRF_ERROR_INVALID_FLAGS               (NRF_ERROR_BASE_NUM + 10)
+/** Invalid Data */
+#define NRF_ERROR_INVALID_DATA                (NRF_ERROR_BASE_NUM + 11)
+/** Invalid Data size */
+#define NRF_ERROR_DATA_SIZE                   (NRF_ERROR_BASE_NUM + 12)
+/** Operation timed out */
+#define NRF_ERROR_TIMEOUT                     (NRF_ERROR_BASE_NUM + 13)
+/** Null Pointer */
+#define NRF_ERROR_NULL                        (NRF_ERROR_BASE_NUM + 14)
+/** Forbidden Operation */
+#define NRF_ERROR_FORBIDDEN                   (NRF_ERROR_BASE_NUM + 15)
+/** Bad Memory Address */
+#define NRF_ERROR_INVALID_ADDR                (NRF_ERROR_BASE_NUM + 16)
+/** Busy */
+#define NRF_ERROR_BUSY                        (NRF_ERROR_BASE_NUM + 17)
+/** Maximum connection count exceeded. */
+#define NRF_ERROR_CONN_COUNT                  (NRF_ERROR_BASE_NUM + 18)
+/** Not enough resources for operation */
+#define NRF_ERROR_RESOURCES                   (NRF_ERROR_BASE_NUM + 19)
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* NRF_ERROR_H__ */
+
+#endif /* CONFIG_SOFTDEVICE */
+
+/**
+ * @}
+ */
diff --git a/include/nrf_sdh.h b/include/bm/sdh/nrf_sdh.h
similarity index 100%
rename from include/nrf_sdh.h
rename to include/bm/sdh/nrf_sdh.h
diff --git a/include/nrf_sdh_ble.h b/include/bm/sdh/nrf_sdh_ble.h
similarity index 99%
rename from include/nrf_sdh_ble.h
rename to include/bm/sdh/nrf_sdh_ble.h
index 97f8c563b8..18dc26b836 100644
--- a/include/nrf_sdh_ble.h
+++ b/include/bm/sdh/nrf_sdh_ble.h
@@ -16,7 +16,7 @@
 #define NRF_SDH_BLE_H__
 
 #include <stdint.h>
-#include <ble.h>
+#include <softdevice/ble.h>
 #include <zephyr/sys/iterable_sections.h>
 
 #ifdef __cplusplus
diff --git a/include/nrf_sdh_soc.h b/include/bm/sdh/nrf_sdh_soc.h
similarity index 100%
rename from include/nrf_sdh_soc.h
rename to include/bm/sdh/nrf_sdh_soc.h
diff --git a/include/s115/ble.h b/include/bm/softdevice/s115/softdevice/ble.h
similarity index 100%
rename from include/s115/ble.h
rename to include/bm/softdevice/s115/softdevice/ble.h
diff --git a/include/s115/ble_err.h b/include/bm/softdevice/s115/softdevice/ble_err.h
similarity index 100%
rename from include/s115/ble_err.h
rename to include/bm/softdevice/s115/softdevice/ble_err.h
diff --git a/include/s115/ble_gap.h b/include/bm/softdevice/s115/softdevice/ble_gap.h
similarity index 100%
rename from include/s115/ble_gap.h
rename to include/bm/softdevice/s115/softdevice/ble_gap.h
diff --git a/include/s115/ble_gatt.h b/include/bm/softdevice/s115/softdevice/ble_gatt.h
similarity index 100%
rename from include/s115/ble_gatt.h
rename to include/bm/softdevice/s115/softdevice/ble_gatt.h
diff --git a/include/s115/ble_gattc.h b/include/bm/softdevice/s115/softdevice/ble_gattc.h
similarity index 100%
rename from include/s115/ble_gattc.h
rename to include/bm/softdevice/s115/softdevice/ble_gattc.h
diff --git a/include/s115/ble_gatts.h b/include/bm/softdevice/s115/softdevice/ble_gatts.h
similarity index 100%
rename from include/s115/ble_gatts.h
rename to include/bm/softdevice/s115/softdevice/ble_gatts.h
diff --git a/include/s115/ble_hci.h b/include/bm/softdevice/s115/softdevice/ble_hci.h
similarity index 100%
rename from include/s115/ble_hci.h
rename to include/bm/softdevice/s115/softdevice/ble_hci.h
diff --git a/include/s115/ble_ranges.h b/include/bm/softdevice/s115/softdevice/ble_ranges.h
similarity index 100%
rename from include/s115/ble_ranges.h
rename to include/bm/softdevice/s115/softdevice/ble_ranges.h
diff --git a/include/s115/ble_types.h b/include/bm/softdevice/s115/softdevice/ble_types.h
similarity index 100%
rename from include/s115/ble_types.h
rename to include/bm/softdevice/s115/softdevice/ble_types.h
diff --git a/include/s115/nrf_error.h b/include/bm/softdevice/s115/softdevice/nrf_error.h
similarity index 100%
rename from include/s115/nrf_error.h
rename to include/bm/softdevice/s115/softdevice/nrf_error.h
diff --git a/include/s115/nrf_error_sdm.h b/include/bm/softdevice/s115/softdevice/nrf_error_sdm.h
similarity index 100%
rename from include/s115/nrf_error_sdm.h
rename to include/bm/softdevice/s115/softdevice/nrf_error_sdm.h
diff --git a/include/s115/nrf_error_soc.h b/include/bm/softdevice/s115/softdevice/nrf_error_soc.h
similarity index 100%
rename from include/s115/nrf_error_soc.h
rename to include/bm/softdevice/s115/softdevice/nrf_error_soc.h
diff --git a/include/s115/nrf_sd_def.h b/include/bm/softdevice/s115/softdevice/nrf_sd_def.h
similarity index 100%
rename from include/s115/nrf_sd_def.h
rename to include/bm/softdevice/s115/softdevice/nrf_sd_def.h
diff --git a/include/s115/nrf_sd_isr.h b/include/bm/softdevice/s115/softdevice/nrf_sd_isr.h
similarity index 100%
rename from include/s115/nrf_sd_isr.h
rename to include/bm/softdevice/s115/softdevice/nrf_sd_isr.h
diff --git a/include/s115/nrf_sdm.h b/include/bm/softdevice/s115/softdevice/nrf_sdm.h
similarity index 100%
rename from include/s115/nrf_sdm.h
rename to include/bm/softdevice/s115/softdevice/nrf_sdm.h
diff --git a/include/s115/nrf_soc.h b/include/bm/softdevice/s115/softdevice/nrf_soc.h
similarity index 100%
rename from include/s115/nrf_soc.h
rename to include/bm/softdevice/s115/softdevice/nrf_soc.h
diff --git a/include/s115/nrf_svc.h b/include/bm/softdevice/s115/softdevice/nrf_svc.h
similarity index 100%
rename from include/s115/nrf_svc.h
rename to include/bm/softdevice/s115/softdevice/nrf_svc.h
diff --git a/lib/ble_adv/ble_adv.c b/lib/ble_adv/ble_adv.c
index e9520664d7..5a61937300 100644
--- a/lib/ble_adv/ble_adv.c
+++ b/lib/ble_adv/ble_adv.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include "zephyr/toolchain.h"
-#include <ble_adv.h>
-#include <ble_adv_data.h>
-#include <nrf_sdh_ble.h>
+#include <bm/lib/ble_adv.h>
+#include <bm/lib/ble_adv_data.h>
+#include <bm/sdh/nrf_sdh_ble.h>
 #include <zephyr/logging/log.h>
 #include <errno.h>
 
diff --git a/lib/ble_adv/ble_adv_data.c b/lib/ble_adv/ble_adv_data.c
index 2088039f51..3a3111eda4 100644
--- a/lib/ble_adv/ble_adv_data.c
+++ b/lib/ble_adv/ble_adv_data.c
@@ -6,8 +6,8 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <ble_adv_data.h>
-#include <ble_gap.h>
+#include <bm/lib/ble_adv_data.h>
+#include <softdevice/ble_gap.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/byteorder.h>
 #include <errno.h>
diff --git a/lib/ble_conn_params/att_mtu.c b/lib/ble_conn_params/att_mtu.c
index 18522520d1..069c7954e7 100644
--- a/lib/ble_conn_params/att_mtu.c
+++ b/lib/ble_conn_params/att_mtu.c
@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <ble_gap.h>
-#include <ble_gatts.h>
-#include <ble_gattc.h>
-#include <ble_conn_params.h>
-#include <nrf_sdh_ble.h>
+#include <softdevice/ble_gap.h>
+#include <softdevice/ble_gatts.h>
+#include <softdevice/ble_gattc.h>
+#include <bm/lib/ble_conn_params.h>
+#include <bm/sdh/nrf_sdh_ble.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(ble_conn_params, CONFIG_BLE_CONN_PARAMS_LOG_LEVEL);
diff --git a/lib/ble_conn_params/conn_param.c b/lib/ble_conn_params/conn_param.c
index c0d2c68bc0..a3b6e29836 100644
--- a/lib/ble_conn_params/conn_param.c
+++ b/lib/ble_conn_params/conn_param.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <ble_gap.h>
-#include <ble_conn_params.h>
-#include <nrf_sdh.h>
-#include <nrf_sdh_ble.h>
+#include <softdevice/ble_gap.h>
+#include <bm/lib/ble_conn_params.h>
+#include <bm/sdh/nrf_sdh.h>
+#include <bm/sdh/nrf_sdh_ble.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(ble_conn_params, CONFIG_BLE_CONN_PARAMS_LOG_LEVEL);
diff --git a/lib/ble_conn_params/data_length.c b/lib/ble_conn_params/data_length.c
index 4bbc02a768..ae79337b72 100644
--- a/lib/ble_conn_params/data_length.c
+++ b/lib/ble_conn_params/data_length.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <ble_gap.h>
-#include <ble_conn_params.h>
-#include <nrf_sdh_ble.h>
+#include <softdevice/ble_gap.h>
+#include <bm/sdh/nrf_sdh_ble.h>
+#include <bm/lib/ble_conn_params.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(ble_conn_params, CONFIG_BLE_CONN_PARAMS_LOG_LEVEL);
diff --git a/lib/ble_conn_params/event.c b/lib/ble_conn_params/event.c
index 9635ebfeb3..3b8517b625 100644
--- a/lib/ble_conn_params/event.c
+++ b/lib/ble_conn_params/event.c
@@ -5,7 +5,7 @@
  */
 
 #include <stddef.h>
-#include <ble_conn_params.h>
+#include <bm/lib/ble_conn_params.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(ble_conn_params, CONFIG_BLE_CONN_PARAMS_LOG_LEVEL);
diff --git a/lib/ble_conn_params/phy_mode.c b/lib/ble_conn_params/phy_mode.c
index 5c83f176ec..01312dc23e 100644
--- a/lib/ble_conn_params/phy_mode.c
+++ b/lib/ble_conn_params/phy_mode.c
@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <ble_gap.h>
-#include <ble_conn_params.h>
+#include <softdevice/ble_gap.h>
+#include <bm/sdh/nrf_sdh_ble.h>
+#include <bm/lib/ble_conn_params.h>
 #include <errno.h>
-#include <nrf_sdh_ble.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(ble_conn_params, CONFIG_BLE_CONN_PARAMS_LOG_LEVEL);
diff --git a/lib/ble_gq/gatt_queue.c b/lib/ble_gq/gatt_queue.c
index 7b0d765160..811811d388 100644
--- a/lib/ble_gq/gatt_queue.c
+++ b/lib/ble_gq/gatt_queue.c
@@ -8,8 +8,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <ble_gq.h>
-#include <nrf_sdh_ble.h>
+#include <bm/lib/ble_gq.h>
+#include <bm/sdh/nrf_sdh_ble.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/__assert.h>
diff --git a/lib/ble_qwr/ble_qwr.c b/lib/ble_qwr/ble_qwr.c
index 5ab3c12e9e..1a526633b3 100644
--- a/lib/ble_qwr/ble_qwr.c
+++ b/lib/ble_qwr/ble_qwr.c
@@ -8,8 +8,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
-#include <ble_qwr.h>
-#include <ble.h>
+#include <softdevice/ble.h>
+#include <bm/lib/ble_qwr.h>
 #include <zephyr/sys/byteorder.h>
 
 /* Non-zero value used to make sure the given structure has been initialized by the module. */
diff --git a/lib/ble_racp/ble_racp.c b/lib/ble_racp/ble_racp.c
index 11fa068647..69cd66eb75 100644
--- a/lib/ble_racp/ble_racp.c
+++ b/lib/ble_racp/ble_racp.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
-#include <ble_racp.h>
+#include <bm/lib/ble_racp.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <errno.h>
diff --git a/lib/bm_buttons/bm_buttons.c b/lib/bm_buttons/bm_buttons.c
index d596e98f7e..3c925d2247 100644
--- a/lib/bm_buttons/bm_buttons.c
+++ b/lib/bm_buttons/bm_buttons.c
@@ -9,8 +9,8 @@
 #include <nrfx_gpiote.h>
 #include <nrfx_glue.h>
 
-#include <bm_timer.h>
-#include <bm_buttons.h>
+#include <bm/lib/bm_timer.h>
+#include <bm/lib/bm_buttons.h>
 
 LOG_MODULE_REGISTER(bm_buttons, CONFIG_BM_BUTTONS_LOG_LEVEL);
 
diff --git a/lib/bm_timer/bm_timer.c b/lib/bm_timer/bm_timer.c
index d2e8e76dd7..de97ff9d81 100644
--- a/lib/bm_timer/bm_timer.c
+++ b/lib/bm_timer/bm_timer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <bm_timer.h>
+#include <bm/lib/bm_timer.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/__assert.h>
diff --git a/lib/event_scheduler/event_scheduler.c b/lib/event_scheduler/event_scheduler.c
index 2752e695db..05b7394e8e 100644
--- a/lib/event_scheduler/event_scheduler.c
+++ b/lib/event_scheduler/event_scheduler.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <errno.h>
-#include <event_scheduler.h>
+#include <bm/lib/event_scheduler.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/init.h>
 #include <zephyr/sys/sys_heap.h>
diff --git a/lib/sensorsim/sensorsim.c b/lib/sensorsim/sensorsim.c
index d77ea7326f..887c93d6e3 100644
--- a/lib/sensorsim/sensorsim.c
+++ b/lib/sensorsim/sensorsim.c
@@ -7,7 +7,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <sensorsim.h>
+#include <bm/lib/sensorsim.h>
 
 int sensorsim_init(struct sensorsim_state *state, const struct sensorsim_cfg *cfg)
 {
diff --git a/samples/bluetooth/ble_cgms/CMakeLists.txt b/samples/ble/ble_cgms/CMakeLists.txt
similarity index 100%
rename from samples/bluetooth/ble_cgms/CMakeLists.txt
rename to samples/ble/ble_cgms/CMakeLists.txt
diff --git a/samples/bluetooth/ble_cgms/Kconfig b/samples/ble/ble_cgms/Kconfig
similarity index 100%
rename from samples/bluetooth/ble_cgms/Kconfig
rename to samples/ble/ble_cgms/Kconfig
diff --git a/samples/bluetooth/ble_cgms/README.rst b/samples/ble/ble_cgms/README.rst
similarity index 95%
rename from samples/bluetooth/ble_cgms/README.rst
rename to samples/ble/ble_cgms/README.rst
index 624f62e9d8..a3bdd18e58 100644
--- a/samples/bluetooth/ble_cgms/README.rst
+++ b/samples/ble/ble_cgms/README.rst
@@ -50,7 +50,7 @@ Programming the S115 SoftDevice
 Building and running
 ********************
 
-This sample can be found under :file:`samples/bluetooth/ble_cgms/` in the |BMshort| folder structure.
+This sample can be found under :file:`samples/ble/ble_cgms/` in the |BMshort| folder structure.
 
 .. include:: /includes/create_sample.txt
 
diff --git a/samples/bluetooth/ble_cgms/prj.conf b/samples/ble/ble_cgms/prj.conf
similarity index 100%
rename from samples/bluetooth/ble_cgms/prj.conf
rename to samples/ble/ble_cgms/prj.conf
diff --git a/samples/bluetooth/ble_cgms/sample.yaml b/samples/ble/ble_cgms/sample.yaml
similarity index 100%
rename from samples/bluetooth/ble_cgms/sample.yaml
rename to samples/ble/ble_cgms/sample.yaml
diff --git a/samples/bluetooth/ble_cgms/src/main.c b/samples/ble/ble_cgms/src/main.c
similarity index 97%
rename from samples/bluetooth/ble_cgms/src/main.c
rename to samples/ble/ble_cgms/src/main.c
index fd87146fc3..7df2b4d79a 100644
--- a/samples/bluetooth/ble_cgms/src/main.c
+++ b/samples/ble/ble_cgms/src/main.c
@@ -18,22 +18,23 @@
 #include <stdint.h>
 #include <string.h>
 #include <nrf.h>
-#include <ble.h>
-#include <ble_adv.h>
-#include <ble_conn_params.h>
-#include <sensorsim.h>
-#include <nrf_sdh.h>
-#include <nrf_sdh_soc.h>
-#include <nrf_sdh_ble.h>
-#include <nrf_soc.h>
-#include <bm_timer.h>
-#include <bm_buttons.h>
-#include <ble_qwr.h>
-
-#include <bluetooth/services/uuid.h>
-#include <bluetooth/services/ble_bas.h>
-#include <bluetooth/services/ble_cgms.h>
-#include <bluetooth/services/ble_dis.h>
+#include <softdevice/ble.h>
+#include <softdevice/nrf_soc.h>
+#include <bm/lib/ble_adv.h>
+#include <bm/lib/ble_conn_params.h>
+#include <bm/lib/ble_qwr.h>
+#include <bm/lib/bm_timer.h>
+#include <bm/lib/bm_buttons.h>
+#include <bm/lib/sensorsim.h>
+
+#include <bm/sdh/nrf_sdh.h>
+#include <bm/sdh/nrf_sdh_soc.h>
+#include <bm/sdh/nrf_sdh_ble.h>
+
+#include <bm/ble/services/uuid.h>
+#include <bm/ble/services/ble_bas.h>
+#include <bm/ble/services/ble_cgms.h>
+#include <bm/ble/services/ble_dis.h>
 
 #include <zephyr/logging/log.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/samples/bluetooth/ble_hrs/CMakeLists.txt b/samples/ble/ble_hrs/CMakeLists.txt
similarity index 100%
rename from samples/bluetooth/ble_hrs/CMakeLists.txt
rename to samples/ble/ble_hrs/CMakeLists.txt
diff --git a/samples/bluetooth/ble_hrs/Kconfig b/samples/ble/ble_hrs/Kconfig
similarity index 100%
rename from samples/bluetooth/ble_hrs/Kconfig
rename to samples/ble/ble_hrs/Kconfig
diff --git a/samples/bluetooth/ble_hrs/README.rst b/samples/ble/ble_hrs/README.rst
similarity index 96%
rename from samples/bluetooth/ble_hrs/README.rst
rename to samples/ble/ble_hrs/README.rst
index 2f8f15f17a..c2077d8cce 100644
--- a/samples/bluetooth/ble_hrs/README.rst
+++ b/samples/ble/ble_hrs/README.rst
@@ -66,7 +66,7 @@ Programming the S115 SoftDevice
 Building and running
 ********************
 
-This sample can be found under :file:`samples/bluetooth/ble_hrs/` in the |BMshort| folder structure.
+This sample can be found under :file:`samples/ble/ble_hrs/` in the |BMshort| folder structure.
 
 .. include:: /includes/create_sample.txt
 
diff --git a/samples/bluetooth/ble_hrs/prj.conf b/samples/ble/ble_hrs/prj.conf
similarity index 100%
rename from samples/bluetooth/ble_hrs/prj.conf
rename to samples/ble/ble_hrs/prj.conf
diff --git a/samples/bluetooth/ble_hrs/sample.yaml b/samples/ble/ble_hrs/sample.yaml
similarity index 100%
rename from samples/bluetooth/ble_hrs/sample.yaml
rename to samples/ble/ble_hrs/sample.yaml
diff --git a/samples/bluetooth/ble_hrs/src/main.c b/samples/ble/ble_hrs/src/main.c
similarity index 96%
rename from samples/bluetooth/ble_hrs/src/main.c
rename to samples/ble/ble_hrs/src/main.c
index bbb886680d..dcca613199 100644
--- a/samples/bluetooth/ble_hrs/src/main.c
+++ b/samples/ble/ble_hrs/src/main.c
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf_sdh.h>
-#include <nrf_sdh_ble.h>
-#include <ble_adv.h>
-#include <ble_conn_params.h>
-#include <ble_gap.h>
-#include <nrf_soc.h>
-#include <bluetooth/services/uuid.h>
-#include <bluetooth/services/ble_bas.h>
-#include <bluetooth/services/ble_dis.h>
-#include <bluetooth/services/ble_hrs.h>
-#include <bm_timer.h>
-#include <sensorsim.h>
+#include <softdevice/ble_gap.h>
+#include <softdevice/nrf_soc.h>
+#include <bm/sdh/nrf_sdh.h>
+#include <bm/sdh/nrf_sdh_ble.h>
+#include <bm/ble/services/uuid.h>
+#include <bm/ble/services/ble_bas.h>
+#include <bm/ble/services/ble_dis.h>
+#include <bm/ble/services/ble_hrs.h>
+#include <bm/lib/ble_adv.h>
+#include <bm/lib/ble_conn_params.h>
+#include <bm/lib/bm_timer.h>
+#include <bm/lib/sensorsim.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/sys/printk.h>
 
diff --git a/samples/bluetooth/ble_hrs/use-coded-phy.conf b/samples/ble/ble_hrs/use-coded-phy.conf
similarity index 100%
rename from samples/bluetooth/ble_hrs/use-coded-phy.conf
rename to samples/ble/ble_hrs/use-coded-phy.conf
diff --git a/samples/bluetooth/ble_lbs/CMakeLists.txt b/samples/ble/ble_lbs/CMakeLists.txt
similarity index 100%
rename from samples/bluetooth/ble_lbs/CMakeLists.txt
rename to samples/ble/ble_lbs/CMakeLists.txt
diff --git a/samples/bluetooth/ble_lbs/README.rst b/samples/ble/ble_lbs/README.rst
similarity index 95%
rename from samples/bluetooth/ble_lbs/README.rst
rename to samples/ble/ble_lbs/README.rst
index 2fe90ad88a..380fd40237 100644
--- a/samples/bluetooth/ble_lbs/README.rst
+++ b/samples/ble/ble_lbs/README.rst
@@ -52,7 +52,7 @@ Programming the S115 SoftDevice
 Building and running
 ********************
 
-This sample can be found under :file:`samples/bluetooth/ble_lbs/` in the |BMshort| folder structure.
+This sample can be found under :file:`samples/ble/ble_lbs/` in the |BMshort| folder structure.
 
 .. include:: /includes/create_sample.txt
 
diff --git a/samples/bluetooth/ble_lbs/prj.conf b/samples/ble/ble_lbs/prj.conf
similarity index 100%
rename from samples/bluetooth/ble_lbs/prj.conf
rename to samples/ble/ble_lbs/prj.conf
diff --git a/samples/bluetooth/ble_lbs/sample.yaml b/samples/ble/ble_lbs/sample.yaml
similarity index 100%
rename from samples/bluetooth/ble_lbs/sample.yaml
rename to samples/ble/ble_lbs/sample.yaml
diff --git a/samples/bluetooth/ble_lbs/src/main.c b/samples/ble/ble_lbs/src/main.c
similarity index 95%
rename from samples/bluetooth/ble_lbs/src/main.c
rename to samples/ble/ble_lbs/src/main.c
index 96a4fd25a4..25c87de48d 100644
--- a/samples/bluetooth/ble_lbs/src/main.c
+++ b/samples/ble/ble_lbs/src/main.c
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf_sdh.h>
-#include <nrf_sdh_ble.h>
-#include <ble_adv.h>
-#include <ble_gap.h>
-#include <nrf_soc.h>
-#include <bluetooth/services/ble_lbs.h>
-#include <bluetooth/services/ble_dis.h>
+#include <softdevice/ble_gap.h>
+#include <softdevice/nrf_soc.h>
+#include <bm/sdh/nrf_sdh.h>
+#include <bm/sdh/nrf_sdh_ble.h>
+#include <bm/ble/services/ble_lbs.h>
+#include <bm/ble/services/ble_dis.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/sys/printk.h>
 
 #include <board-config.h>
 
-#include <bm_buttons.h>
+#include <bm/lib/ble_adv.h>
+#include <bm/lib/bm_buttons.h>
 
 BLE_ADV_DEF(ble_adv); /* BLE advertising instance */
 BLE_LBS_DEF(ble_lbs); /* BLE LED Button Service instance */
diff --git a/samples/bluetooth/ble_nus/CMakeLists.txt b/samples/ble/ble_nus/CMakeLists.txt
similarity index 100%
rename from samples/bluetooth/ble_nus/CMakeLists.txt
rename to samples/ble/ble_nus/CMakeLists.txt
diff --git a/samples/bluetooth/ble_nus/Kconfig b/samples/ble/ble_nus/Kconfig
similarity index 100%
rename from samples/bluetooth/ble_nus/Kconfig
rename to samples/ble/ble_nus/Kconfig
diff --git a/samples/bluetooth/ble_nus/README.rst b/samples/ble/ble_nus/README.rst
similarity index 96%
rename from samples/bluetooth/ble_nus/README.rst
rename to samples/ble/ble_nus/README.rst
index 470e535e69..611b1c1e13 100644
--- a/samples/bluetooth/ble_nus/README.rst
+++ b/samples/ble/ble_nus/README.rst
@@ -52,7 +52,7 @@ Programming the S115 SoftDevice
 Building and running
 ********************
 
-This sample can be found under :file:`samples/bluetooth/ble_nus/` in the |BMshort| folder structure.
+This sample can be found under :file:`samples/ble/ble_nus/` in the |BMshort| folder structure.
 
 .. include:: /includes/create_sample.txt
 
diff --git a/samples/bluetooth/ble_nus/prj.conf b/samples/ble/ble_nus/prj.conf
similarity index 100%
rename from samples/bluetooth/ble_nus/prj.conf
rename to samples/ble/ble_nus/prj.conf
diff --git a/samples/bluetooth/ble_nus/sample.yaml b/samples/ble/ble_nus/sample.yaml
similarity index 100%
rename from samples/bluetooth/ble_nus/sample.yaml
rename to samples/ble/ble_nus/sample.yaml
diff --git a/samples/bluetooth/ble_nus/src/main.c b/samples/ble/ble_nus/src/main.c
similarity index 97%
rename from samples/bluetooth/ble_nus/src/main.c
rename to samples/ble/ble_nus/src/main.c
index f64e529119..ba3cc46cb7 100644
--- a/samples/bluetooth/ble_nus/src/main.c
+++ b/samples/ble/ble_nus/src/main.c
@@ -6,14 +6,14 @@
 
 #include <errno.h>
 #include <string.h>
-#include <nrf_sdh.h>
-#include <nrf_sdh_ble.h>
-#include <ble_adv.h>
-#include <ble_conn_params.h>
-#include <ble_gap.h>
-#include <ble_qwr.h>
-#include <bluetooth/services/ble_nus.h>
-#include <nrf_soc.h>
+#include <softdevice/ble_gap.h>
+#include <bm/sdh/nrf_sdh.h>
+#include <bm/sdh/nrf_sdh_ble.h>
+#include <bm/ble/services/ble_nus.h>
+#include <bm/lib/ble_adv.h>
+#include <bm/lib/ble_conn_params.h>
+#include <bm/lib/ble_qwr.h>
+#include <softdevice/nrf_soc.h>
 #include <nrfx_uarte.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/samples/bluetooth/hello_softdevice/CMakeLists.txt b/samples/ble/hello_softdevice/CMakeLists.txt
similarity index 100%
rename from samples/bluetooth/hello_softdevice/CMakeLists.txt
rename to samples/ble/hello_softdevice/CMakeLists.txt
diff --git a/samples/bluetooth/hello_softdevice/README.rst b/samples/ble/hello_softdevice/README.rst
similarity index 94%
rename from samples/bluetooth/hello_softdevice/README.rst
rename to samples/ble/hello_softdevice/README.rst
index f8b460c21f..8a21ce2ce3 100644
--- a/samples/bluetooth/hello_softdevice/README.rst
+++ b/samples/ble/hello_softdevice/README.rst
@@ -50,7 +50,7 @@ Programming the S115 SoftDevice
 Building and running
 ********************
 
-This sample can be found under :file:`samples/bluetooth/hello_softdevice/` in the |BMshort| folder structure.
+This sample can be found under :file:`samples/ble/hello_softdevice/` in the |BMshort| folder structure.
 
 .. include:: /includes/create_sample.txt
 
diff --git a/samples/bluetooth/hello_softdevice/prj.conf b/samples/ble/hello_softdevice/prj.conf
similarity index 100%
rename from samples/bluetooth/hello_softdevice/prj.conf
rename to samples/ble/hello_softdevice/prj.conf
diff --git a/samples/bluetooth/hello_softdevice/sample.yaml b/samples/ble/hello_softdevice/sample.yaml
similarity index 100%
rename from samples/bluetooth/hello_softdevice/sample.yaml
rename to samples/ble/hello_softdevice/sample.yaml
diff --git a/samples/bluetooth/hello_softdevice/src/main.c b/samples/ble/hello_softdevice/src/main.c
similarity index 94%
rename from samples/bluetooth/hello_softdevice/src/main.c
rename to samples/ble/hello_softdevice/src/main.c
index 67dd548d87..c93deab054 100644
--- a/samples/bluetooth/hello_softdevice/src/main.c
+++ b/samples/ble/hello_softdevice/src/main.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf_sdh.h>
-#include <nrf_sdh_ble.h>
-#include <nrf_sdh_soc.h>
+#include <bm/sdh/nrf_sdh.h>
+#include <bm/sdh/nrf_sdh_ble.h>
+#include <bm/sdh/nrf_sdh_soc.h>
 #include <zephyr/kernel.h> /* k_busy_wait() */
 #include <zephyr/sys_clock.h> /* USEC_PER_SEC */
 #include <zephyr/logging/log_ctrl.h>
diff --git a/samples/mcumgr/ble_mcumgr/src/main.c b/samples/mcumgr/ble_mcumgr/src/main.c
index d40a65b6b8..a57728c0b2 100644
--- a/samples/mcumgr/ble_mcumgr/src/main.c
+++ b/samples/mcumgr/ble_mcumgr/src/main.c
@@ -8,11 +8,11 @@
 #include <stdint.h>
 #include <errno.h>
 #include <string.h>
-#include <nrf_sdh.h>
-#include <nrf_sdh_ble.h>
-#include <ble_adv.h>
-#include <ble_conn_params.h>
-#include <ble_gap.h>
+#include <softdevice/nrf_sdh.h>
+#include <softdevice/nrf_sdh_ble.h>
+#include <softdevice/ble_adv.h>
+#include <softdevice/ble_conn_params.h>
+#include <softdevice/ble_gap.h>
 #include <zephyr/kernel.h>
 #include <zephyr/mgmt/mcumgr/mgmt/mgmt.h>
 #include <zephyr/mgmt/mcumgr/smp/smp.h>
@@ -21,11 +21,11 @@
 #include <mgmt/mcumgr/transport/smp_internal.h>
 #include <mgmt/mcumgr/transport/smp_reassembly.h>
 #include <zephyr/sys/reboot.h>
-#include <nrf_soc.h>
+#include <softdevice/nrf_soc.h>
 #include <zephyr/logging/log.h>
 #include <bluetooth/services/common.h>
 #include <bluetooth/services/uuid.h>
-#include <ble_conn_params.h>
+#include <softdevice/ble_conn_params.h>
 
 LOG_MODULE_REGISTER(app, CONFIG_BLE_MCUMGR_LOG_LEVEL);
 
diff --git a/samples/peripherals/buttons/src/main.c b/samples/peripherals/buttons/src/main.c
index f50fb43dd3..772ee5fa96 100644
--- a/samples/peripherals/buttons/src/main.c
+++ b/samples/peripherals/buttons/src/main.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/sys/printk.h>
-#include <bm_buttons.h>
+#include <bm/lib/bm_buttons.h>
 
 #include <board-config.h>
 #include <zephyr/logging/log_ctrl.h>
diff --git a/samples/peripherals/timer/src/main.c b/samples/peripherals/timer/src/main.c
index 6ac346c4ef..9ac4cb1e5a 100644
--- a/samples/peripherals/timer/src/main.c
+++ b/samples/peripherals/timer/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <bm_timer.h>
+#include <bm/lib/bm_timer.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/sys/printk.h>
 
diff --git a/subsys/CMakeLists.txt b/subsys/CMakeLists.txt
index 0602761c04..f55edbc965 100644
--- a/subsys/CMakeLists.txt
+++ b/subsys/CMakeLists.txt
@@ -5,11 +5,11 @@
 #
 
 # zephyr-keep-sorted-start
-add_subdirectory(bluetooth)
+add_subdirectory(ble)
 add_subdirectory(bm_installs)
 add_subdirectory(logging)
 add_subdirectory_ifdef(CONFIG_NCS_BM_MCUMGR mgmt/mcumgr)
-add_subdirectory_ifdef(CONFIG_NRF_SDH softdevice_handler)
+add_subdirectory_ifdef(CONFIG_NRF_SDH nrf_sdh)
 add_subdirectory_ifdef(CONFIG_SOFTDEVICE softdevice)
 add_subdirectory_ifdef(CONFIG_FLASH_MAP storage/flash_map)
 # zephyr-keep-sorted-stop
diff --git a/subsys/Kconfig b/subsys/Kconfig
index 3b1ff6e7b0..2b5a65f7ff 100644
--- a/subsys/Kconfig
+++ b/subsys/Kconfig
@@ -7,12 +7,12 @@
 menu "Subsystems"
 
 # zephyr-keep-sorted-start
-rsource "bluetooth/Kconfig"
+rsource "ble/Kconfig"
 rsource "bm_installs/Kconfig"
 rsource "logging/Kconfig"
 rsource "mgmt/mcumgr/Kconfig"
 rsource "softdevice/Kconfig"
-rsource "softdevice_handler/Kconfig"
+rsource "nrf_sdh/Kconfig"
 rsource "storage/flash_map/Kconfig"
 # zephyr-keep-sorted-stop
 
diff --git a/subsys/bluetooth/CMakeLists.txt b/subsys/ble/CMakeLists.txt
similarity index 100%
rename from subsys/bluetooth/CMakeLists.txt
rename to subsys/ble/CMakeLists.txt
diff --git a/subsys/bluetooth/Kconfig b/subsys/ble/Kconfig
similarity index 100%
rename from subsys/bluetooth/Kconfig
rename to subsys/ble/Kconfig
diff --git a/subsys/bluetooth/services/CMakeLists.txt b/subsys/ble/services/CMakeLists.txt
similarity index 100%
rename from subsys/bluetooth/services/CMakeLists.txt
rename to subsys/ble/services/CMakeLists.txt
diff --git a/subsys/bluetooth/services/Kconfig b/subsys/ble/services/Kconfig
similarity index 100%
rename from subsys/bluetooth/services/Kconfig
rename to subsys/ble/services/Kconfig
diff --git a/subsys/bluetooth/services/Kconfig.template.sec_mode b/subsys/ble/services/Kconfig.template.sec_mode
similarity index 100%
rename from subsys/bluetooth/services/Kconfig.template.sec_mode
rename to subsys/ble/services/Kconfig.template.sec_mode
diff --git a/subsys/bluetooth/services/ble_bas/CMakeLists.txt b/subsys/ble/services/ble_bas/CMakeLists.txt
similarity index 100%
rename from subsys/bluetooth/services/ble_bas/CMakeLists.txt
rename to subsys/ble/services/ble_bas/CMakeLists.txt
diff --git a/subsys/bluetooth/services/ble_bas/Kconfig b/subsys/ble/services/ble_bas/Kconfig
similarity index 100%
rename from subsys/bluetooth/services/ble_bas/Kconfig
rename to subsys/ble/services/ble_bas/Kconfig
diff --git a/subsys/bluetooth/services/ble_bas/bas.c b/subsys/ble/services/ble_bas/bas.c
similarity index 98%
rename from subsys/bluetooth/services/ble_bas/bas.c
rename to subsys/ble/services/ble_bas/bas.c
index 7f9c8a1603..d2c0ad3ebe 100644
--- a/subsys/bluetooth/services/ble_bas/bas.c
+++ b/subsys/ble/services/ble_bas/bas.c
@@ -5,9 +5,9 @@
  */
 
 #include <string.h>
-#include <bluetooth/services/ble_bas.h>
-#include <bluetooth/services/common.h>
-#include <bluetooth/services/uuid.h>
+#include <bm/ble/services/ble_bas.h>
+#include <bm/ble/services/common.h>
+#include <bm/ble/services/uuid.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(ble_bas, CONFIG_BLE_BAS_LOG_LEVEL);
diff --git a/subsys/bluetooth/services/ble_cgms/CMakeLists.txt b/subsys/ble/services/ble_cgms/CMakeLists.txt
similarity index 100%
rename from subsys/bluetooth/services/ble_cgms/CMakeLists.txt
rename to subsys/ble/services/ble_cgms/CMakeLists.txt
diff --git a/subsys/bluetooth/services/ble_cgms/Kconfig b/subsys/ble/services/ble_cgms/Kconfig
similarity index 100%
rename from subsys/bluetooth/services/ble_cgms/Kconfig
rename to subsys/ble/services/ble_cgms/Kconfig
diff --git a/subsys/bluetooth/services/ble_cgms/cgms.c b/subsys/ble/services/ble_cgms/cgms.c
similarity index 98%
rename from subsys/bluetooth/services/ble_cgms/cgms.c
rename to subsys/ble/services/ble_cgms/cgms.c
index cd595b7a51..f57429d432 100644
--- a/subsys/bluetooth/services/ble_cgms/cgms.c
+++ b/subsys/ble/services/ble_cgms/cgms.c
@@ -5,16 +5,16 @@
  */
 #include <stdint.h>
 
-#include <ble_racp.h>
-#include <bluetooth/services/ble_date_time.h>
-#include <bluetooth/services/ble_cgms.h>
-#include <bluetooth/services/uuid.h>
+#include <bm/ble/services/ble_date_time.h>
+#include <bm/ble/services/ble_cgms.h>
+#include <bm/ble/services/uuid.h>
+#include <bm/lib/ble_racp.h>
 #include "cgms_db.h"
 #include "cgms_meas.h"
 #include "cgms_racp.h"
 #include "cgms_socp.h"
 #include "cgms_sst.h"
-#include <nrf_error.h>
+#include <bm/nrf_error.h>
 
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/logging/log.h>
diff --git a/subsys/bluetooth/services/ble_cgms/cgms_db.c b/subsys/ble/services/ble_cgms/cgms_db.c
similarity index 100%
rename from subsys/bluetooth/services/ble_cgms/cgms_db.c
rename to subsys/ble/services/ble_cgms/cgms_db.c
diff --git a/subsys/bluetooth/services/ble_cgms/cgms_db.h b/subsys/ble/services/ble_cgms/cgms_db.h
similarity index 97%
rename from subsys/bluetooth/services/ble_cgms/cgms_db.h
rename to subsys/ble/services/ble_cgms/cgms_db.h
index 99862510d6..d44f90917b 100644
--- a/subsys/bluetooth/services/ble_cgms/cgms_db.h
+++ b/subsys/ble/services/ble_cgms/cgms_db.h
@@ -20,7 +20,7 @@
 #ifndef BLE_CGMS_DB_H__
 #define BLE_CGMS_DB_H__
 
-#include <bluetooth/services/ble_cgms.h>
+#include <bm/ble/services/ble_cgms.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/bluetooth/services/ble_cgms/cgms_meas.c b/subsys/ble/services/ble_cgms/cgms_meas.c
similarity index 97%
rename from subsys/bluetooth/services/ble_cgms/cgms_meas.c
rename to subsys/ble/services/ble_cgms/cgms_meas.c
index e01e3882d3..819ee1e21d 100644
--- a/subsys/bluetooth/services/ble_cgms/cgms_meas.c
+++ b/subsys/ble/services/ble_cgms/cgms_meas.c
@@ -6,10 +6,10 @@
 #include <stdint.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
-#include <ble.h>
-#include <bluetooth/services/ble_cgms.h>
-#include <bluetooth/services/common.h>
-#include <bluetooth/services/uuid.h>
+#include <softdevice/ble.h>
+#include <bm/ble/services/ble_cgms.h>
+#include <bm/ble/services/common.h>
+#include <bm/ble/services/uuid.h>
 #include "cgms_meas.h"
 #include "cgms_db.h"
 
diff --git a/subsys/bluetooth/services/ble_cgms/cgms_meas.h b/subsys/ble/services/ble_cgms/cgms_meas.h
similarity index 96%
rename from subsys/bluetooth/services/ble_cgms/cgms_meas.h
rename to subsys/ble/services/ble_cgms/cgms_meas.h
index 34a4fa487e..52514fdb0d 100644
--- a/subsys/bluetooth/services/ble_cgms/cgms_meas.h
+++ b/subsys/ble/services/ble_cgms/cgms_meas.h
@@ -19,8 +19,8 @@
 #ifndef BLE_CGMS_MEAS_H__
 #define BLE_CGMS_MEAS_H__
 
-#include <ble.h>
-#include <bluetooth/services/ble_cgms.h>
+#include <softdevice/ble.h>
+#include <bm/ble/services/ble_cgms.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/bluetooth/services/ble_cgms/cgms_racp.c b/subsys/ble/services/ble_cgms/cgms_racp.c
similarity index 98%
rename from subsys/bluetooth/services/ble_cgms/cgms_racp.c
rename to subsys/ble/services/ble_cgms/cgms_racp.c
index 5d88bf21dc..61ebd7fbda 100644
--- a/subsys/bluetooth/services/ble_cgms/cgms_racp.c
+++ b/subsys/ble/services/ble_cgms/cgms_racp.c
@@ -5,13 +5,13 @@
  */
 #include <stdint.h>
 #include <string.h>
-#include <ble.h>
-#include <ble_gq.h>
-#include <ble_gatts.h>
-#include <bluetooth/services/ble_cgms.h>
-#include <bluetooth/services/common.h>
-#include <bluetooth/services/uuid.h>
-#include <nrf_error.h>
+#include <softdevice/ble.h>
+#include <softdevice/ble_gatts.h>
+#include <bm/ble/services/ble_cgms.h>
+#include <bm/ble/services/common.h>
+#include <bm/ble/services/uuid.h>
+#include <bm/lib/ble_gq.h>
+#include <bm/nrf_error.h>
 #include "cgms_racp.h"
 #include "cgms_db.h"
 #include "cgms_meas.h"
diff --git a/subsys/bluetooth/services/ble_cgms/cgms_racp.h b/subsys/ble/services/ble_cgms/cgms_racp.h
similarity index 96%
rename from subsys/bluetooth/services/ble_cgms/cgms_racp.h
rename to subsys/ble/services/ble_cgms/cgms_racp.h
index 57cf4a387c..b738721f7e 100644
--- a/subsys/bluetooth/services/ble_cgms/cgms_racp.h
+++ b/subsys/ble/services/ble_cgms/cgms_racp.h
@@ -19,8 +19,8 @@
 #ifndef BLE_CGMS_RACP_H__
 #define BLE_CGMS_RACP_H__
 
-#include <ble.h>
-#include <bluetooth/services/ble_cgms.h>
+#include <softdevice/ble.h>
+#include <bm/ble/services/ble_cgms.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/bluetooth/services/ble_cgms/cgms_socp.c b/subsys/ble/services/ble_cgms/cgms_socp.c
similarity index 99%
rename from subsys/bluetooth/services/ble_cgms/cgms_socp.c
rename to subsys/ble/services/ble_cgms/cgms_socp.c
index 16106f6cf7..15ce6f0210 100644
--- a/subsys/bluetooth/services/ble_cgms/cgms_socp.c
+++ b/subsys/ble/services/ble_cgms/cgms_socp.c
@@ -6,10 +6,10 @@
 #include <stdint.h>
 #include <string.h>
 #include <zephyr/sys/byteorder.h>
-#include <ble.h>
-#include <bluetooth/services/common.h>
-#include <bluetooth/services/uuid.h>
-#include <ble_gq.h>
+#include <softdevice/ble.h>
+#include <bm/ble/services/common.h>
+#include <bm/ble/services/uuid.h>
+#include <bm/lib/ble_gq.h>
 #include "cgms_db.h"
 #include "cgms_sst.h"
 #include "cgms_socp.h"
diff --git a/subsys/bluetooth/services/ble_cgms/cgms_socp.h b/subsys/ble/services/ble_cgms/cgms_socp.h
similarity index 95%
rename from subsys/bluetooth/services/ble_cgms/cgms_socp.h
rename to subsys/ble/services/ble_cgms/cgms_socp.h
index 490b5ffa1f..2a8848a73f 100644
--- a/subsys/bluetooth/services/ble_cgms/cgms_socp.h
+++ b/subsys/ble/services/ble_cgms/cgms_socp.h
@@ -19,8 +19,8 @@
 #ifndef BLE_CGMS_SOCP_H__
 #define BLE_CGMS_SOCP_H__
 
-#include <ble.h>
-#include <bluetooth/services/ble_cgms.h>
+#include <softdevice/ble.h>
+#include <bm/ble/services/ble_cgms.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/bluetooth/services/ble_cgms/cgms_sst.c b/subsys/ble/services/ble_cgms/cgms_sst.c
similarity index 97%
rename from subsys/bluetooth/services/ble_cgms/cgms_sst.c
rename to subsys/ble/services/ble_cgms/cgms_sst.c
index 20088055c7..3ccac468ed 100644
--- a/subsys/bluetooth/services/ble_cgms/cgms_sst.c
+++ b/subsys/ble/services/ble_cgms/cgms_sst.c
@@ -6,10 +6,10 @@
 #include <stdint.h>
 #include <string.h>
 #include <time.h>
-#include <ble.h>
-#include <nrf_error.h>
-#include <bluetooth/services/ble_cgms.h>
-#include <bluetooth/services/uuid.h>
+#include <softdevice/ble.h>
+#include <bm/nrf_error.h>
+#include <bm/ble/services/ble_cgms.h>
+#include <bm/ble/services/uuid.h>
 #include "cgms_sst.h"
 
 #include <zephyr/logging/log.h>
diff --git a/subsys/bluetooth/services/ble_cgms/cgms_sst.h b/subsys/ble/services/ble_cgms/cgms_sst.h
similarity index 95%
rename from subsys/bluetooth/services/ble_cgms/cgms_sst.h
rename to subsys/ble/services/ble_cgms/cgms_sst.h
index a71e7d553c..899e6aaf6a 100644
--- a/subsys/bluetooth/services/ble_cgms/cgms_sst.h
+++ b/subsys/ble/services/ble_cgms/cgms_sst.h
@@ -20,9 +20,9 @@
 #ifndef BLE_CGMS_SST_H__
 #define BLE_CGMS_SST_H__
 
-#include <ble.h>
-#include <bluetooth/services/ble_date_time.h>
-#include <bluetooth/services/ble_cgms.h>
+#include <softdevice/ble.h>
+#include <bm/ble/services/ble_date_time.h>
+#include <bm/ble/services/ble_cgms.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/bluetooth/services/ble_dis/CMakeLists.txt b/subsys/ble/services/ble_dis/CMakeLists.txt
similarity index 100%
rename from subsys/bluetooth/services/ble_dis/CMakeLists.txt
rename to subsys/ble/services/ble_dis/CMakeLists.txt
diff --git a/subsys/bluetooth/services/ble_dis/Kconfig b/subsys/ble/services/ble_dis/Kconfig
similarity index 96%
rename from subsys/bluetooth/services/ble_dis/Kconfig
rename to subsys/ble/services/ble_dis/Kconfig
index 9d7320e32a..8c404bc115 100644
--- a/subsys/bluetooth/services/ble_dis/Kconfig
+++ b/subsys/ble/services/ble_dis/Kconfig
@@ -97,7 +97,7 @@ endif
 
 characteristic=BLE_DIS_CHAR
 characteristic-str=Device Information Service characterstics
-source "${ZEPHYR_NRF_BM_MODULE_DIR}/subsys/bluetooth/services/Kconfig.template.sec_mode"
+source "${ZEPHYR_NRF_BM_MODULE_DIR}/subsys/ble/services/Kconfig.template.sec_mode"
 
 module=BLE_DIS
 module-dep=LOG
diff --git a/subsys/bluetooth/services/ble_dis/dis.c b/subsys/ble/services/ble_dis/dis.c
similarity index 97%
rename from subsys/bluetooth/services/ble_dis/dis.c
rename to subsys/ble/services/ble_dis/dis.c
index f90e280bd1..8277f6310d 100644
--- a/subsys/bluetooth/services/ble_dis/dis.c
+++ b/subsys/ble/services/ble_dis/dis.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <ble_gatts.h>
-#include <bluetooth/services/uuid.h>
-#include <bluetooth/services/common.h>
+#include <softdevice/ble_gatts.h>
+#include <bm/ble/services/uuid.h>
+#include <bm/ble/services/common.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
diff --git a/subsys/bluetooth/services/ble_hrs/CMakeLists.txt b/subsys/ble/services/ble_hrs/CMakeLists.txt
similarity index 100%
rename from subsys/bluetooth/services/ble_hrs/CMakeLists.txt
rename to subsys/ble/services/ble_hrs/CMakeLists.txt
diff --git a/subsys/bluetooth/services/ble_hrs/Kconfig b/subsys/ble/services/ble_hrs/Kconfig
similarity index 100%
rename from subsys/bluetooth/services/ble_hrs/Kconfig
rename to subsys/ble/services/ble_hrs/Kconfig
diff --git a/subsys/bluetooth/services/ble_hrs/hrs.c b/subsys/ble/services/ble_hrs/hrs.c
similarity index 98%
rename from subsys/bluetooth/services/ble_hrs/hrs.c
rename to subsys/ble/services/ble_hrs/hrs.c
index 1c67b3a4f0..571e61dedf 100644
--- a/subsys/bluetooth/services/ble_hrs/hrs.c
+++ b/subsys/ble/services/ble_hrs/hrs.c
@@ -7,10 +7,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include <ble_conn_params.h>
-#include <bluetooth/services/ble_hrs.h>
-#include <bluetooth/services/common.h>
-#include <bluetooth/services/uuid.h>
+#include <bm/ble/services/ble_hrs.h>
+#include <bm/ble/services/common.h>
+#include <bm/ble/services/uuid.h>
+#include <bm/lib/ble_conn_params.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/logging/log.h>
diff --git a/subsys/bluetooth/services/ble_lbs/CMakeLists.txt b/subsys/ble/services/ble_lbs/CMakeLists.txt
similarity index 100%
rename from subsys/bluetooth/services/ble_lbs/CMakeLists.txt
rename to subsys/ble/services/ble_lbs/CMakeLists.txt
diff --git a/subsys/bluetooth/services/ble_lbs/Kconfig b/subsys/ble/services/ble_lbs/Kconfig
similarity index 100%
rename from subsys/bluetooth/services/ble_lbs/Kconfig
rename to subsys/ble/services/ble_lbs/Kconfig
diff --git a/subsys/bluetooth/services/ble_lbs/lbs.c b/subsys/ble/services/ble_lbs/lbs.c
similarity index 98%
rename from subsys/bluetooth/services/ble_lbs/lbs.c
rename to subsys/ble/services/ble_lbs/lbs.c
index d9719b0016..51098c0b1f 100644
--- a/subsys/bluetooth/services/ble_lbs/lbs.c
+++ b/subsys/ble/services/ble_lbs/lbs.c
@@ -6,8 +6,8 @@
 
 #include <zephyr/sys/__assert.h>
 #include <zephyr/logging/log.h>
-#include <bluetooth/services/ble_lbs.h>
-#include <bluetooth/services/uuid.h>
+#include <bm/ble/services/ble_lbs.h>
+#include <bm/ble/services/uuid.h>
 
 LOG_MODULE_REGISTER(ble_lbs, CONFIG_BLE_LBS_LOG_LEVEL);
 
diff --git a/subsys/bluetooth/services/ble_nus/CMakeLists.txt b/subsys/ble/services/ble_nus/CMakeLists.txt
similarity index 100%
rename from subsys/bluetooth/services/ble_nus/CMakeLists.txt
rename to subsys/ble/services/ble_nus/CMakeLists.txt
diff --git a/subsys/bluetooth/services/ble_nus/Kconfig b/subsys/ble/services/ble_nus/Kconfig
similarity index 100%
rename from subsys/bluetooth/services/ble_nus/Kconfig
rename to subsys/ble/services/ble_nus/Kconfig
diff --git a/subsys/bluetooth/services/ble_nus/nus.c b/subsys/ble/services/ble_nus/nus.c
similarity index 98%
rename from subsys/bluetooth/services/ble_nus/nus.c
rename to subsys/ble/services/ble_nus/nus.c
index fe1d9b3db9..efcfc69c61 100644
--- a/subsys/bluetooth/services/ble_nus/nus.c
+++ b/subsys/ble/services/ble_nus/nus.c
@@ -6,9 +6,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <bluetooth/services/ble_nus.h>
-#include <bluetooth/services/common.h>
-#include <bluetooth/services/uuid.h>
+#include <bm/ble/services/ble_nus.h>
+#include <bm/ble/services/common.h>
+#include <bm/ble/services/uuid.h>
 
 #include <zephyr/logging/log.h>
 
diff --git a/subsys/softdevice_handler/CMakeLists.txt b/subsys/nrf_sdh/CMakeLists.txt
similarity index 100%
rename from subsys/softdevice_handler/CMakeLists.txt
rename to subsys/nrf_sdh/CMakeLists.txt
diff --git a/subsys/softdevice_handler/Kconfig b/subsys/nrf_sdh/Kconfig
similarity index 100%
rename from subsys/softdevice_handler/Kconfig
rename to subsys/nrf_sdh/Kconfig
diff --git a/subsys/softdevice_handler/irq_connect.c b/subsys/nrf_sdh/irq_connect.c
similarity index 99%
rename from subsys/softdevice_handler/irq_connect.c
rename to subsys/nrf_sdh/irq_connect.c
index ee6990e145..686202a857 100644
--- a/subsys/softdevice_handler/irq_connect.c
+++ b/subsys/nrf_sdh/irq_connect.c
@@ -11,7 +11,7 @@
 
 #if CONFIG_SOC_SERIES_NRF52X
 #include <zephyr/linker/linker-defs.h>
-#include <nrf_sdm.h>
+#include <softdevice/nrf_sdm.h>
 #include <nrfx_gpiote.h>
 
 void relocate_vector_table(void)
diff --git a/subsys/softdevice_handler/irq_connect.h b/subsys/nrf_sdh/irq_connect.h
similarity index 100%
rename from subsys/softdevice_handler/irq_connect.h
rename to subsys/nrf_sdh/irq_connect.h
diff --git a/subsys/softdevice_handler/irq_forward.s b/subsys/nrf_sdh/irq_forward.s
similarity index 99%
rename from subsys/softdevice_handler/irq_forward.s
rename to subsys/nrf_sdh/irq_forward.s
index b5511e00ea..7ae020ff86 100644
--- a/subsys/softdevice_handler/irq_forward.s
+++ b/subsys/nrf_sdh/irq_forward.s
@@ -18,7 +18,7 @@
     .arch armv8-m.main
 
 #include "irq_connect.h"
-#include "nrf_sd_isr.h"
+#include <softdevice/nrf_sd_isr.h>
 
     .section .text.STACK_INTERRUPTS, "x"
 
diff --git a/subsys/softdevice_handler/nrf_sdh.c b/subsys/nrf_sdh/nrf_sdh.c
similarity index 98%
rename from subsys/softdevice_handler/nrf_sdh.c
rename to subsys/nrf_sdh/nrf_sdh.c
index 295816df5c..b2d15d4ca1 100644
--- a/subsys/softdevice_handler/nrf_sdh.c
+++ b/subsys/nrf_sdh/nrf_sdh.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <stdint.h>
-#include <nrf_sdh.h>
-#include <nrf_sdm.h>
-#include <event_scheduler.h>
+#include <softdevice/nrf_sdm.h>
+#include <bm/lib/event_scheduler.h>
+#include <bm/sdh/nrf_sdh.h>
 #include <zephyr/toolchain.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/atomic.h>
diff --git a/subsys/softdevice_handler/nrf_sdh_ble.c b/subsys/nrf_sdh/nrf_sdh_ble.c
similarity index 99%
rename from subsys/softdevice_handler/nrf_sdh_ble.c
rename to subsys/nrf_sdh/nrf_sdh_ble.c
index 0218febf68..b70d930c54 100644
--- a/subsys/softdevice_handler/nrf_sdh_ble.c
+++ b/subsys/nrf_sdh/nrf_sdh_ble.c
@@ -6,9 +6,9 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <nrf_sdh.h>
-#include <nrf_sdh_ble.h>
-#include <ble.h>
+#include <bm/sdh/nrf_sdh.h>
+#include <bm/sdh/nrf_sdh_ble.h>
+#include <softdevice/ble.h>
 #include <zephyr/logging/log.h>
 
 #define APP_RAM_START DT_REG_ADDR(DT_CHOSEN(zephyr_sram))
diff --git a/subsys/softdevice_handler/nrf_sdh_soc.c b/subsys/nrf_sdh/nrf_sdh_soc.c
similarity index 95%
rename from subsys/softdevice_handler/nrf_sdh_soc.c
rename to subsys/nrf_sdh/nrf_sdh_soc.c
index f1578cca30..18886aa2fc 100644
--- a/subsys/softdevice_handler/nrf_sdh_soc.c
+++ b/subsys/nrf_sdh/nrf_sdh_soc.c
@@ -6,9 +6,9 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <nrf_sdh.h>
-#include <nrf_sdh_soc.h>
-#include <nrf_soc.h>
+#include <bm/sdh/nrf_sdh.h>
+#include <bm/sdh/nrf_sdh_soc.h>
+#include <softdevice/nrf_soc.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nrf_sdh, CONFIG_NRF_SDH_LOG_LEVEL);
diff --git a/subsys/softdevice_handler/sdh.ld b/subsys/nrf_sdh/sdh.ld
similarity index 100%
rename from subsys/softdevice_handler/sdh.ld
rename to subsys/nrf_sdh/sdh.ld
diff --git a/tests/lib/ble_qwr/CMakeLists.txt b/tests/lib/ble_qwr/CMakeLists.txt
index a0be70c567..ff299d32a9 100644
--- a/tests/lib/ble_qwr/CMakeLists.txt
+++ b/tests/lib/ble_qwr/CMakeLists.txt
@@ -16,16 +16,20 @@ add_compile_definitions(
         CONFIG_BLE_QWR_MAX_ATTR=2
 )
 
-cmock_handle(${ZEPHYR_NRF_BM_MODULE_DIR}/include/s115/ble.h)
-cmock_handle(${ZEPHYR_NRF_BM_MODULE_DIR}/include/s115/ble_gatts.h
-        WORD_EXCLUDE
-        "__STATIC_INLINE")
-cmock_handle(${ZEPHYR_NRF_BM_MODULE_DIR}/include/s115/ble_gattc.h
-        WORD_EXCLUDE
-        "__STATIC_INLINE")
+cmock_handle(${ZEPHYR_NRF_BM_MODULE_DIR}/include/bm/softdevice/s115/softdevice/ble_gatts.h softdevice
+        WORD_EXCLUDE "__STATIC_INLINE"
+)
+cmock_handle(${ZEPHYR_NRF_BM_MODULE_DIR}/include/bm/softdevice/s115/softdevice/ble_gattc.h softdevice
+        WORD_EXCLUDE "__STATIC_INLINE"
+)
+cmock_handle(${ZEPHYR_NRF_BM_MODULE_DIR}/include/bm/softdevice/s115/softdevice/ble.h softdevice)
 
+target_include_directories(app PRIVATE ${ZEPHYR_NRF_BM_MODULE_DIR}/include/bm/softdevice/s115)
+target_include_directories(
+        app PRIVATE
+        ${ZEPHYR_NRF_BM_MODULE_DIR}/include/bm/softdevice/s115/softdevice
+)
 target_include_directories(app PRIVATE ${ZEPHYR_NRF_BM_MODULE_DIR}/include)
-target_include_directories(app PRIVATE ${ZEPHYR_NRF_BM_MODULE_DIR}/include/s115)
 target_include_directories(app PRIVATE ${ZEPHYR_HAL_NORDIC_MODULE_DIR}/nrfx/mdk)
 target_include_directories(app PRIVATE ${ZEPHYR_CMSIS_MODULE_DIR}/CMSIS/Core/Include)
 
diff --git a/tests/lib/ble_qwr/src/unity_test.c b/tests/lib/ble_qwr/src/unity_test.c
index 8333f34058..d24c2fdcb0 100644
--- a/tests/lib/ble_qwr/src/unity_test.c
+++ b/tests/lib/ble_qwr/src/unity_test.c
@@ -10,9 +10,9 @@
 #include <strings.h>
 #include <errno.h>
 
-#include "cmock_ble.h"
-#include "cmock_ble_gatts.h"
-#include <ble_qwr.h>
+#include "softdevice/cmock_ble.h"
+#include "softdevice/cmock_ble_gatts.h"
+#include <bm/lib/ble_qwr.h>
 
 static uint16_t ble_qwr_evt_handler(struct ble_qwr *qwr, const struct ble_qwr_evt *evt)
 {
diff --git a/tests/lib/ble_racp/src/unity_test.c b/tests/lib/ble_racp/src/unity_test.c
index 5a2a178e66..eeeeff7b16 100644
--- a/tests/lib/ble_racp/src/unity_test.c
+++ b/tests/lib/ble_racp/src/unity_test.c
@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <errno.h>
 
-#include <ble_racp.h>
+#include <bm/lib/ble_racp.h>
 
 void test_ble_racp_encode_efault(void)
 {
diff --git a/west.yml b/west.yml
index d9e361eeaf..8c385ef6ab 100644
--- a/west.yml
+++ b/west.yml
@@ -14,7 +14,7 @@ manifest:
   projects:
     - name: nrf
       repo-path: sdk-nrf
-      revision: ad5df678988cf04cdb3bebd882640062c3176d31
+      revision: pull/23057/head
       import:
         name-allowlist:
           - cmsis