diff --git a/arch/arm/src/stm32/stm32_hciuart.c b/arch/arm/src/stm32/stm32_hciuart.c
index 485f2fb0c54..edf79145a4e 100644
--- a/arch/arm/src/stm32/stm32_hciuart.c
+++ b/arch/arm/src/stm32/stm32_hciuart.c
@@ -51,7 +51,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
-#include <nuttx/wireless/bt_uart.h>
+#include <nuttx/wireless/bluetooth/bt_uart.h>
 #include <nuttx/power/pm.h>
 
 #include "up_arch.h"
diff --git a/arch/arm/src/tiva/tiva_flash.c b/arch/arm/src/tiva/tiva_flash.c
index e95b5fc1792..ccfa5f0fc71 100644
--- a/arch/arm/src/tiva/tiva_flash.c
+++ b/arch/arm/src/tiva/tiva_flash.c
@@ -284,7 +284,7 @@ static ssize_t tiva_write(FAR struct mtd_dev_s *dev, off_t offset, size_t nbytes
             TIVA_FLASH_FCMISC);
 
   /* Adjust the offset to the start of the partition.
-   * REVISIT:  If we really wanted to gracefully handler unaligned addresses,
+   * REVISIT:  If we really wanted to gracefully handle unaligned addresses,
    * offsets, and sizes we would have to do a little more than this.
    */
 
diff --git a/configs/sim/src/sim_bringup.c b/configs/sim/src/sim_bringup.c
index 578207cdff2..d60f3aa8a2a 100644
--- a/configs/sim/src/sim_bringup.c
+++ b/configs/sim/src/sim_bringup.c
@@ -52,8 +52,8 @@
 #include <nuttx/video/fb.h>
 #include <nuttx/timers/oneshot.h>
 #include <nuttx/wireless/pktradio.h>
-#include <nuttx/wireless/bt_driver.h>
-#include <nuttx/wireless/bt_null.h>
+#include <nuttx/wireless/bluetooth/bt_driver.h>
+#include <nuttx/wireless/bluetooth/bt_null.h>
 #include <nuttx/wireless/ieee802154/ieee802154_loopback.h>
 
 #include "up_internal.h"
diff --git a/configs/stm32f4discovery/src/stm32_hciuart.c b/configs/stm32f4discovery/src/stm32_hciuart.c
index d6f5a2eee82..28a0f710f42 100644
--- a/configs/stm32f4discovery/src/stm32_hciuart.c
+++ b/configs/stm32f4discovery/src/stm32_hciuart.c
@@ -44,7 +44,7 @@
 #include <debug.h>
 #include <errno.h>
 
-#include <nuttx/wireless/bt_uart.h>
+#include <nuttx/wireless/bluetooth/bt_uart.h>
 
 #include "stm32_hciuart.h"
 #include "stm32f4discovery.h"
diff --git a/drivers/wireless/bluetooth/bt_null.c b/drivers/wireless/bluetooth/bt_null.c
index b3b4afc708f..9425b245cd1 100644
--- a/drivers/wireless/bluetooth/bt_null.c
+++ b/drivers/wireless/bluetooth/bt_null.c
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/wireless/bt_driver.h>
+#include <nuttx/wireless/bluetooth/bt_driver.h>
 
 #include <string.h>
 #include <assert.h>
@@ -46,8 +46,8 @@
 
 #include <nuttx/mm/iob.h>
 #include <nuttx/net/bluetooth.h>
