doc: Rename libraries/bluetooth_services to libraries/bluetooth/

Renamed libraries/bluetooth_services to libraries/bluetooth/ to make the naming of the doc folder consistent with include/bluetooth Signed-off-by: Uma Praseeda <[email protected]>
nrfconnect · Nov 22, 2024 · 9055b6c · 9055b6c
1 parent 1627ada
commit 9055b6c
Show file tree

Hide file tree

Showing 115 changed files with 115 additions and 14 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -117,12 +117,12 @@
 /doc/nrf/installation/                    @nrfconnect/ncs-doc-leads @nrfconnect/ncs-vestavind-doc @nrfconnect/ncs-wayland-doc
 /doc/nrf/libraries/bin/                   @nrfconnect/ncs-doc-leads
 /doc/nrf/libraries/bin/lwm2m_carrier/     @nrfconnect/ncs-carrier-doc
-/doc/nrf/libraries/bluetooth_services/    @nrfconnect/ncs-si-muffin-doc @nrfconnect/ncs-dragoon-doc
-/doc/nrf/libraries/bluetooth_services/mesh/ @nrfconnect/ncs-paladin-doc
-/doc/nrf/libraries/bluetooth_services/adv_prov.rst @nrfconnect/ncs-si-bluebagel-doc
-/doc/nrf/libraries/bluetooth_services/mesh.rst @nrfconnect/ncs-paladin-doc
-/doc/nrf/libraries/bluetooth_services/services/fast_pair.rst @nrfconnect/ncs-si-bluebagel-doc
-/doc/nrf/libraries/bluetooth_services/services/wifi_prov.rst @nrfconnect/ncs-wifi-doc
+/doc/nrf/libraries/bluetooth/    @nrfconnect/ncs-si-muffin-doc @nrfconnect/ncs-dragoon-doc
+/doc/nrf/libraries/bluetooth/mesh/ @nrfconnect/ncs-paladin-doc
+/doc/nrf/libraries/bluetooth/adv_prov.rst @nrfconnect/ncs-si-bluebagel-doc
+/doc/nrf/libraries/bluetooth/mesh.rst @nrfconnect/ncs-paladin-doc
+/doc/nrf/libraries/bluetooth/services/fast_pair.rst @nrfconnect/ncs-si-bluebagel-doc
+/doc/nrf/libraries/bluetooth/services/wifi_prov.rst @nrfconnect/ncs-wifi-doc
 /doc/nrf/libraries/caf/                   @nrfconnect/ncs-si-muffin-doc @nrfconnect/ncs-si-bluebagel-doc
 /doc/nrf/libraries/debug/cpu_load.rst     @nrfconnect/ncs-doc-leads
 /doc/nrf/libraries/debug/etb_trace.rst    @nrfconnect/ncs-cia-doc

diff --git a/doc/_utils/redirects.py b/doc/_utils/redirects.py
@@ -306,7 +306,7 @@
     ("ug_ble_controller", "protocols/bt/index"), # Bluetooth LE Controller
     ("protocols/ble/index", "protocols/bt/index"),
     ("protocols/bt/ble/index", "protocols/bt/bt_stack_arch"),
-    ("protocols/bt/ble/radio_notification_conn_cb", "libraries/bluetooth_services/radio_notification_conn_cb"),
+    ("protocols/bt/ble/radio_notification_conn_cb", "libraries/bluetooth/radio_notification_conn_cb"),
     ("ug_bt_mesh", "protocols/bt/bt_mesh/index"), # Bluetooth Mesh (landing)
     ("protocols/bt_mesh/index", "protocols/bt/bt_mesh/index"),
     ("ug_bt_mesh_supported_features", "protocols/bt/bt_mesh/overview/index"), # Supported Bluetooth Mesh features (file removed; part of the overview index page now)
@@ -430,6 +430,107 @@
     ("samples/wifi/sr_coex/README", "samples/wifi/ble_coex/README"), # Wi-Fi: Bluetooth LE coexistence
     ("samples/samples_zigbee", "samples/zigbee"), # Zigbee samples (landing)
     ("samples/samples_other", "samples/other"), # Other samples (landing)
