diff --git a/boards/nucleo-common/include/arduino_pinmap.h b/boards/nucleo-common/include/arduino_pinmap.h
index 617850eb2b062cf865a587b20db0d30bf372ccd4..16b62106327235c5d9d5610d1b5f36068ee4d959 100644
--- a/boards/nucleo-common/include/arduino_pinmap.h
+++ b/boards/nucleo-common/include/arduino_pinmap.h
@@ -7,7 +7,7 @@
  */
 
 /**
- * @ingroup     boards_arduino-zero
+ * @ingroup     boards_nucleo-common
  * @{
  *
  * @file
diff --git a/boards/nucleo-common/include/board_common.h b/boards/nucleo-common/include/board_common.h
index 0aca63d094349ce4aec56479471197edfdd79b8f..c39aed56f7cc16f72748769232b20c15806d0e3d 100644
--- a/boards/nucleo-common/include/board_common.h
+++ b/boards/nucleo-common/include/board_common.h
@@ -8,7 +8,7 @@
 
 /**
  * @defgroup    boards_nucleo_common STM Nucleo Common
- * @ingroup     drivers_periph
+ * @ingroup     boards
  * @brief       Common files for STM Nucleo boards
  * @{
  *
diff --git a/drivers/doc.txt b/drivers/doc.txt
index 2962185bbbdd2ebe085317e9cffb721f2b1ddbbb..23e16eb169ee330c070a11bcc109c028c52a0990 100644
--- a/drivers/doc.txt
+++ b/drivers/doc.txt
@@ -37,3 +37,9 @@
  * The group of actuators includes all kind of devices that can actively
  * interact with the physical world, as e.g. motors, lights, sound devices, etc.
  */
+
+/**
+ * @defgroup    drivers_storage Storage Device Drivers
+ * @ingroup     drivers
+ * @brief       Drivers for storage devices
+ */
diff --git a/drivers/include/diskio.h b/drivers/include/diskio.h
index 35e9e277643f3595e412ec99a19b7e165ae8ca72..1e4581566379ac653df53476a248a80b9ea3033b 100644
--- a/drivers/include/diskio.h
+++ b/drivers/include/diskio.h
@@ -9,7 +9,7 @@
 
 /**
  * @defgroup    drivers_diskio Disk IO Driver
- * @ingroup     drivers
+ * @ingroup     drivers_storage
  * @brief       Low level disk interface
  *
  * The connection between the MCU and the SRF08 is based on the i2c-interface.
diff --git a/drivers/include/enc28j60.h b/drivers/include/enc28j60.h
index 87b61a03faf9adbff53bddef4326e972ee62c2d4..694e4720f71de003a7a32fac4e9a5431787a4d32 100644
--- a/drivers/include/enc28j60.h
+++ b/drivers/include/enc28j60.h
@@ -8,7 +8,7 @@
 
 /**
  * @defgroup    driver_enc28j60 ENC28J60
- * @ingroup     drivers
+ * @ingroup     drivers_netdev
  * @brief       Driver for the ENC28J60 Ethernet Adapter
  * @{
  *
diff --git a/drivers/include/flashrom.h b/drivers/include/flashrom.h
index d6ccafb862bc4c56984e90ab81013b92dc4b1634..2620319decd0c7eb1b2710521725b5b1ed08f732 100644
--- a/drivers/include/flashrom.h
+++ b/drivers/include/flashrom.h
@@ -8,14 +8,19 @@
 
 /**
  * @defgroup    drivers_flashrom Flash memory driver
- * @ingroup     drivers
+ * @ingroup     drivers_periph
  * @brief       Generic flash memory driver
+ *
+ * @note        This interface is deprecated, use `periph/flaspage` instead
+ *
  * @{
  *
  * @file
  *
+ *
  * @brief       Generic flash memory driver
  * @author      unknown
+ *
  */
 
 #ifndef FLASHROM_H
diff --git a/drivers/include/gpioint.h b/drivers/include/gpioint.h
index 0faa924120d229f959a63f49c9cada86d9a7e36e..72c72af4fd8085ce32d575e7a7e3ed48c79db599 100644
--- a/drivers/include/gpioint.h
+++ b/drivers/include/gpioint.h
@@ -8,11 +8,13 @@
 
 /**
  * @defgroup    drivers_gpioint GPIO IRQ Multiplexer
- * @ingroup     drivers
+ * @ingroup     drivers_periph
  * @brief       Provides an API to implement interrupt handlers on IO pins.
  *
  * Multiplexer and interrupt handling must be implemented platform specific.
  *
+ * @note        This interface is deprecated, use `periph/gpio.h` instead
+ *
  * @{
  *
  * @file
diff --git a/drivers/include/lpd8808.h b/drivers/include/lpd8808.h
index 7cabdfa3cade74ca8b71db8a04b43504d1fce333..63eb98aaecca4fb0a2f944a5077a4a4dde35acbf 100644
--- a/drivers/include/lpd8808.h
+++ b/drivers/include/lpd8808.h
@@ -8,7 +8,7 @@
 
 /**
  * @defgroup    drivers_lpd8808 LPD8808 based LED Strip
- * @ingroup     drivers
+ * @ingroup     drivers_actuators
  * @brief       Driver for LPD8808 based LED strips
  *
  * LPD8808 based LED strips consist of a number of LEDs driven by LPD8808 chips.
diff --git a/drivers/include/nvram.h b/drivers/include/nvram.h
index 2ad3d9f13527d15fb8066ce174a6b8811b0e3bc5..6bc79feff6d045e874a5b225f5df15c5e8d918e9 100644
--- a/drivers/include/nvram.h
+++ b/drivers/include/nvram.h
@@ -8,7 +8,7 @@
 
 /**
  * @defgroup    drivers_nvram Non-volatile RAM
- * @ingroup     drivers
+ * @ingroup     drivers_storage
  * @brief       Non-volatile RAM interface
  *
  * This API is designed around non-volatile memories which do not need blockwise
diff --git a/drivers/include/pn532.h b/drivers/include/pn532.h
index 73dc57dec262fdef148729d88d2427388a692b6b..47072ba47e6c35c18cce9f1f5c92792d6240676d 100644
--- a/drivers/include/pn532.h
+++ b/drivers/include/pn532.h
@@ -7,13 +7,15 @@
  */
 
 /**
- * @defgroup  drivers_pn532 PN532 NFC Reader
- * @ingroup drivers
+ * @defgroup    drivers_pn532 PN532 NFC Reader
+ * @ingroup     drivers_netdev
+ * @brief       PN532 NFC radio device driver
  *
  * @{
  * @file
- * @brief   PN532 driver
- * @author  Víctor Ariño <victor.arino@triagnosys.com>
+ * @brief       PN532 driver
+ *
+ * @author      Víctor Ariño <victor.arino@triagnosys.com>
  */
 
 #ifndef NFC_READER_INCLUDE_PN532_H
diff --git a/drivers/include/sdcard_spi.h b/drivers/include/sdcard_spi.h
index 0d19a56d1bd0c1099b1624000c5a7833cea12401..c2ed3d3dde38a3449c75a179329592eb088b3655 100644
--- a/drivers/include/sdcard_spi.h
+++ b/drivers/include/sdcard_spi.h
@@ -8,7 +8,7 @@
 
 /**
  * @defgroup    drivers_sdcard_spi SPI SD-Card driver
- * @ingroup     drivers
+ * @ingroup     drivers_storage
  * @brief       Driver for reading and writing sd-cards via spi interface.
  * @{
  *