-#include <nuttx/wireless/bt_hci.h>
-#include <nuttx/wireless/bt_null.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_null.h>
 
 /****************************************************************************
  * Private Function Prototypes
diff --git a/drivers/wireless/bluetooth/bt_uart.c b/drivers/wireless/bluetooth/bt_uart.c
index aecc91052dd..e6267ed9894 100644
--- a/drivers/wireless/bluetooth/bt_uart.c
+++ b/drivers/wireless/bluetooth/bt_uart.c
@@ -50,10 +50,10 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/wireless/bt_core.h>
-#include <nuttx/wireless/bt_hci.h>
-#include <nuttx/wireless/bt_driver.h>
-#include <nuttx/wireless/bt_uart.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_driver.h>
+#include <nuttx/wireless/bluetooth/bt_uart.h>
 
 #include "bt_uart.h"
 
diff --git a/drivers/wireless/bluetooth/bt_uart.h b/drivers/wireless/bluetooth/bt_uart.h
index e620714a4af..8f738ba362f 100644
--- a/drivers/wireless/bluetooth/bt_uart.h
+++ b/drivers/wireless/bluetooth/bt_uart.h
@@ -47,7 +47,7 @@
 
 #include <stdbool.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/wireless/bt_driver.h>
+#include <nuttx/wireless/bluetooth/bt_driver.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/drivers/wireless/bluetooth/bt_uart_generic.c b/drivers/wireless/bluetooth/bt_uart_generic.c
index e43d25450f5..b05ccab45de 100644
--- a/drivers/wireless/bluetooth/bt_uart_generic.c
+++ b/drivers/wireless/bluetooth/bt_uart_generic.c
@@ -44,15 +44,15 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/wireless/bt_uart.h>
+#include <nuttx/wireless/bluetooth/bt_uart.h>
 
 #if 0
 #include <stddef.h>
 #include <errno.h>
 
-#include <nuttx/wireless/bt_core.h>
-#include <nuttx/wireless/bt_hci.h>
-#include <nuttx/wireless/bt_driver.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_driver.h>
 #endif
 
 #include "bt_uart.h"
diff --git a/include/netpacket/bluetooth.h b/include/netpacket/bluetooth.h
index 69dac017d08..bc205b95f4f 100644
--- a/include/netpacket/bluetooth.h
+++ b/include/netpacket/bluetooth.h
@@ -43,7 +43,7 @@
 #include <sys/types.h>
 #include <stdint.h>
 
-#include <nuttx/wireless/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -265,7 +265,7 @@
  * Public Type Definitions
  ****************************************************************************/
 
-/* See include/nuttx/wireless/bt_hci.h for address definitions.  In
+/* See include/nuttx/wireless/bluetooth/bt_hci.h for address definitions.  In
  * particular, type bt_addr_t
  */
 
diff --git a/include/nuttx/net/bluetooth.h b/include/nuttx/net/bluetooth.h
index ebcd8c830cb..20ec48d03e6 100644
--- a/include/nuttx/net/bluetooth.h
+++ b/include/nuttx/net/bluetooth.h
@@ -40,7 +40,7 @@
  * Public Function Prototypes
  ****************************************************************************/
 
-#include <nuttx/wireless/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
 
 /****************************************************************************
  * Public Function Prototypes
diff --git a/include/nuttx/wireless/bt_buf.h b/include/nuttx/wireless/bluetooth/bt_buf.h
similarity index 97%
rename from include/nuttx/wireless/bt_buf.h
rename to include/nuttx/wireless/bluetooth/bt_buf.h
index 649bde8930a..d1db6fdc35b 100644
--- a/include/nuttx/wireless/bt_buf.h
+++ b/include/nuttx/wireless/bluetooth/bt_buf.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/wireless/bt_buf.h
+ * include/nuttx/wireless/bluetooth/bt_buf.h
  * Bluetooth buffer management.
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
@@ -39,8 +39,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_WIRELESS_BT_BUF_H
-#define __INCLUDE_NUTTX_WIRELESS_BT_BUF_H 1
+#ifndef __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_BUF_H
+#define __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_BUF_H 1
 
 /****************************************************************************
  * Included Files
@@ -321,4 +321,4 @@ size_t bt_buf_headroom(FAR struct bt_buf_s *buf);
 
 #define bt_buf_tail(buf) ((buf)->data + (buf)->len)
 
-#endif /* __INCLUDE_NUTTX_WIRELESS_BT_BUF_H */
+#endif /* __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_BUF_H */
diff --git a/include/nuttx/wireless/bt_core.h b/include/nuttx/wireless/bluetooth/bt_core.h
similarity index 96%
rename from include/nuttx/wireless/bt_core.h
rename to include/nuttx/wireless/bluetooth/bt_core.h
index 3c657a73c65..41318b720f0 100644
--- a/include/nuttx/wireless/bt_core.h
+++ b/include/nuttx/wireless/bluetooth/bt_core.h
@@ -39,8 +39,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_WIRELESS_BT_CORE_H
-#define __INCLUDE_NUTTX_WIRELESS_BT_CORE_H 1
+#ifndef __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_CORE_H
+#define __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_CORE_H 1
 
 /****************************************************************************
  * Included Files
@@ -49,8 +49,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <nuttx/wireless/bt_buf.h>
-#include <nuttx/wireless/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_buf.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -223,4 +223,4 @@ static inline int bt_addr_le_to_str(FAR const bt_addr_le_t *addr, char *str,
  * Public Function Prototypes
  ****************************************************************************/
 