+    ("libraries/bluetooth_services/index", "libraries/bluetooth/index"), # Changed the folder name libraries/bluetooth_services to libraries/bluetooth to better match the include folder structure
+    ("libraries/bluetooth_services/adv_prov", "libraries/bluetooth/adv_prov"),
+    ("libraries/bluetooth_services/conn_ctx", "libraries/bluetooth/conn_ctx"),
+    ("libraries/bluetooth_services/enocean", "libraries/bluetooth/enocean"),
+    ("libraries/bluetooth_services/gatt_dm", "libraries/bluetooth/gatt_dm"),
+    ("libraries/bluetooth_services/gatt_pool", "libraries/bluetooth/gatt_pool"),
+    ("libraries/bluetooth_services/mesh", "libraries/bluetooth/mesh"),
+    ("libraries/bluetooth_services/mesh/model_types", "libraries/bluetooth/mesh/model_types"),
+    ("libraries/bluetooth_services/mesh/gen_onoff", "libraries/bluetooth/mesh/gen_onoff"),
+    ("libraries/bluetooth_services/mesh/gen_onoff_srv", "libraries/bluetooth/mesh/gen_onoff_srv"),
+    ("libraries/bluetooth_services/mesh/gen_onoff_cli", "libraries/bluetooth/mesh/gen_onoff_cli"),
+    ("libraries/bluetooth_services/mesh/gen_lvl", "libraries/bluetooth/mesh/gen_lvl"),
+    ("libraries/bluetooth_services/mesh/gen_lvl_srv", "libraries/bluetooth/mesh/gen_lvl_srv"),
+    ("libraries/bluetooth_services/mesh/gen_lvl_cli", "libraries/bluetooth/mesh/gen_lvl_cli"),
+    ("libraries/bluetooth_services/mesh/gen_dtt", "libraries/bluetooth/mesh/gen_dtt"),
+    ("libraries/bluetooth_services/mesh/gen_dtt_srv", "libraries/bluetooth/mesh/gen_dtt_srv"),
+    ("libraries/bluetooth_services/mesh/gen_dtt_cli", "libraries/bluetooth/mesh/gen_dtt_cli"),
+    ("libraries/bluetooth_services/mesh/gen_ponoff", "libraries/bluetooth/mesh/gen_ponoff"),
+    ("libraries/bluetooth_services/mesh/gen_ponoff_srv", "libraries/bluetooth/mesh/gen_ponoff_srv"),
+    ("libraries/bluetooth_services/mesh/gen_ponoff_cli", "libraries/bluetooth/mesh/gen_ponoff_cli"),
+    ("libraries/bluetooth_services/mesh/gen_plvl", "libraries/bluetooth/mesh/gen_plvl"),
+    ("libraries/bluetooth_services/mesh/gen_plvl_srv", "libraries/bluetooth/mesh/gen_plvl_srv"),
+    ("libraries/bluetooth_services/mesh/gen_plvl_cli", "libraries/bluetooth/mesh/gen_plvl_cli"),
+    ("libraries/bluetooth_services/mesh/gen_battery", "libraries/bluetooth/mesh/gen_battery"),
+    ("libraries/bluetooth_services/mesh/gen_battery_srv", "libraries/bluetooth/mesh/gen_battery_srv"),
+    ("libraries/bluetooth_services/mesh/gen_battery_cli", "libraries/bluetooth/mesh/gen_battery_cli"),
+    ("libraries/bluetooth_services/mesh/gen_loc", "libraries/bluetooth/mesh/gen_loc"),
+    ("libraries/bluetooth_services/mesh/gen_loc_srv", "libraries/bluetooth/mesh/gen_loc_srv"),
+    ("libraries/bluetooth_services/mesh/gen_loc_cli", "libraries/bluetooth/mesh/gen_loc_cli"),
+    ("libraries/bluetooth_services/mesh/gen_prop", "libraries/bluetooth/mesh/gen_prop"),
+    ("libraries/bluetooth_services/mesh/gen_prop_srv", "libraries/bluetooth/mesh/gen_prop_srv"),
+    ("libraries/bluetooth_services/mesh/gen_prop_cli", "libraries/bluetooth/mesh/gen_prop_cli"),
+    ("libraries/bluetooth_services/mesh/lightness", "libraries/bluetooth/mesh/lightness"),
+    ("libraries/bluetooth_services/mesh/lightness_srv", "libraries/bluetooth/mesh/lightness_srv"),
+    ("libraries/bluetooth_services/mesh/lightness_cli", "libraries/bluetooth/mesh/lightness_cli"),
+    ("libraries/bluetooth_services/mesh/light_ctrl", "libraries/bluetooth/mesh/light_ctrl"),
+    ("libraries/bluetooth_services/mesh/light_ctrl_srv", "libraries/bluetooth/mesh/light_ctrl_srv"),
+    ("libraries/bluetooth_services/mesh/light_ctrl_cli", "libraries/bluetooth/mesh/light_ctrl_cli"),
+    ("libraries/bluetooth_services/mesh/light_ctrl_reg", "libraries/bluetooth/mesh/light_ctrl_reg"),
+    ("libraries/bluetooth_services/mesh/light_ctrl_reg_spec", "libraries/bluetooth/mesh/light_ctrl_reg_spec"),
+    ("libraries/bluetooth_services/mesh/light_ctl", "libraries/bluetooth/mesh/light_ctl"),
+    ("libraries/bluetooth_services/mesh/light_ctl_cli", "libraries/bluetooth/mesh/light_ctl_cli"),
+    ("libraries/bluetooth_services/mesh/light_ctl_srv", "libraries/bluetooth/mesh/light_ctl_srv"),
+    ("libraries/bluetooth_services/mesh/light_temp_srv", "libraries/bluetooth/mesh/light_temp_srv"),
+    ("libraries/bluetooth_services/mesh/light_xyl", "libraries/bluetooth/mesh/light_xyl"),
+    ("libraries/bluetooth_services/mesh/light_xyl_cli", "libraries/bluetooth/mesh/light_xyl_cli"),
+    ("libraries/bluetooth_services/mesh/light_xyl_srv", "libraries/bluetooth/mesh/light_xyl_srv"),
+    ("libraries/bluetooth_services/mesh/light_hsl", "libraries/bluetooth/mesh/light_hsl"),
+    ("libraries/bluetooth_services/mesh/light_hsl_cli", "libraries/bluetooth/mesh/light_hsl_cli"),
+    ("libraries/bluetooth_services/mesh/light_hsl_srv", "libraries/bluetooth/mesh/light_hsl_srv"),
+    ("libraries/bluetooth_services/mesh/light_hue_srv", "libraries/bluetooth/mesh/light_hue_srv"),
+    ("libraries/bluetooth_services/mesh/light_sat_srv", "libraries/bluetooth/mesh/light_sat_srv"),
+    ("libraries/bluetooth_services/mesh/sensor_models", "libraries/bluetooth/mesh/sensor_models"),
+    ("libraries/bluetooth_services/mesh/sensor_srv", "libraries/bluetooth/mesh/sensor_srv"),
+    ("libraries/bluetooth_services/mesh/sensor_cli", "libraries/bluetooth/mesh/sensor_cli"),
+    ("libraries/bluetooth_services/mesh/time", "libraries/bluetooth/mesh/time"),
+    ("libraries/bluetooth_services/mesh/time_tai", "libraries/bluetooth/mesh/time_tai"),
+    ("libraries/bluetooth_services/mesh/time_srv", "libraries/bluetooth/mesh/time_srv"),
+    ("libraries/bluetooth_services/mesh/time_cli", "libraries/bluetooth/mesh/time_cli"),
+    ("libraries/bluetooth_services/mesh/scene", "libraries/bluetooth/mesh/scene"),
+    ("libraries/bluetooth_services/mesh/scene_srv", "libraries/bluetooth/mesh/scene_srv"),
+    ("libraries/bluetooth_services/mesh/scene_cli", "libraries/bluetooth/mesh/scene_cli"),
+    ("libraries/bluetooth_services/mesh/scheduler", "libraries/bluetooth/mesh/scheduler"),
+    ("libraries/bluetooth_services/mesh/scheduler_srv", "libraries/bluetooth/mesh/scheduler_srv"),
+    ("libraries/bluetooth_services/mesh/scheduler_cli", "libraries/bluetooth/mesh/scheduler_cli"),
+    ("libraries/bluetooth_services/mesh/vnd/silvair_enocean_srv", "libraries/bluetooth/mesh/vnd/silvair_enocean_srv"),
+    ("libraries/bluetooth_services/mesh/vnd/dm", "libraries/bluetooth/mesh/vnd/dm"),
+    ("libraries/bluetooth_services/mesh/vnd/dm_srv", "libraries/bluetooth/mesh/vnd/dm_srv"),
+    ("libraries/bluetooth_services/mesh/vnd/dm_cli", "libraries/bluetooth/mesh/vnd/dm_cli"),
+    ("libraries/bluetooth_services/mesh/vnd/le_pair_resp", "libraries/bluetooth/mesh/vnd/le_pair_resp"),
+    ("libraries/bluetooth_services/mesh/models", "libraries/bluetooth/mesh/models"),
+    ("libraries/bluetooth_services/mesh/properties", "libraries/bluetooth/mesh/properties"),
+    ("libraries/bluetooth_services/mesh/dk_prov", "libraries/bluetooth/mesh/dk_prov"),
+    ("libraries/bluetooth_services/mesh/sensor", "libraries/bluetooth/mesh/sensor"),
+    ("libraries/bluetooth_services/mesh/sensor_types", "libraries/bluetooth/mesh/sensor_types"),
+    ("libraries/bluetooth_services/radio_notification_conn_cb", "libraries/bluetooth/radio_notification_conn_cb"),
+    ("libraries/bluetooth_services/rpc", "libraries/bluetooth/rpc"),
+    ("libraries/bluetooth_services/scan", "libraries/bluetooth/scan"),
+    ("libraries/bluetooth_services/services/ams_client", "libraries/bluetooth/services/ams_client"),
+    ("libraries/bluetooth_services/services/ancs_client", "libraries/bluetooth/services/ancs_client"),
+    ("libraries/bluetooth_services/services/bas_client", "libraries/bluetooth/services/bas_client"),
+    ("libraries/bluetooth_services/services/bms", "libraries/bluetooth/services/bms"),
+    ("libraries/bluetooth_services/services/cgms", "libraries/bluetooth/services/cgms"),
+    ("libraries/bluetooth_services/services/cts_client", "libraries/bluetooth/services/cts_client"),
+    ("libraries/bluetooth_services/services/ddfs", "libraries/bluetooth/services/ddfs"),
+    ("libraries/bluetooth_services/services/dfu_smp", "libraries/bluetooth/services/dfu_smp"),
+    ("libraries/bluetooth_services/services/fast_pair", "libraries/bluetooth/services/fast_pair"),
+    ("libraries/bluetooth_services/services/gattp", "libraries/bluetooth/services/gattp"),
+    ("libraries/bluetooth_services/services/hids", "libraries/bluetooth/services/hids"),
+    ("libraries/bluetooth_services/services/hogp", "libraries/bluetooth/services/hogp"),
+    ("libraries/bluetooth_services/services/hrs_client", "libraries/bluetooth/services/hrs_client"),
+    ("libraries/bluetooth_services/services/latency", "libraries/bluetooth/services/latency"),
+    ("libraries/bluetooth_services/services/latency_client", "libraries/bluetooth/services/latency_client"),
+    ("libraries/bluetooth_services/services/lbs", "libraries/bluetooth/services/lbs"),
+    ("libraries/bluetooth_services/services/mds", "libraries/bluetooth/services/mds"),
+    ("libraries/bluetooth_services/services/nsms", "libraries/bluetooth/services/nsms"),
+    ("libraries/bluetooth_services/services/nus", "libraries/bluetooth/services/nus"),
+    ("libraries/bluetooth_services/services/nus_client", "libraries/bluetooth/services/nus_client"),
+    ("libraries/bluetooth_services/services/rscs", "libraries/bluetooth/services/rscs"),
+    ("libraries/bluetooth_services/services/throughput", "libraries/bluetooth/services/throughput"),
+    ("libraries/bluetooth_services/services/wifi_prov", "libraries/bluetooth/services/wifi_prov"),
     ("libraries/networking/nrf_cloud_agps", "libraries/networking/nrf_cloud_agnss"), # nRF Cloud A-GNSS
     ("libraries/bootloader/index", "libraries/security/bootloader/index"), # Bootloader libraries (landing)
     ("libraries/bootloader/bl_crypto", "libraries/security/bootloader/bl_crypto"), # Bootloader crypto