-#endif /* __INCLUDE_NUTTX_WIRELESS_BT_CORE_H */
+#endif /* __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_CORE_H */
diff --git a/include/nuttx/wireless/bt_driver.h b/include/nuttx/wireless/bluetooth/bt_driver.h
similarity index 94%
rename from include/nuttx/wireless/bt_driver.h
rename to include/nuttx/wireless/bluetooth/bt_driver.h
index 1bbfed3f9e5..d354f61e2a5 100644
--- a/include/nuttx/wireless/bt_driver.h
+++ b/include/nuttx/wireless/bluetooth/bt_driver.h
@@ -39,14 +39,14 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_WIRELESS_BT_DRIVER_H
-#define __INCLUDE_NUTTX_WIRELESS_BT_DRIVER_H 1
+#ifndef __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_DRIVER_H
+#define __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_DRIVER_H 1
 
 /****************************************************************************
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/wireless/bt_buf.h>
+#include <nuttx/wireless/bluetooth/bt_buf.h>
 
 /****************************************************************************
  * Public Types
@@ -96,7 +96,7 @@ int bt_netdev_register(FAR const struct bt_driver_s *btdev);
  * Description:
  *   Called by the Bluetooth low-level driver when new data is received from
  *   the radio.  This may be called from the low-level driver and is part of
- *   the driver interface prototyped in include/nuttx/wireless/bt_driver.h
+ *   the driver interface prototyped in include/nuttx/wireless/bluetooth/bt_driver.h
  *
  * Input Parameters:
  *   buf - An instance of the buffer structure providing the received frame.
@@ -108,4 +108,4 @@ int bt_netdev_register(FAR const struct bt_driver_s *btdev);
 
 void bt_hci_receive(FAR struct bt_buf_s *buf);
 
-#endif /* __INCLUDE_NUTTX_WIRELESS_BT_DRIVER_H */
+#endif /* __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_DRIVER_H */
diff --git a/include/nuttx/wireless/bt_gatt.h b/include/nuttx/wireless/bluetooth/bt_gatt.h
similarity index 99%
rename from include/nuttx/wireless/bt_gatt.h
rename to include/nuttx/wireless/bluetooth/bt_gatt.h
index fa72b191c5e..cdaf3ecd10c 100644
--- a/include/nuttx/wireless/bt_gatt.h
+++ b/include/nuttx/wireless/bluetooth/bt_gatt.h
@@ -39,14 +39,14 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_WIRELESS_BT_GATT_H
-#define __INCLUDE_NUTTX_WIRELESS_BT_GATT_H 1
+#ifndef __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_GATT_H
+#define __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_GATT_H 1
 
 /****************************************************************************
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/wireless/bt_uuid.h>
+#include <nuttx/wireless/bluetooth/bt_uuid.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -1044,4 +1044,4 @@ int bt_gatt_read_multiple(FAR struct bt_conn_s *conn,
                           FAR const uint16_t *handles, size_t count,
                           bt_gatt_read_func_t func);
 
-#endif /* __INCLUDE_NUTTX_WIRELESS_BT_GATT_H */
+#endif /* __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_GATT_H */
diff --git a/include/nuttx/wireless/bt_hci.h b/include/nuttx/wireless/bluetooth/bt_hci.h
similarity index 98%
rename from include/nuttx/wireless/bt_hci.h
rename to include/nuttx/wireless/bluetooth/bt_hci.h
index ff2f807b9f6..d9a707e94d9 100644
--- a/include/nuttx/wireless/bt_hci.h
+++ b/include/nuttx/wireless/bluetooth/bt_hci.h
@@ -39,8 +39,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_WIRELESS_BT_HCI_H
-#define __INCLUDE_NUTTX_WIRELESS_BT_HCI_H 1
+#ifndef __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_HCI_H
+#define __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_HCI_H 1
 
 /****************************************************************************
  * Included Files
@@ -465,4 +465,4 @@ begin_packed_struct struct bt_hci_evt_le_ltk_request_s
   uint16_t ediv;
 } end_packed_struct;
 
-#endif /* __INCLUDE_NUTTX_WIRELESS_BT_HCI_H */
+#endif /* __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_HCI_H */
diff --git a/include/nuttx/wireless/bt_ioctl.h b/include/nuttx/wireless/bluetooth/bt_ioctl.h
similarity index 98%
rename from include/nuttx/wireless/bt_ioctl.h
rename to include/nuttx/wireless/bluetooth/bt_ioctl.h
index 060c66ef1c0..408435ccf05 100644
--- a/include/nuttx/wireless/bt_ioctl.h
+++ b/include/nuttx/wireless/bluetooth/bt_ioctl.h
@@ -39,8 +39,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_WIRELESS_BT_IOCTL_H
-#define __INCLUDE_NUTTX_WIRELESS_BT_IOCTL_H 1
+#ifndef __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_IOCTL_H
+#define __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_IOCTL_H 1
 
 /****************************************************************************
  * Included Files
@@ -49,9 +49,9 @@
 #include <net/if.h>
 
 #include <nuttx/wireless/wireless.h>
-#include <nuttx/wireless/bt_core.h>
-#include <nuttx/wireless/bt_hci.h>
-#include <nuttx/wireless/bt_gatt.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_gatt.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -503,4 +503,4 @@ struct btreq_s
  * Public Function Prototypes
  ****************************************************************************/
 
-#endif /* __INCLUDE_NUTTX_WIRELESS_BT_IOCTL_H */
+#endif /* __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_IOCTL_H */
diff --git a/include/nuttx/wireless/bt_null.h b/include/nuttx/wireless/bluetooth/bt_null.h
similarity index 93%
rename from include/nuttx/wireless/bt_null.h
rename to include/nuttx/wireless/bluetooth/bt_null.h
index 46820aa0825..41f6b2c8170 100644
--- a/include/nuttx/wireless/bt_null.h
+++ b/include/nuttx/wireless/bluetooth/bt_null.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_WIRELESS_BT_NULL_H
-#define __INCLUDE_NUTTX_WIRELESS_BT_NULL_H 1
+#ifndef __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_NULL_H
+#define __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_NULL_H 1
 
 /****************************************************************************
  * Public Function Prototypes
@@ -57,4 +57,4 @@
 
 int btnull_register(void);
 
-#endif /* __INCLUDE_NUTTX_WIRELESS_BT_NULL_H */
+#endif /* __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_NULL_H */
diff --git a/include/nuttx/wireless/bt_uart.h b/include/nuttx/wireless/bluetooth/bt_uart.h
similarity index 97%
rename from include/nuttx/wireless/bt_uart.h
rename to include/nuttx/wireless/bluetooth/bt_uart.h
index acf945b2214..944c7930e4b 100644
--- a/include/nuttx/wireless/bt_uart.h
+++ b/include/nuttx/wireless/bluetooth/bt_uart.h
@@ -39,8 +39,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_WIRELESS_BT_UART_H
-#define __INCLUDE_NUTTX_WIRELESS_BT_UART_H 1
+#ifndef __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_UART_H
+#define __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_UART_H 1
 
 /****************************************************************************
  * Included Files
@@ -155,4 +155,4 @@ struct btuart_lowerhalf_s
 
 int btuart_register(FAR const struct btuart_lowerhalf_s *lower);
 
-#endif /* __INCLUDE_NUTTX_WIRELESS_BT_UART_H */
+#endif /* __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_UART_H */
diff --git a/include/nuttx/wireless/bt_uuid.h b/include/nuttx/wireless/bluetooth/bt_uuid.h
similarity index 97%
rename from include/nuttx/wireless/bt_uuid.h
rename to include/nuttx/wireless/bluetooth/bt_uuid.h
index 2548ce9586a..7b956a8e937 100644
--- a/include/nuttx/wireless/bt_uuid.h
+++ b/include/nuttx/wireless/bluetooth/bt_uuid.h
@@ -39,8 +39,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_WIRELESS_BT_UUID_H
-#define __INCLUDE_NUTTX_WIRELESS_BT_UUID_H 1
+#ifndef __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_UUID_H
+#define __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_UUID_H 1
 
 /****************************************************************************
  * Included Files
@@ -217,4 +217,4 @@ struct bt_uuid_s
 int bt_uuid_cmp(FAR const struct bt_uuid_s *u1,
                 FAR const struct bt_uuid_s *u2);
 
-#endif /* __INCLUDE_NUTTX_WIRELESS_BT_UUID_H */
+#endif /* __INCLUDE_NUTTX_WIRELESS_BLUETOOTH_BT_UUID_H */
diff --git a/net/bluetooth/bluetooth.h b/net/bluetooth/bluetooth.h
index f08e3f18c9b..3e42a600c6f 100644
--- a/net/bluetooth/bluetooth.h
+++ b/net/bluetooth/bluetooth.h
@@ -45,7 +45,7 @@
 #include <sys/types.h>
 #include <queue.h>
 