diff --git a/doc/_zoomin/ncs.tags.yml b/doc/_zoomin/ncs.tags.yml
@@ -363,12 +363,12 @@ mapping_topics:
   - nrf/libraries/bin/lwm2m_carrier/*.html: ["nrf91-series", "nrf9161", "nrf9151", "nrf9160", "lte",
                                              "development-kits"]
   - nrf/libraries/bin/lwm2m_carrier/certification.html: ["certification"]
-  - nrf/libraries/bluetooth_services/*.html: ["ble", "nrf52-series", "nrf52840", "nrf52833",
-                                              "nrf52832", "nrf52820", "nrf52811", "nrf52810",
-                                              "nrf52805", "nrf54-series", "nrf54h20", "nrf54l15",
-                                              "nrf54l05", "nrf54l10", "development-kits"]
-  - nrf/libraries/bluetooth_services/mesh.html: ["blemesh"]
-  - nrf/libraries/bluetooth_services/mesh/*.html: ["blemesh"]
+  - nrf/libraries/bluetooth/*.html: ["ble", "nrf52-series", "nrf52840", "nrf52833", "nrf52832",
+                                     "nrf52820", "nrf52811", "nrf52810", "nrf52805", "nrf54-series",
+                                     "nrf54h20", "nrf54l15", "nrf54l05", "nrf54l10",
+                                     "development-kits"]
+  - nrf/libraries/bluetooth/mesh.html: ["blemesh"]
+  - nrf/libraries/bluetooth/mesh/*.html: ["blemesh"]
   - nrf/libraries/gazell/*.html: ["gazell"]
   - nrf/libraries/modem/*.html: ["lte", "nrf91-series", "nrf9160", "nrf9161", "nrf9151",
                                  "development-kits", "at-commands"]

diff --git a/...libraries/bluetooth_services/adv_prov.rst → doc/nrf/libraries/bluetooth/adv_prov.rst b/...libraries/bluetooth_services/adv_prov.rst → doc/nrf/libraries/bluetooth/adv_prov.rst
diff --git a/...libraries/bluetooth_services/conn_ctx.rst → doc/nrf/libraries/bluetooth/conn_ctx.rst b/...libraries/bluetooth_services/conn_ctx.rst → doc/nrf/libraries/bluetooth/conn_ctx.rst
diff --git a/.../libraries/bluetooth_services/enocean.rst → doc/nrf/libraries/bluetooth/enocean.rst b/.../libraries/bluetooth_services/enocean.rst → doc/nrf/libraries/bluetooth/enocean.rst
diff --git a/.../libraries/bluetooth_services/gatt_dm.rst → doc/nrf/libraries/bluetooth/gatt_dm.rst b/.../libraries/bluetooth_services/gatt_dm.rst → doc/nrf/libraries/bluetooth/gatt_dm.rst
diff --git a/...ibraries/bluetooth_services/gatt_pool.rst → doc/nrf/libraries/bluetooth/gatt_pool.rst b/...ibraries/bluetooth_services/gatt_pool.rst → doc/nrf/libraries/bluetooth/gatt_pool.rst
diff --git a/...s/bluetooth_services/images/ConnEvtCb.svg → .../libraries/bluetooth/images/ConnEvtCb.svg b/...s/bluetooth_services/images/ConnEvtCb.svg → .../libraries/bluetooth/images/ConnEvtCb.svg
diff --git a/...ces/images/ConnEvtCbPeripheralLatency.svg → ...oth/images/ConnEvtCbPeripheralLatency.svg b/...ces/images/ConnEvtCbPeripheralLatency.svg → ...oth/images/ConnEvtCbPeripheralLatency.svg
diff --git a/...rf/libraries/bluetooth_services/index.rst → doc/nrf/libraries/bluetooth/index.rst b/...rf/libraries/bluetooth_services/index.rst → doc/nrf/libraries/bluetooth/index.rst
diff --git a/...nrf/libraries/bluetooth_services/mesh.rst → doc/nrf/libraries/bluetooth/mesh.rst b/...nrf/libraries/bluetooth_services/mesh.rst → doc/nrf/libraries/bluetooth/mesh.rst
diff --git a/...aries/bluetooth_services/mesh/dk_prov.rst → doc/nrf/libraries/bluetooth/mesh/dk_prov.rst b/...aries/bluetooth_services/mesh/dk_prov.rst → doc/nrf/libraries/bluetooth/mesh/dk_prov.rst
diff --git a/...s/bluetooth_services/mesh/gen_battery.rst → .../libraries/bluetooth/mesh/gen_battery.rst b/...s/bluetooth_services/mesh/gen_battery.rst → .../libraries/bluetooth/mesh/gen_battery.rst
diff --git a/...uetooth_services/mesh/gen_battery_cli.rst → ...raries/bluetooth/mesh/gen_battery_cli.rst b/...uetooth_services/mesh/gen_battery_cli.rst → ...raries/bluetooth/mesh/gen_battery_cli.rst
diff --git a/...uetooth_services/mesh/gen_battery_srv.rst → ...raries/bluetooth/mesh/gen_battery_srv.rst b/...uetooth_services/mesh/gen_battery_srv.rst → ...raries/bluetooth/mesh/gen_battery_srv.rst
diff --git a/...aries/bluetooth_services/mesh/gen_dtt.rst → doc/nrf/libraries/bluetooth/mesh/gen_dtt.rst b/...aries/bluetooth_services/mesh/gen_dtt.rst → doc/nrf/libraries/bluetooth/mesh/gen_dtt.rst
diff --git a/...s/bluetooth_services/mesh/gen_dtt_cli.rst → .../libraries/bluetooth/mesh/gen_dtt_cli.rst b/...s/bluetooth_services/mesh/gen_dtt_cli.rst → .../libraries/bluetooth/mesh/gen_dtt_cli.rst
diff --git a/...s/bluetooth_services/mesh/gen_dtt_srv.rst → .../libraries/bluetooth/mesh/gen_dtt_srv.rst b/...s/bluetooth_services/mesh/gen_dtt_srv.rst → .../libraries/bluetooth/mesh/gen_dtt_srv.rst
diff --git a/...aries/bluetooth_services/mesh/gen_loc.rst → doc/nrf/libraries/bluetooth/mesh/gen_loc.rst b/...aries/bluetooth_services/mesh/gen_loc.rst → doc/nrf/libraries/bluetooth/mesh/gen_loc.rst
diff --git a/...s/bluetooth_services/mesh/gen_loc_cli.rst → .../libraries/bluetooth/mesh/gen_loc_cli.rst b/...s/bluetooth_services/mesh/gen_loc_cli.rst → .../libraries/bluetooth/mesh/gen_loc_cli.rst
diff --git a/...s/bluetooth_services/mesh/gen_loc_srv.rst → .../libraries/bluetooth/mesh/gen_loc_srv.rst b/...s/bluetooth_services/mesh/gen_loc_srv.rst → .../libraries/bluetooth/mesh/gen_loc_srv.rst
diff --git a/...aries/bluetooth_services/mesh/gen_lvl.rst → doc/nrf/libraries/bluetooth/mesh/gen_lvl.rst b/...aries/bluetooth_services/mesh/gen_lvl.rst → doc/nrf/libraries/bluetooth/mesh/gen_lvl.rst
diff --git a/...s/bluetooth_services/mesh/gen_lvl_cli.rst → .../libraries/bluetooth/mesh/gen_lvl_cli.rst b/...s/bluetooth_services/mesh/gen_lvl_cli.rst → .../libraries/bluetooth/mesh/gen_lvl_cli.rst
diff --git a/...s/bluetooth_services/mesh/gen_lvl_srv.rst → .../libraries/bluetooth/mesh/gen_lvl_srv.rst b/...s/bluetooth_services/mesh/gen_lvl_srv.rst → .../libraries/bluetooth/mesh/gen_lvl_srv.rst
diff --git a/...ies/bluetooth_services/mesh/gen_onoff.rst → ...rf/libraries/bluetooth/mesh/gen_onoff.rst b/...ies/bluetooth_services/mesh/gen_onoff.rst → ...rf/libraries/bluetooth/mesh/gen_onoff.rst
diff --git a/...bluetooth_services/mesh/gen_onoff_cli.rst → ...ibraries/bluetooth/mesh/gen_onoff_cli.rst b/...bluetooth_services/mesh/gen_onoff_cli.rst → ...ibraries/bluetooth/mesh/gen_onoff_cli.rst
diff --git a/...bluetooth_services/mesh/gen_onoff_srv.rst → ...ibraries/bluetooth/mesh/gen_onoff_srv.rst b/...bluetooth_services/mesh/gen_onoff_srv.rst → ...ibraries/bluetooth/mesh/gen_onoff_srv.rst
diff --git a/...ries/bluetooth_services/mesh/gen_plvl.rst → ...nrf/libraries/bluetooth/mesh/gen_plvl.rst b/...ries/bluetooth_services/mesh/gen_plvl.rst → ...nrf/libraries/bluetooth/mesh/gen_plvl.rst
diff --git a/.../bluetooth_services/mesh/gen_plvl_cli.rst → ...libraries/bluetooth/mesh/gen_plvl_cli.rst b/.../bluetooth_services/mesh/gen_plvl_cli.rst → ...libraries/bluetooth/mesh/gen_plvl_cli.rst
diff --git a/.../bluetooth_services/mesh/gen_plvl_srv.rst → ...libraries/bluetooth/mesh/gen_plvl_srv.rst b/.../bluetooth_services/mesh/gen_plvl_srv.rst → ...libraries/bluetooth/mesh/gen_plvl_srv.rst
diff --git a/...es/bluetooth_services/mesh/gen_ponoff.rst → ...f/libraries/bluetooth/mesh/gen_ponoff.rst b/...es/bluetooth_services/mesh/gen_ponoff.rst → ...f/libraries/bluetooth/mesh/gen_ponoff.rst
diff --git a/...luetooth_services/mesh/gen_ponoff_cli.rst → ...braries/bluetooth/mesh/gen_ponoff_cli.rst b/...luetooth_services/mesh/gen_ponoff_cli.rst → ...braries/bluetooth/mesh/gen_ponoff_cli.rst
diff --git a/...luetooth_services/mesh/gen_ponoff_srv.rst → ...braries/bluetooth/mesh/gen_ponoff_srv.rst b/...luetooth_services/mesh/gen_ponoff_srv.rst → ...braries/bluetooth/mesh/gen_ponoff_srv.rst
diff --git a/...ries/bluetooth_services/mesh/gen_prop.rst → ...nrf/libraries/bluetooth/mesh/gen_prop.rst b/...ries/bluetooth_services/mesh/gen_prop.rst → ...nrf/libraries/bluetooth/mesh/gen_prop.rst
diff --git a/.../bluetooth_services/mesh/gen_prop_cli.rst → ...libraries/bluetooth/mesh/gen_prop_cli.rst b/.../bluetooth_services/mesh/gen_prop_cli.rst → ...libraries/bluetooth/mesh/gen_prop_cli.rst
diff --git a/.../bluetooth_services/mesh/gen_prop_srv.rst → ...libraries/bluetooth/mesh/gen_prop_srv.rst b/.../bluetooth_services/mesh/gen_prop_srv.rst → ...libraries/bluetooth/mesh/gen_prop_srv.rst
diff --git a/doc/nrf/libraries/bluetooth/mesh/images/CIExy1931.png b/doc/nrf/libraries/bluetooth/mesh/images/CIExy1931.png
diff --git a/...images/bt_mesh_light_ctrl_composition.svg → ...images/bt_mesh_light_ctrl_composition.svg b/...images/bt_mesh_light_ctrl_composition.svg → ...images/bt_mesh_light_ctrl_composition.svg
diff --git a/...mesh/images/bt_mesh_light_ctrl_levels.svg → ...mesh/images/bt_mesh_light_ctrl_levels.svg b/...mesh/images/bt_mesh_light_ctrl_levels.svg → ...mesh/images/bt_mesh_light_ctrl_levels.svg
diff --git a/.../mesh/images/bt_mesh_light_ctrl_nodes.svg → .../mesh/images/bt_mesh_light_ctrl_nodes.svg b/.../mesh/images/bt_mesh_light_ctrl_nodes.svg → .../mesh/images/bt_mesh_light_ctrl_nodes.svg
diff --git a/...es/mesh/images/bt_mesh_light_ctrl_reg.svg → ...th/mesh/images/bt_mesh_light_ctrl_reg.svg b/...es/mesh/images/bt_mesh_light_ctrl_reg.svg → ...th/mesh/images/bt_mesh_light_ctrl_reg.svg
diff --git a/...mesh/images/bt_mesh_light_ctrl_states.svg → ...mesh/images/bt_mesh_light_ctrl_states.svg b/...mesh/images/bt_mesh_light_ctrl_states.svg → ...mesh/images/bt_mesh_light_ctrl_states.svg
diff --git a/...ies/bluetooth_services/mesh/light_ctl.rst → ...rf/libraries/bluetooth/mesh/light_ctl.rst b/...ies/bluetooth_services/mesh/light_ctl.rst → ...rf/libraries/bluetooth/mesh/light_ctl.rst
diff --git a/...bluetooth_services/mesh/light_ctl_cli.rst → ...ibraries/bluetooth/mesh/light_ctl_cli.rst b/...bluetooth_services/mesh/light_ctl_cli.rst → ...ibraries/bluetooth/mesh/light_ctl_cli.rst
diff --git a/...bluetooth_services/mesh/light_ctl_srv.rst → ...ibraries/bluetooth/mesh/light_ctl_srv.rst b/...bluetooth_services/mesh/light_ctl_srv.rst → ...ibraries/bluetooth/mesh/light_ctl_srv.rst
diff --git a/...es/bluetooth_services/mesh/light_ctrl.rst → ...f/libraries/bluetooth/mesh/light_ctrl.rst b/...es/bluetooth_services/mesh/light_ctrl.rst → ...f/libraries/bluetooth/mesh/light_ctrl.rst
diff --git a/...luetooth_services/mesh/light_ctrl_cli.rst → ...braries/bluetooth/mesh/light_ctrl_cli.rst b/...luetooth_services/mesh/light_ctrl_cli.rst → ...braries/bluetooth/mesh/light_ctrl_cli.rst
diff --git a/...luetooth_services/mesh/light_ctrl_reg.rst → ...braries/bluetooth/mesh/light_ctrl_reg.rst b/...luetooth_services/mesh/light_ctrl_reg.rst → ...braries/bluetooth/mesh/light_ctrl_reg.rst
diff --git a/...oth_services/mesh/light_ctrl_reg_spec.rst → ...es/bluetooth/mesh/light_ctrl_reg_spec.rst b/...oth_services/mesh/light_ctrl_reg_spec.rst → ...es/bluetooth/mesh/light_ctrl_reg_spec.rst
diff --git a/...luetooth_services/mesh/light_ctrl_srv.rst → ...braries/bluetooth/mesh/light_ctrl_srv.rst b/...luetooth_services/mesh/light_ctrl_srv.rst → ...braries/bluetooth/mesh/light_ctrl_srv.rst
diff --git a/...ies/bluetooth_services/mesh/light_hsl.rst → ...rf/libraries/bluetooth/mesh/light_hsl.rst b/...ies/bluetooth_services/mesh/light_hsl.rst → ...rf/libraries/bluetooth/mesh/light_hsl.rst
diff --git a/...bluetooth_services/mesh/light_hsl_cli.rst → ...ibraries/bluetooth/mesh/light_hsl_cli.rst b/...bluetooth_services/mesh/light_hsl_cli.rst → ...ibraries/bluetooth/mesh/light_hsl_cli.rst
diff --git a/...bluetooth_services/mesh/light_hsl_srv.rst → ...ibraries/bluetooth/mesh/light_hsl_srv.rst b/...bluetooth_services/mesh/light_hsl_srv.rst → ...ibraries/bluetooth/mesh/light_hsl_srv.rst
diff --git a/...bluetooth_services/mesh/light_hue_srv.rst → ...ibraries/bluetooth/mesh/light_hue_srv.rst b/...bluetooth_services/mesh/light_hue_srv.rst → ...ibraries/bluetooth/mesh/light_hue_srv.rst
diff --git a/...bluetooth_services/mesh/light_sat_srv.rst → ...ibraries/bluetooth/mesh/light_sat_srv.rst b/...bluetooth_services/mesh/light_sat_srv.rst → ...ibraries/bluetooth/mesh/light_sat_srv.rst
diff --git a/...luetooth_services/mesh/light_temp_srv.rst → ...braries/bluetooth/mesh/light_temp_srv.rst b/...luetooth_services/mesh/light_temp_srv.rst → ...braries/bluetooth/mesh/light_temp_srv.rst
diff --git a/...ies/bluetooth_services/mesh/light_xyl.rst → ...rf/libraries/bluetooth/mesh/light_xyl.rst b/...ies/bluetooth_services/mesh/light_xyl.rst → ...rf/libraries/bluetooth/mesh/light_xyl.rst
diff --git a/...bluetooth_services/mesh/light_xyl_cli.rst → ...ibraries/bluetooth/mesh/light_xyl_cli.rst b/...bluetooth_services/mesh/light_xyl_cli.rst → ...ibraries/bluetooth/mesh/light_xyl_cli.rst
diff --git a/...bluetooth_services/mesh/light_xyl_srv.rst → ...ibraries/bluetooth/mesh/light_xyl_srv.rst b/...bluetooth_services/mesh/light_xyl_srv.rst → ...ibraries/bluetooth/mesh/light_xyl_srv.rst
diff --git a/...ies/bluetooth_services/mesh/lightness.rst → ...rf/libraries/bluetooth/mesh/lightness.rst b/...ies/bluetooth_services/mesh/lightness.rst → ...rf/libraries/bluetooth/mesh/lightness.rst
diff --git a/...bluetooth_services/mesh/lightness_cli.rst → ...ibraries/bluetooth/mesh/lightness_cli.rst b/...bluetooth_services/mesh/lightness_cli.rst → ...ibraries/bluetooth/mesh/lightness_cli.rst
diff --git a/...bluetooth_services/mesh/lightness_srv.rst → ...ibraries/bluetooth/mesh/lightness_srv.rst b/...bluetooth_services/mesh/lightness_srv.rst → ...ibraries/bluetooth/mesh/lightness_srv.rst
diff --git a/...s/bluetooth_services/mesh/model_types.rst → .../libraries/bluetooth/mesh/model_types.rst b/...s/bluetooth_services/mesh/model_types.rst → .../libraries/bluetooth/mesh/model_types.rst
diff --git a/...raries/bluetooth_services/mesh/models.rst → doc/nrf/libraries/bluetooth/mesh/models.rst b/...raries/bluetooth_services/mesh/models.rst → doc/nrf/libraries/bluetooth/mesh/models.rst
diff --git a/...es/bluetooth_services/mesh/properties.rst → ...f/libraries/bluetooth/mesh/properties.rst b/...es/bluetooth_services/mesh/properties.rst → ...f/libraries/bluetooth/mesh/properties.rst
diff --git a/...braries/bluetooth_services/mesh/scene.rst → doc/nrf/libraries/bluetooth/mesh/scene.rst b/...braries/bluetooth_services/mesh/scene.rst → doc/nrf/libraries/bluetooth/mesh/scene.rst
diff --git a/...ies/bluetooth_services/mesh/scene_cli.rst → ...rf/libraries/bluetooth/mesh/scene_cli.rst b/...ies/bluetooth_services/mesh/scene_cli.rst → ...rf/libraries/bluetooth/mesh/scene_cli.rst
diff --git a/...ies/bluetooth_services/mesh/scene_srv.rst → ...rf/libraries/bluetooth/mesh/scene_srv.rst b/...ies/bluetooth_services/mesh/scene_srv.rst → ...rf/libraries/bluetooth/mesh/scene_srv.rst
diff --git a/...ies/bluetooth_services/mesh/scheduler.rst → ...rf/libraries/bluetooth/mesh/scheduler.rst b/...ies/bluetooth_services/mesh/scheduler.rst → ...rf/libraries/bluetooth/mesh/scheduler.rst
diff --git a/...bluetooth_services/mesh/scheduler_cli.rst → ...ibraries/bluetooth/mesh/scheduler_cli.rst b/...bluetooth_services/mesh/scheduler_cli.rst → ...ibraries/bluetooth/mesh/scheduler_cli.rst
diff --git a/...bluetooth_services/mesh/scheduler_srv.rst → ...ibraries/bluetooth/mesh/scheduler_srv.rst b/...bluetooth_services/mesh/scheduler_srv.rst → ...ibraries/bluetooth/mesh/scheduler_srv.rst
diff --git a/...raries/bluetooth_services/mesh/sensor.rst → doc/nrf/libraries/bluetooth/mesh/sensor.rst b/...raries/bluetooth_services/mesh/sensor.rst → doc/nrf/libraries/bluetooth/mesh/sensor.rst
diff --git a/...es/bluetooth_services/mesh/sensor_cli.rst → ...f/libraries/bluetooth/mesh/sensor_cli.rst b/...es/bluetooth_services/mesh/sensor_cli.rst → ...f/libraries/bluetooth/mesh/sensor_cli.rst
diff --git a/...bluetooth_services/mesh/sensor_models.rst → ...ibraries/bluetooth/mesh/sensor_models.rst b/...bluetooth_services/mesh/sensor_models.rst → ...ibraries/bluetooth/mesh/sensor_models.rst
diff --git a/...es/bluetooth_services/mesh/sensor_srv.rst → ...f/libraries/bluetooth/mesh/sensor_srv.rst b/...es/bluetooth_services/mesh/sensor_srv.rst → ...f/libraries/bluetooth/mesh/sensor_srv.rst
diff --git a/.../bluetooth_services/mesh/sensor_types.rst → ...libraries/bluetooth/mesh/sensor_types.rst b/.../bluetooth_services/mesh/sensor_types.rst → ...libraries/bluetooth/mesh/sensor_types.rst
diff --git a/...ibraries/bluetooth_services/mesh/time.rst → doc/nrf/libraries/bluetooth/mesh/time.rst b/...ibraries/bluetooth_services/mesh/time.rst → doc/nrf/libraries/bluetooth/mesh/time.rst
diff --git a/...ries/bluetooth_services/mesh/time_cli.rst → ...nrf/libraries/bluetooth/mesh/time_cli.rst b/...ries/bluetooth_services/mesh/time_cli.rst → ...nrf/libraries/bluetooth/mesh/time_cli.rst
diff --git a/...ries/bluetooth_services/mesh/time_srv.rst → ...nrf/libraries/bluetooth/mesh/time_srv.rst b/...ries/bluetooth_services/mesh/time_srv.rst → ...nrf/libraries/bluetooth/mesh/time_srv.rst
diff --git a/...ries/bluetooth_services/mesh/time_tai.rst → ...nrf/libraries/bluetooth/mesh/time_tai.rst b/...ries/bluetooth_services/mesh/time_tai.rst → ...nrf/libraries/bluetooth/mesh/time_tai.rst
diff --git a/...raries/bluetooth_services/mesh/vnd/dm.rst → doc/nrf/libraries/bluetooth/mesh/vnd/dm.rst b/...raries/bluetooth_services/mesh/vnd/dm.rst → doc/nrf/libraries/bluetooth/mesh/vnd/dm.rst
diff --git a/...es/bluetooth_services/mesh/vnd/dm_cli.rst → ...f/libraries/bluetooth/mesh/vnd/dm_cli.rst b/...es/bluetooth_services/mesh/vnd/dm_cli.rst → ...f/libraries/bluetooth/mesh/vnd/dm_cli.rst
diff --git a/...es/bluetooth_services/mesh/vnd/dm_srv.rst → ...f/libraries/bluetooth/mesh/vnd/dm_srv.rst b/...es/bluetooth_services/mesh/vnd/dm_srv.rst → ...f/libraries/bluetooth/mesh/vnd/dm_srv.rst
@@ -18,7 +18,7 @@ The results can be queried by a :ref:`bt_mesh_dm_cli_readme`.
 .. note::
    The current implementation is classified with :ref:`experimental <software_maturity>` software maturity.
 
-.. figure:: ../../../../../nrf/libraries/bluetooth_services/mesh/vnd/images/bt_mesh_dm_models.svg
+.. figure:: ../../../../../nrf/libraries/bluetooth/mesh/vnd/images/bt_mesh_dm_models.svg
    :alt: Sequence diagram for DM procedure
 
    Distance measurement procedure

diff --git a/...ces/mesh/vnd/images/bt_mesh_dm_models.svg → ...oth/mesh/vnd/images/bt_mesh_dm_models.svg b/...ces/mesh/vnd/images/bt_mesh_dm_models.svg → ...oth/mesh/vnd/images/bt_mesh_dm_models.svg
diff --git a/.../mesh/vnd/images/bt_mesh_le_pair_resp.svg → .../mesh/vnd/images/bt_mesh_le_pair_resp.svg b/.../mesh/vnd/images/bt_mesh_le_pair_resp.svg → .../mesh/vnd/images/bt_mesh_le_pair_resp.svg
diff --git a/...etooth_services/mesh/vnd/le_pair_resp.rst → ...aries/bluetooth/mesh/vnd/le_pair_resp.rst b/...etooth_services/mesh/vnd/le_pair_resp.rst → ...aries/bluetooth/mesh/vnd/le_pair_resp.rst
diff --git a/...services/mesh/vnd/silvair_enocean_srv.rst → ...luetooth/mesh/vnd/silvair_enocean_srv.rst b/...services/mesh/vnd/silvair_enocean_srv.rst → ...luetooth/mesh/vnd/silvair_enocean_srv.rst
diff --git a/...h_services/radio_notification_conn_cb.rst → .../bluetooth/radio_notification_conn_cb.rst b/...h_services/radio_notification_conn_cb.rst → .../bluetooth/radio_notification_conn_cb.rst
diff --git a/doc/nrf/libraries/bluetooth_services/rpc.rst → doc/nrf/libraries/bluetooth/rpc.rst b/doc/nrf/libraries/bluetooth_services/rpc.rst → doc/nrf/libraries/bluetooth/rpc.rst
diff --git a/...nrf/libraries/bluetooth_services/scan.rst → doc/nrf/libraries/bluetooth/scan.rst b/...nrf/libraries/bluetooth_services/scan.rst → doc/nrf/libraries/bluetooth/scan.rst
diff --git a/...luetooth_services/services/ams_client.rst → ...braries/bluetooth/services/ams_client.rst b/...luetooth_services/services/ams_client.rst → ...braries/bluetooth/services/ams_client.rst
diff --git a/...uetooth_services/services/ancs_client.rst → ...raries/bluetooth/services/ancs_client.rst b/...uetooth_services/services/ancs_client.rst → ...raries/bluetooth/services/ancs_client.rst
diff --git a/...luetooth_services/services/bas_client.rst → ...braries/bluetooth/services/bas_client.rst b/...luetooth_services/services/bas_client.rst → ...braries/bluetooth/services/bas_client.rst
diff --git a/...aries/bluetooth_services/services/bms.rst → doc/nrf/libraries/bluetooth/services/bms.rst b/...aries/bluetooth_services/services/bms.rst → doc/nrf/libraries/bluetooth/services/bms.rst
diff --git a/...ries/bluetooth_services/services/cgms.rst → ...nrf/libraries/bluetooth/services/cgms.rst b/...ries/bluetooth_services/services/cgms.rst → ...nrf/libraries/bluetooth/services/cgms.rst
diff --git a/...luetooth_services/services/cts_client.rst → ...braries/bluetooth/services/cts_client.rst b/...luetooth_services/services/cts_client.rst → ...braries/bluetooth/services/cts_client.rst
diff --git a/...ries/bluetooth_services/services/ddfs.rst → ...nrf/libraries/bluetooth/services/ddfs.rst b/...ries/bluetooth_services/services/ddfs.rst → ...nrf/libraries/bluetooth/services/ddfs.rst
diff --git a/...s/bluetooth_services/services/dfu_smp.rst → .../libraries/bluetooth/services/dfu_smp.rst b/...s/bluetooth_services/services/dfu_smp.rst → .../libraries/bluetooth/services/dfu_smp.rst
diff --git a/...bluetooth_services/services/fast_pair.rst → ...ibraries/bluetooth/services/fast_pair.rst b/...bluetooth_services/services/fast_pair.rst → ...ibraries/bluetooth/services/fast_pair.rst
diff --git a/...ies/bluetooth_services/services/gattp.rst → ...rf/libraries/bluetooth/services/gattp.rst b/...ies/bluetooth_services/services/gattp.rst → ...rf/libraries/bluetooth/services/gattp.rst
diff --git a/...ries/bluetooth_services/services/hids.rst → ...nrf/libraries/bluetooth/services/hids.rst b/...ries/bluetooth_services/services/hids.rst → ...nrf/libraries/bluetooth/services/hids.rst
diff --git a/...ries/bluetooth_services/services/hogp.rst → ...nrf/libraries/bluetooth/services/hogp.rst b/...ries/bluetooth_services/services/hogp.rst → ...nrf/libraries/bluetooth/services/hogp.rst
diff --git a/...luetooth_services/services/hrs_client.rst → ...braries/bluetooth/services/hrs_client.rst b/...luetooth_services/services/hrs_client.rst → ...braries/bluetooth/services/hrs_client.rst
diff --git a/...s/bluetooth_services/services/latency.rst → .../libraries/bluetooth/services/latency.rst b/...s/bluetooth_services/services/latency.rst → .../libraries/bluetooth/services/latency.rst
diff --git a/...ooth_services/services/latency_client.rst → ...ies/bluetooth/services/latency_client.rst b/...ooth_services/services/latency_client.rst → ...ies/bluetooth/services/latency_client.rst
diff --git a/...aries/bluetooth_services/services/lbs.rst → doc/nrf/libraries/bluetooth/services/lbs.rst b/...aries/bluetooth_services/services/lbs.rst → doc/nrf/libraries/bluetooth/services/lbs.rst
diff --git a/...aries/bluetooth_services/services/mds.rst → doc/nrf/libraries/bluetooth/services/mds.rst b/...aries/bluetooth_services/services/mds.rst → doc/nrf/libraries/bluetooth/services/mds.rst
diff --git a/...ries/bluetooth_services/services/nsms.rst → ...nrf/libraries/bluetooth/services/nsms.rst b/...ries/bluetooth_services/services/nsms.rst → ...nrf/libraries/bluetooth/services/nsms.rst
diff --git a/...aries/bluetooth_services/services/nus.rst → doc/nrf/libraries/bluetooth/services/nus.rst b/...aries/bluetooth_services/services/nus.rst → doc/nrf/libraries/bluetooth/services/nus.rst
diff --git a/...luetooth_services/services/nus_client.rst → ...braries/bluetooth/services/nus_client.rst b/...luetooth_services/services/nus_client.rst → ...braries/bluetooth/services/nus_client.rst
diff --git a/...ries/bluetooth_services/services/rscs.rst → ...nrf/libraries/bluetooth/services/rscs.rst b/...ries/bluetooth_services/services/rscs.rst → ...nrf/libraries/bluetooth/services/rscs.rst
diff --git a/...luetooth_services/services/throughput.rst → ...braries/bluetooth/services/throughput.rst b/...luetooth_services/services/throughput.rst → ...braries/bluetooth/services/throughput.rst
diff --git a/...bluetooth_services/services/wifi_prov.rst → ...ibraries/bluetooth/services/wifi_prov.rst b/...bluetooth_services/services/wifi_prov.rst → ...ibraries/bluetooth/services/wifi_prov.rst
diff --git a/doc/nrf/libraries/bluetooth_services/mesh/images/CIExy1931.png b/doc/nrf/libraries/bluetooth_services/mesh/images/CIExy1931.png