-#include <nuttx/wireless/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
 
 #ifdef CONFIG_NET_BLUETOOTH
 
diff --git a/net/bluetooth/bluetooth_finddev.c b/net/bluetooth/bluetooth_finddev.c
index 6cb19448c8a..98b8b17902d 100644
--- a/net/bluetooth/bluetooth_finddev.c
+++ b/net/bluetooth/bluetooth_finddev.c
@@ -44,7 +44,7 @@
 #include <nuttx/net/net.h>
 #include <nuttx/net/radiodev.h>
 #include <nuttx/net/bluetooth.h>
-#include <nuttx/wireless/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
 
 #include "netdev/netdev.h"
 #include "bluetooth/bluetooth.h"
diff --git a/net/bluetooth/bluetooth_input.c b/net/bluetooth/bluetooth_input.c
index da0df50984a..ac3c7c66b1d 100644
--- a/net/bluetooth/bluetooth_input.c
+++ b/net/bluetooth/bluetooth_input.c
@@ -45,7 +45,7 @@
 #include <nuttx/mm/iob.h>
 #include <nuttx/net/radiodev.h>
 #include <nuttx/net/bluetooth.h>
-#include <nuttx/wireless/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
 
 #include "devif/devif.h"
 #include "bluetooth/bluetooth.h"
diff --git a/net/bluetooth/bluetooth_recvfrom.c b/net/bluetooth/bluetooth_recvfrom.c
index 94d0df2db1f..d7d8bbee6bc 100644
--- a/net/bluetooth/bluetooth_recvfrom.c
+++ b/net/bluetooth/bluetooth_recvfrom.c
@@ -56,7 +56,7 @@
 #include <nuttx/net/net.h>
 #include <nuttx/net/radiodev.h>
 #include <nuttx/net/bluetooth.h>
-#include <nuttx/wireless/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
 
 #include "netdev/netdev.h"
 #include "devif/devif.h"
diff --git a/net/bluetooth/bluetooth_sendto.c b/net/bluetooth/bluetooth_sendto.c
index 92cc0f783d1..32242aee9e5 100644
--- a/net/bluetooth/bluetooth_sendto.c
+++ b/net/bluetooth/bluetooth_sendto.c
@@ -59,7 +59,7 @@
 #include <nuttx/net/bluetooth.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/ip.h>
-#include <nuttx/wireless/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
 
 #include "netdev/netdev.h"
 #include "devif/devif.h"
diff --git a/net/bluetooth/bluetooth_sockif.c b/net/bluetooth/bluetooth_sockif.c
index 97a540f041b..087d2220ce9 100644
--- a/net/bluetooth/bluetooth_sockif.c
+++ b/net/bluetooth/bluetooth_sockif.c
@@ -53,7 +53,7 @@
 #include <nuttx/net/net.h>
 #include <nuttx/net/radiodev.h>
 #include <nuttx/net/bluetooth.h>
-#include <nuttx/wireless/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
 
 #include "bluetooth/bluetooth.h"
 
diff --git a/net/netdev/netdev_ioctl.c b/net/netdev/netdev_ioctl.c
index 64ac5ac7739..b4f39200bd8 100644
--- a/net/netdev/netdev_ioctl.c
+++ b/net/netdev/netdev_ioctl.c
@@ -73,7 +73,7 @@
 #endif
 
 #ifdef CONFIG_WIRELESS_BLUETOOTH
-#  include <nuttx/wireless/bt_ioctl.h>
+#  include <nuttx/wireless/bluetooth/bt_ioctl.h>
 #endif
 
 #ifdef CONFIG_WIRELESS_IEEE802154
diff --git a/wireless/bluetooth/bt_att.c b/wireless/bluetooth/bt_att.c
index c4a47a3e122..727ebd3087f 100644
--- a/wireless/bluetooth/bt_att.c
+++ b/wireless/bluetooth/bt_att.c
@@ -51,10 +51,10 @@
 #include <debug.h>
 
 #include <nuttx/net/bluetooth.h>
-#include <nuttx/wireless/bt_hci.h>
-#include <nuttx/wireless/bt_core.h>
-#include <nuttx/wireless/bt_uuid.h>
-#include <nuttx/wireless/bt_gatt.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_uuid.h>
+#include <nuttx/wireless/bluetooth/bt_gatt.h>
 
 #include "bt_hcicore.h"
 #include "bt_conn.h"
diff --git a/wireless/bluetooth/bt_buf.c b/wireless/bluetooth/bt_buf.c
index 4b52a0ae62c..a67b286aad3 100644
--- a/wireless/bluetooth/bt_buf.c
+++ b/wireless/bluetooth/bt_buf.c
@@ -54,9 +54,9 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/mm/iob.h>
 #include <nuttx/net/bluetooth.h>
-#include <nuttx/wireless/bt_hci.h>
-#include <nuttx/wireless/bt_core.h>
-#include <nuttx/wireless/bt_buf.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_buf.h>
 
 #include "bt_hcicore.h"
 
diff --git a/wireless/bluetooth/bt_conn.c b/wireless/bluetooth/bt_conn.c
index 41f4d4f385c..dc963a29262 100644
--- a/wireless/bluetooth/bt_conn.c
+++ b/wireless/bluetooth/bt_conn.c
@@ -54,8 +54,8 @@
 
 #include <nuttx/kthread.h>
 #include <nuttx/mm/iob.h>
-#include <nuttx/wireless/bt_hci.h>
-#include <nuttx/wireless/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
 
 #include "bt_atomic.h"
 #include "bt_queue.h"
diff --git a/wireless/bluetooth/bt_gatt.c b/wireless/bluetooth/bt_gatt.c
index 830a0da1ad6..1b50c5a5b5f 100644
--- a/wireless/bluetooth/bt_gatt.c
+++ b/wireless/bluetooth/bt_gatt.c
@@ -50,11 +50,11 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/wireless/bt_hci.h>
-#include <nuttx/wireless/bt_core.h>
-#include <nuttx/wireless/bt_buf.h>
-#include <nuttx/wireless/bt_uuid.h>
-#include <nuttx/wireless/bt_gatt.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_buf.h>
+#include <nuttx/wireless/bluetooth/bt_uuid.h>
+#include <nuttx/wireless/bluetooth/bt_gatt.h>
 
 #include "bt_hcicore.h"
 #include "bt_conn.h"
diff --git a/wireless/bluetooth/bt_hcicore.c b/wireless/bluetooth/bt_hcicore.c
index 7905c14a2e2..07d86ba6ccc 100644
--- a/wireless/bluetooth/bt_hcicore.c
+++ b/wireless/bluetooth/bt_hcicore.c
@@ -59,8 +59,8 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/bluetooth.h>
-#include <nuttx/wireless/bt_core.h>
-#include <nuttx/wireless/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
 
 #include "bt_queue.h"
 #include "bt_buf.h"
@@ -1407,7 +1407,7 @@ int bt_initialize(void)
  * Description:
  *   Register the Bluetooth low-level driver with the Bluetooth stack.
  *   This is called from the low-level driver and is part of the driver
- *   interface prototyped in include/nuttx/wireless/bt_driver.h
+ *   interface prototyped in include/nuttx/wireless/bluetooth/bt_driver.h
  *
  *   This function associates the Bluetooth driver with the Bluetooth stack.
  *
@@ -1441,7 +1441,7 @@ int bt_driver_register(FAR const struct bt_driver_s *btdev)
  *   Unregister a Bluetooth low-level driver previously registered with
  *   bt_driver_register.  This may be called from the low-level driver and
  *   is part of the driver interface prototyped in
- *   include/nuttx/wireless/bt_driver.h
+ *   include/nuttx/wireless/bluetooth/bt_driver.h
  *
  * Input Parameters:
  *   btdev - An instance of the low-level drivers interface structure.
@@ -1462,7 +1462,7 @@ void bt_driver_unregister(FAR const struct bt_driver_s *btdev)
  * Description:
  *   Called by the Bluetooth low-level driver when new data is received from
  *   the radio.  This may be called from the low-level driver and is part of
- *   the driver interface prototyped in include/nuttx/wireless/bt_driver.h
+ *   the driver interface prototyped in include/nuttx/wireless/bluetooth/bt_driver.h
  *
  *   NOTE:  This function will defer all real work to the low or to the high
  *   priority work queues.  Therefore, this function may safely be called
diff --git a/wireless/bluetooth/bt_hcicore.h b/wireless/bluetooth/bt_hcicore.h
index 7deeb8f0b3d..b4f8302db7c 100644
--- a/wireless/bluetooth/bt_hcicore.h
+++ b/wireless/bluetooth/bt_hcicore.h
@@ -52,7 +52,7 @@
 #include <semaphore.h>
 #include <mqueue.h>
 
-#include <nuttx/wireless/bt_driver.h>
+#include <nuttx/wireless/bluetooth/bt_driver.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -247,7 +247,7 @@ int bt_initialize(void);
  * Description:
  *   Register the Bluetooth low-level driver with the Bluetooth stack.
  *   This is called from the low-level driver and is part of the driver
- *   interface prototyped in include/nuttx/wireless/bt_driver.h
+ *   interface prototyped in include/nuttx/wireless/bluetooth/bt_driver.h
  *
  *   This function associates the Bluetooth driver with the Bluetooth stack.
  *
@@ -269,7 +269,7 @@ int bt_driver_register(FAR const struct bt_driver_s *btdev);
  *   Unregister a Bluetooth low-level driver previously registered with
  *   bt_driver_register.  This may be called from the low-level driver and
  *   is part of the driver interface prototyped in
- *   include/nuttx/wireless/bt_driver.h
+ *   include/nuttx/wireless/bluetooth/bt_driver.h
  *
  * Input Parameters:
  *   btdev - An instance of the low-level drivers interface structure.
diff --git a/wireless/bluetooth/bt_ioctl.c b/wireless/bluetooth/bt_ioctl.c
index 4a0b1afbb2e..2cba4fb0cc8 100644
--- a/wireless/bluetooth/bt_ioctl.c
+++ b/wireless/bluetooth/bt_ioctl.c
@@ -48,9 +48,9 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/bluetooth.h>
-#include <nuttx/wireless/bt_core.h>
-#include <nuttx/wireless/bt_hci.h>
-#include <nuttx/wireless/bt_ioctl.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_ioctl.h>
 
 #include "bt_hcicore.h"
 #include "bt_conn.h"
diff --git a/wireless/bluetooth/bt_keys.c b/wireless/bluetooth/bt_keys.c
index ecb5b4a0cb9..48a6dd5293f 100644
--- a/wireless/bluetooth/bt_keys.c
+++ b/wireless/bluetooth/bt_keys.c
@@ -48,8 +48,8 @@
 #include <string.h>
 #include <debug.h>
 
-#include <nuttx/wireless/bt_core.h>
-#include <nuttx/wireless/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
 
 #include "bt_hcicore.h"
 #include "bt_smp.h"
diff --git a/wireless/bluetooth/bt_l2cap.c b/wireless/bluetooth/bt_l2cap.c
index c296171a806..2fd03d74d96 100644
--- a/wireless/bluetooth/bt_l2cap.c
+++ b/wireless/bluetooth/bt_l2cap.c
@@ -49,8 +49,8 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/wireless/bt_hci.h>
-#include <nuttx/wireless/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
 
 #include "bt_hcicore.h"
 #include "bt_conn.h"
diff --git a/wireless/bluetooth/bt_netdev.c b/wireless/bluetooth/bt_netdev.c
index 5557ea7e912..d9a1e031bc3 100644
--- a/wireless/bluetooth/bt_netdev.c
+++ b/wireless/bluetooth/bt_netdev.c
@@ -62,7 +62,7 @@
 #include <nuttx/net/radiodev.h>
 #include <nuttx/net/bluetooth.h>
 #include <nuttx/net/sixlowpan.h>
-#include <nuttx/wireless/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
 
 #include "bt_hcicore.h"
 #include "bt_l2cap.h"
diff --git a/wireless/bluetooth/bt_queue.c b/wireless/bluetooth/bt_queue.c
index 48eecc525ed..9abcd7a7b1d 100644
--- a/wireless/bluetooth/bt_queue.c
+++ b/wireless/bluetooth/bt_queue.c
@@ -47,7 +47,7 @@
 
 #include <nuttx/mqueue.h>
 #include <nuttx/mm/iob.h>
-#include <nuttx/wireless/bt_buf.h>
+#include <nuttx/wireless/bluetooth/bt_buf.h>
 
 #include "bt_queue.h"
 
diff --git a/wireless/bluetooth/bt_smp.c b/wireless/bluetooth/bt_smp.c
index 2882526f6a0..6eeed94b823 100644
--- a/wireless/bluetooth/bt_smp.c
+++ b/wireless/bluetooth/bt_smp.c
@@ -49,8 +49,8 @@
 #include <errno.h>
 #include <string.h>
 
-#include <nuttx/wireless/bt_hci.h>
-#include <nuttx/wireless/bt_core.h>
+#include <nuttx/wireless/bluetooth/bt_hci.h>
+#include <nuttx/wireless/bluetooth/bt_core.h>
 
 #include "bt_atomic.h"
 #include "bt_hcicore.h"
diff --git a/wireless/bluetooth/bt_uuid.c b/wireless/bluetooth/bt_uuid.c
index 97a84061a99..6144d33aec6 100644
--- a/wireless/bluetooth/bt_uuid.c
+++ b/wireless/bluetooth/bt_uuid.c
@@ -48,7 +48,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <nuttx/wireless/bt_uuid.h>
+#include <nuttx/wireless/bluetooth/bt_uuid.h>
 
 /****************************************************************************
  * Private Data