diff --git a/arch/arm/src/stm32f7/chip.h b/arch/arm/src/stm32f7/chip.h
index 4893f4a6447..192f9d70be6 100644
--- a/arch/arm/src/stm32f7/chip.h
+++ b/arch/arm/src/stm32f7/chip.h
@@ -48,8 +48,8 @@
 
 #include <arch/irq.h>
 #include <arch/stm32f7/chip.h>
-#include "chip/stm32_pinmap.h"
-#include "chip/stm32_memorymap.h"
+#include "hardware/stm32_pinmap.h"
+#include "hardware/stm32_memorymap.h"
 
 /* If the common ARMv7-M vector handling logic is used, then it expects the
  * following definition in this file that provides the number of supported external
diff --git a/arch/arm/src/stm32f7/chip/stm32_adc.h b/arch/arm/src/stm32f7/hardware/stm32_adc.h
similarity index 89%
rename from arch/arm/src/stm32f7/chip/stm32_adc.h
rename to arch/arm/src/stm32f7/hardware/stm32_adc.h
index 9bf8e1940f1..68e7982501c 100644
--- a/arch/arm/src/stm32f7/chip/stm32_adc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_adc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_adc.h
+ * arch/arm/src/stm32f7/hardware/stm32_adc.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_ADC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_ADC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_ADC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_ADC_H
 
 /****************************************************************************************************
  * Included Files
@@ -45,12 +45,12 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_adc.h"
+#  include "hardware/stm32f72xx73xx_adc.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) || \
     defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f74xx77xx_adc.h"
+#  include "hardware/stm32f74xx77xx_adc.h"
 #else
 #  error "Unsupported STM32 F7 sub family"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_ADC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_ADC_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_can.h b/arch/arm/src/stm32f7/hardware/stm32_can.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32_can.h
rename to arch/arm/src/stm32f7/hardware/stm32_can.h
index 97b298f2fe1..6cd945d04bb 100644
--- a/arch/arm/src/stm32f7/chip/stm32_can.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_can.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32/chip/stm32_can.h
+ * arch/arm/src/stm32f7/hardware/stm32_can.h
  *
  *   Copyright (C) 2009, 2011, 2013, 2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F7_CAN_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32F7_CAN_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_CAN_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_CAN_H
 
 /************************************************************************************
  * Included Files
@@ -531,4 +531,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32_CAN_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_CAN_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_dbgmcu.h b/arch/arm/src/stm32f7/hardware/stm32_dbgmcu.h
similarity index 86%
rename from arch/arm/src/stm32f7/chip/stm32_dbgmcu.h
rename to arch/arm/src/stm32f7/hardware/stm32_dbgmcu.h
index 4f4d348baf7..4c2720b7ad9 100644
--- a/arch/arm/src/stm32f7/chip/stm32_dbgmcu.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_dbgmcu.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_dbgmcu.h
+ * arch/arm/src/stm32f7/hardware/stm32_dbgmcu.h
  *
  *   Copyright (C) 2016, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DBGMCU_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DBGMCU_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DBGMCU_H
 
 /****************************************************************************
  * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_dbgmcu.h"
+#  include "hardware/stm32f72xx73xx_dbgmcu.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_dbgmcu.h"
+#  include "hardware/stm32f74xx75xx_dbgmcu.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_dbgmcu.h"
+#  include "hardware/stm32f76xx77xx_dbgmcu.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DBGMCU_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DBGMCU_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_dma.h b/arch/arm/src/stm32f7/hardware/stm32_dma.h
similarity index 87%
rename from arch/arm/src/stm32f7/chip/stm32_dma.h
rename to arch/arm/src/stm32f7/hardware/stm32_dma.h
index 2b9bcfeffd7..a2f54cdbe67 100644
--- a/arch/arm/src/stm32f7/chip/stm32_dma.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_dma.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_dma.h
+ * arch/arm/src/stm32f7/hardware/stm32_dma.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DMA_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DMA_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DMA_H
 
 /************************************************************************************
  * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_dma.h"
+#  include "hardware/stm32f72xx73xx_dma.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_dma.h"
+#  include "hardware/stm32f74xx75xx_dma.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_dma.h"
+#  include "hardware/stm32f76xx77xx_dma.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DMA_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_dma2d.h b/arch/arm/src/stm32f7/hardware/stm32_dma2d.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32_dma2d.h
rename to arch/arm/src/stm32f7/hardware/stm32_dma2d.h
index 69d3a86d94a..b7244ca6084 100644
--- a/arch/arm/src/stm32f7/chip/stm32_dma2d.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_dma2d.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_dma2d.h
+ * arch/arm/src/stm32f7/hardware/stm32_dma2d.h
  *
  *   Copyright (C) 2014-2015 Marco Krahl. All rights reserved.
  *   Author: Marco Krahl <ocram.lhark@gmail.com>
@@ -33,15 +33,15 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DMA2D_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DMA2D_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DMA2D_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DMA2D_H
 
 /****************************************************************************
  * Included Files
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/stm32_memorymap.h"
+#include "hardware/stm32_memorymap.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -247,4 +247,4 @@
  * Public Types
  ****************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DMA2D_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_DMA2D_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_ethernet.h b/arch/arm/src/stm32f7/hardware/stm32_ethernet.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32_ethernet.h
rename to arch/arm/src/stm32f7/hardware/stm32_ethernet.h
index dfb3a34745c..f8133be7bce 100644
--- a/arch/arm/src/stm32f7/chip/stm32_ethernet.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_ethernet.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_ethernet.h
+ * arch/arm/src/stm32f7/hardware/stm32_ethernet.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_ETHERNET_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_ETHERNET_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_ETHERNET_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_ETHERNET_H
 
 /****************************************************************************************************
  * Included Files
@@ -808,5 +808,5 @@ struct eth_rxdesc_s
 
 #endif /* __ASSEMBLY__ */
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX || CONFIG_STM32F7_STM32F76XX || CONFIG_STM32F7_STM32F77XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_ETHERNET_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_ETHERNET_H */
 
diff --git a/arch/arm/src/stm32f7/chip/stm32_exti.h b/arch/arm/src/stm32f7/hardware/stm32_exti.h
similarity index 96%
rename from arch/arm/src/stm32f7/chip/stm32_exti.h
rename to arch/arm/src/stm32f7/hardware/stm32_exti.h
index e7de6b6953e..6b184228eb4 100644
--- a/arch/arm/src/stm32f7/chip/stm32_exti.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_exti.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_exti.h
+ * arch/arm/src/stm32f7/hardware/stm32_exti.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_EXTI_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_EXTI_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_EXTI_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_EXTI_H
 
 /************************************************************************************
  * Included Files
@@ -132,4 +132,4 @@
 #define EXTI_PR_MASK             STM32_EXTI_MASK
 
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX || CONFIG_STM32F7_STM32F76XX || CONFIG_STM32F7_STM32F77XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_EXTI_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_EXTI_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_flash.h b/arch/arm/src/stm32f7/hardware/stm32_flash.h
similarity index 87%
rename from arch/arm/src/stm32f7/chip/stm32_flash.h
rename to arch/arm/src/stm32f7/hardware/stm32_flash.h
index 91554fe44b3..0081c43773a 100644
--- a/arch/arm/src/stm32f7/chip/stm32_flash.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_flash.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_flash.h
+ * arch/arm/src/stm32f7/hardware/stm32_flash.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_FLASH_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_FLASH_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_FLASH_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_FLASH_H
 
 /************************************************************************************
  * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_flash.h"
+#  include "hardware/stm32f72xx73xx_flash.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_flash.h"
+#  include "hardware/stm32f74xx75xx_flash.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_flash.h"
+#  include "hardware/stm32f76xx77xx_flash.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_FLASH_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_FLASH_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_gpio.h b/arch/arm/src/stm32f7/hardware/stm32_gpio.h
similarity index 87%
rename from arch/arm/src/stm32f7/chip/stm32_gpio.h
rename to arch/arm/src/stm32f7/hardware/stm32_gpio.h
index 1d6478e59e4..db3a5926863 100644
--- a/arch/arm/src/stm32f7/chip/stm32_gpio.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_gpio.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_gpio.h
+ * arch/arm/src/stm32f7/hardware/stm32_gpio.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_GPIO_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_GPIO_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_GPIO_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_GPIO_H
 
 /************************************************************************************
  * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_gpio.h"
+#  include "hardware/stm32f72xx73xx_gpio.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_gpio.h"
+#  include "hardware/stm32f74xx75xx_gpio.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_gpio.h"
+#  include "hardware/stm32f76xx77xx_gpio.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_GPIO_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_GPIO_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_i2c.h b/arch/arm/src/stm32f7/hardware/stm32_i2c.h
similarity index 90%
rename from arch/arm/src/stm32f7/chip/stm32_i2c.h
rename to arch/arm/src/stm32f7/hardware/stm32_i2c.h
index b1c295c196a..52eb1d2550f 100644
--- a/arch/arm/src/stm32f7/chip/stm32_i2c.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_i2c.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_i2c.h
+ * arch/arm/src/stm32f7/hardware/stm32_i2c.h
  *
  *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_I2C_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_I2C_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_I2C_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_I2C_H
 
 /************************************************************************************
  * Included Files
@@ -48,9 +48,9 @@
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX) || \
     defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) || \
     defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f74xx77xx_i2c.h"
+#  include "hardware/stm32f74xx77xx_i2c.h"
 #else
 #  error "Unsupported STM32 F7 sub family"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_I2C_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_I2C_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_ltdc.h b/arch/arm/src/stm32f7/hardware/stm32_ltdc.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32_ltdc.h
rename to arch/arm/src/stm32f7/hardware/stm32_ltdc.h
index 1bac6074874..c26cf68103c 100644
--- a/arch/arm/src/stm32f7/chip/stm32_ltdc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_ltdc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_ltdc.h
+ * arch/arm/src/stm32f7/hardware/stm32_ltdc.h
  *
  *   Copyright (C) 2013 Ken Pettit. All rights reserved.
  *   Author: Ken Pettit <pettitkd@gmail.com>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_LTDC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_LTDC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_LTDC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_LTDC_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/stm32_memorymap.h"
+#include "hardware/stm32_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -378,4 +378,4 @@
  * Public Types
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_LTDC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_LTDC_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_memorymap.h b/arch/arm/src/stm32f7/hardware/stm32_memorymap.h
similarity index 86%
rename from arch/arm/src/stm32f7/chip/stm32_memorymap.h
rename to arch/arm/src/stm32f7/hardware/stm32_memorymap.h
index 591c482a5dd..6c8a138884f 100644
--- a/arch/arm/src/stm32f7/chip/stm32_memorymap.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_memorymap.h
+ * arch/arm/src/stm32f7/hardware/stm32_memorymap.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_memorymap.h"
+#  include "hardware/stm32f72xx73xx_memorymap.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_memorymap.h"
+#  include "hardware/stm32f74xx75xx_memorymap.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_memorymap.h"
+#  include "hardware/stm32f76xx77xx_memorymap.h"
 #else
 #  error "Unsupported STM32 F7 memory map"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_MEMORYMAP_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_otg.h b/arch/arm/src/stm32f7/hardware/stm32_otg.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32_otg.h
rename to arch/arm/src/stm32f7/hardware/stm32_otg.h
index 5834cfb4fea..c7a077dba59 100644
--- a/arch/arm/src/stm32f7/chip/stm32_otg.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_otg.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f_otg.h
+ * arch/arm/src/stm32f7/hardware/stm32f_otg.h
  *
  *   Copyright (C) 2012, 2014-2016 Gregory Nutt. All rights reserved.
  *   Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved.
@@ -35,8 +35,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_OTG_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_OTG_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_OTG_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_OTG_H
 
 /****************************************************************************************************
  * Included Files
@@ -952,4 +952,4 @@
 
 #define USBPHYC_LDO_ENABLE             (1 << 2)  /* Bit 2: Controls disable of the High Speed PHY's LDO. */
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_OTG_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_OTG_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_pinmap.h b/arch/arm/src/stm32f7/hardware/stm32_pinmap.h
similarity index 86%
rename from arch/arm/src/stm32f7/chip/stm32_pinmap.h
rename to arch/arm/src/stm32f7/hardware/stm32_pinmap.h
index a6d106b1f67..1fe28114ea3 100644
--- a/arch/arm/src/stm32f7/chip/stm32_pinmap.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_pinmap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_pinmap.h
+ * arch/arm/src/stm32f7/hardware/stm32_pinmap.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_PINMAP_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_PINMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_PINMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_PINMAP_H
 
 /************************************************************************************
  * Included Files
@@ -45,14 +45,14 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_pinmap.h"
+#  include "hardware/stm32f72xx73xx_pinmap.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_pinmap.h"
+#  include "hardware/stm32f74xx75xx_pinmap.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_pinmap.h"
+#  include "hardware/stm32f76xx77xx_pinmap.h"
 #else
 #  error "Unsupported STM32 F7 Pin map"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_PINMAP_H */
 
diff --git a/arch/arm/src/stm32f7/chip/stm32_pwr.h b/arch/arm/src/stm32f7/hardware/stm32_pwr.h
similarity index 87%
rename from arch/arm/src/stm32f7/chip/stm32_pwr.h
rename to arch/arm/src/stm32f7/hardware/stm32_pwr.h
index 080fd754961..91d325c2458 100644
--- a/arch/arm/src/stm32f7/chip/stm32_pwr.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_pwr.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_pwr.h
+ * arch/arm/src/stm32f7/hardware/stm32_pwr.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_PWR_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_PWR_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_PWR_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_PWR_H
 
 /************************************************************************************
  * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_pwr.h"
+#  include "hardware/stm32f72xx73xx_pwr.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_pwr.h"
+#  include "hardware/stm32f74xx75xx_pwr.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_pwr.h"
+#  include "hardware/stm32f76xx77xx_pwr.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_PWR_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_PWR_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_qspi.h b/arch/arm/src/stm32f7/hardware/stm32_qspi.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32_qspi.h
rename to arch/arm/src/stm32f7/hardware/stm32_qspi.h
index 652298fe0fa..61c84d2ea2f 100644
--- a/arch/arm/src/stm32f7/chip/stm32_qspi.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_qspi.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_qspi.h
+ * arch/arm/src/stm32f7/hardware/stm32_qspi.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: dev@ziggurat29.com
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F7_QSPI_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F7_QSPI_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_QSPI_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F7_QSPI_H
 
 /****************************************************************************************
  * Included Files
@@ -236,6 +236,6 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32L4_QSPI_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32L4_QSPI_H */
 
 
diff --git a/arch/arm/src/stm32f7/chip/stm32_rcc.h b/arch/arm/src/stm32f7/hardware/stm32_rcc.h
similarity index 87%
rename from arch/arm/src/stm32f7/chip/stm32_rcc.h
rename to arch/arm/src/stm32f7/hardware/stm32_rcc.h
index c4fa94a9337..4b360252b3c 100644
--- a/arch/arm/src/stm32f7/chip/stm32_rcc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_rcc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_rcc.h
+ * arch/arm/src/stm32f7/hardware/stm32_rcc.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RCC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RCC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RCC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RCC_H
 
 /************************************************************************************
  * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_rcc.h"
+#  include "hardware/stm32f72xx73xx_rcc.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_rcc.h"
+#  include "hardware/stm32f74xx75xx_rcc.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_rcc.h"
+#  include "hardware/stm32f76xx77xx_rcc.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RCC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RCC_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_rng.h b/arch/arm/src/stm32f7/hardware/stm32_rng.h
similarity index 94%
rename from arch/arm/src/stm32f7/chip/stm32_rng.h
rename to arch/arm/src/stm32f7/hardware/stm32_rng.h
index 3f5351a074b..8278cab13b3 100644
--- a/arch/arm/src/stm32f7/chip/stm32_rng.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_rng.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_rng.h
+ * arch/arm/src/stm32f7/hardware/stm32_rng.h
  *
  *   Copyright (C) 2012 Max Holtzberg. All rights reserved.
  *   Author: Max Holtzberg <mh@uvc.de>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_STC_STM32F7_CHIP_STM32_RNG_H
-#define __ARCH_ARM_STC_STM32F7_CHIP_STM32_RNG_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RNG_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RNG_H
 
 /************************************************************************************
  * Included Files
@@ -74,4 +74,4 @@
 #define RNG_SR_CEIS               (1 << 5) /* Bit 5: Clock error interrupt status */
 #define RNG_SR_SEIS               (1 << 6) /* Bit 6: Seed error interrupt status */
 
-#endif /* __ARCH_ARM_STC_STM32F7_CHIP_STM32_RNG_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RNG_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_rtcc.h b/arch/arm/src/stm32f7/hardware/stm32_rtcc.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32_rtcc.h
rename to arch/arm/src/stm32f7/hardware/stm32_rtcc.h
index efc1428a565..08d8361ff74 100644
--- a/arch/arm/src/stm32f7/chip/stm32_rtcc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_rtcc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_rtcc.h
+ * arch/arm/src/stm32f7/hardware/stm32_rtcc.h
  *
  *   Copyright (C) 2011-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RTCC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RTCC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RTCC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RTCC_H
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -402,4 +402,4 @@
 #define RTC_OR_RTC_ALARM_TYPE     (1 << 3) /* RTC_ALARM on PC13 output type */
 
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RTCC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_RTCC_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_sdmmc.h b/arch/arm/src/stm32f7/hardware/stm32_sdmmc.h
similarity index 92%
rename from arch/arm/src/stm32f7/chip/stm32_sdmmc.h
rename to arch/arm/src/stm32f7/hardware/stm32_sdmmc.h
index cd890d29273..d59f452dd7f 100644
--- a/arch/arm/src/stm32f7/chip/stm32_sdmmc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_sdmmc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_sdmmc.h
+ * arch/arm/src/stm32f7/hardware/stm32_sdmmc.h
  *
  *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SDMMC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SDMMC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SDMMC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SDMMC_H
 
 /************************************************************************************
  * Included Files
@@ -54,4 +54,4 @@
 #  error "Unsupported STM32 F7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SDMMC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SDMMC_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_spi.h b/arch/arm/src/stm32f7/hardware/stm32_spi.h
similarity index 89%
rename from arch/arm/src/stm32f7/chip/stm32_spi.h
rename to arch/arm/src/stm32f7/hardware/stm32_spi.h
index 64db932c32e..45379fb6ce5 100644
--- a/arch/arm/src/stm32f7/chip/stm32_spi.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_spi.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_spi.h
+ * arch/arm/src/stm32f7/hardware/stm32_spi.h
  *
  *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SPI_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SPI_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SPI_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SPI_H
 
 /************************************************************************************
  * Included Files
@@ -46,11 +46,11 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_spi.h"
+#  include "hardware/stm32f72xx73xx_spi.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) || \
     defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f74xx77xx_spi.h"
+#  include "hardware/stm32f74xx77xx_spi.h"
 #else
 #  error "Unsupported STM32 F7 sub family"
 #endif
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SPI_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SPI_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_syscfg.h b/arch/arm/src/stm32f7/hardware/stm32_syscfg.h
similarity index 86%
rename from arch/arm/src/stm32f7/chip/stm32_syscfg.h
rename to arch/arm/src/stm32f7/hardware/stm32_syscfg.h
index 8d0a6340c70..91e8054c1cb 100644
--- a/arch/arm/src/stm32f7/chip/stm32_syscfg.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_syscfg.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_syscfg.h
+ * arch/arm/src/stm32f7/hardware/stm32_syscfg.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SYSCFG_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SYSCFG_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SYSCFG_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SYSCFG_H
 
 /************************************************************************************
  * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_syscfg.h"
+#  include "hardware/stm32f72xx73xx_syscfg.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_syscfg.h"
+#  include "hardware/stm32f74xx75xx_syscfg.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_syscfg.h"
+#  include "hardware/stm32f76xx77xx_syscfg.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SYSCFG_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_SYSCFG_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_tim.h b/arch/arm/src/stm32f7/hardware/stm32_tim.h
similarity index 87%
rename from arch/arm/src/stm32f7/chip/stm32_tim.h
rename to arch/arm/src/stm32f7/hardware/stm32_tim.h
index 672f97667a3..4a01d32033e 100644
--- a/arch/arm/src/stm32f7/chip/stm32_tim.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_tim.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_tim.h
+ * arch/arm/src/stm32f7/hardware/stm32_tim.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_TIM_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_TIM_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_TIM_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_TIM_H
 
 /************************************************************************************
  * Included Files
@@ -45,13 +45,13 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_tim.h"
+#  include "hardware/stm32f72xx73xx_tim.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "chip/stm32f74xx75xx_tim.h"
+#  include "hardware/stm32f74xx75xx_tim.h"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f76xx77xx_tim.h"
+#  include "hardware/stm32f76xx77xx_tim.h"
 #else
 #  error "Unsupported STM32 F7 sub family"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_TIM_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_TIM_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32_uart.h b/arch/arm/src/stm32f7/hardware/stm32_uart.h
similarity index 88%
rename from arch/arm/src/stm32f7/chip/stm32_uart.h
rename to arch/arm/src/stm32f7/hardware/stm32_uart.h
index c86940e0fc2..76f377544f5 100644
--- a/arch/arm/src/stm32f7/chip/stm32_uart.h
+++ b/arch/arm/src/stm32f7/hardware/stm32_uart.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_uart.h
+ * arch/arm/src/stm32f7/hardware/stm32_uart.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_UART_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_UART_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_UART_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_UART_H
 
 /************************************************************************************
  * Included Files
@@ -45,12 +45,12 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_uart.h"
+#  include "hardware/stm32f72xx73xx_uart.h"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) || \
     defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
-#  include "chip/stm32f74xx77xx_uart.h"
+#  include "hardware/stm32f74xx77xx_uart.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_UART_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32_UART_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_adc.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_adc.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_adc.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_adc.h
index 55e12efb6b2..1ac70548431 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_adc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_adc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_adc.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_adc.h
  *
  *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_ADC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_ADC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H
 
 /****************************************************************************************************
  * Included Files
@@ -482,4 +482,4 @@
  * Public Function Prototypes
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_ADC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_dbgmcu.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dbgmcu.h
similarity index 95%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_dbgmcu.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dbgmcu.h
index 5d6bda71b58..3a2036ae7d9 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_dbgmcu.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dbgmcu.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_dbgmcu.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dbgmcu.h
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XXDBGMCU_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XXDBGMCU_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XXDBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XXDBGMCU_H
 
 /****************************************************************************
  * Included Files
@@ -105,4 +105,4 @@
 #define DBGMCU_APB2_TIM10STOP     (1 << 17)  /* Bit 17: TIM10 stopped when core is halted */
 #define DBGMCU_APB2_TIM11STOP     (1 << 18)  /* Bit 18: TIM11 stopped when core is halted */
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX74XXDBGMCU_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX74XXDBGMCU_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_dma.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dma.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_dma.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dma.h
index 71e72fae7c9..fbe4af97331 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_dma.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dma.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_dma.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_dma.h
  *
  *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XXX73XX_DMA_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XXX73XX_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XX_DMA_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XX_DMA_H
 
 /************************************************************************************
  * Included Files
@@ -543,4 +543,4 @@
 #define DMAMAP_SDMMC2_2            STM32_DMA_MAP(DMA2,DMA_STREAM5,DMA_CHAN11)
 
 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XXX73XX_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XX_DMA_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_flash.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_flash.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_flash.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_flash.h
index 9de274e0ed5..f8805a839e7 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_flash.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_flash.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_flash.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_flash.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_gpio.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_gpio.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_gpio.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_gpio.h
index 33d66d9b4c5..95c1eeb0711 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_gpio.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_gpio.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xxx73xx_gpio.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xxx73xx_gpio.h
  *
  *   Copyright (C) 2005 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_GPIO_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_GPIO_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_GPIO_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_GPIO_H
 
 /************************************************************************************
  * Included Files
@@ -401,4 +401,4 @@
 #define GPIO_AFRH15_MASK           (15 << GPIO_AFRH15_SHIFT)
 
 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_GPIO_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_GPIO_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_memorymap.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_memorymap.h
similarity index 97%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_memorymap.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_memorymap.h
index 3d462cee858..a97916c69e6 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_memorymap.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/chip/stm32f72xx73xx_memorymap.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_memorymap.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XXX73XXX_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XXX73XXX_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XXX_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XXX73XXX_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -202,4 +202,4 @@
 #define STM32_DEBUGMCU_BASE 0xe0042000
 
 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_MEMORYMAP_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_pinmap.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_pinmap.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_pinmap.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_pinmap.h
index 754882e57a0..6e72bfdb8ec 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_pinmap.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_pinmap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_pinmap.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_pinmap.h
  *
  *   Copyright (C) 2014-2015, 2017-2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F72XX73XX_PINMAP_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32F72XX73XX_PINMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_PINMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_PINMAP_H
 
 /************************************************************************************
  * Included Files
@@ -937,4 +937,4 @@
 #define GPIO_UART8_TX         (GPIO_ALT|GPIO_AF8|GPIO_PULLUP|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTE|GPIO_PIN1)
 
 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32F72XX73XX_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_PINMAP_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_pwr.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_pwr.h
similarity index 97%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_pwr.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_pwr.h
index 6591d0feede..690b8af2873 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_pwr.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_pwr.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_pwr.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_pwr.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_PWR_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_PWR_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_PWR_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_PWR_H
 
 /************************************************************************************
  * Included Files
@@ -158,4 +158,4 @@
 #define PWR_CSR2_EWUP6           (1 << 13) /* Bit 13: Enable wakeup pin for PI11 */
 
 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_PWR_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_PWR_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_rcc.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_rcc.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_rcc.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_rcc.h
index 9b1607f7ace..1c3bab77cb0 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_rcc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_rcc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_rcc.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_rcc.h
  *
  *   Copyright (C) 2015-2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F72XX73XX_RCC_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32F72XX73XX_RCC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_RCC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_RCC_H
 
 /****************************************************************************************************
  * Included Files
@@ -666,4 +666,4 @@
 #  define RCC_DCKCFGR2_SDMMC2SEL_SYSCLK  (1 << RCC_DCKCFGR2_SDMMC2SEL_SHIFT)  /* System clock is selected as SDMMC clock */
 
 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_RCC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_RCC_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_sdmmc.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_sdmmc.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_sdmmc.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_sdmmc.h
index d6f3ad750a9..743ecea05cd 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_sdmmc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_sdmmc.h
@@ -1,4 +1,4 @@
- /* arch/arm/src/stm32f7/chip/stm32f72xx73xx_sdmmc.h
+ /* arch/arm/src/stm32f7/hardware/stm32f72xx73xx_sdmmc.h
  *
  *   Copyright (C) 2009, 2011-2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SDMMC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SDMMC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SDMMC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SDMMC_H
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -221,4 +221,4 @@
 #define STM32_SDMMC_FIFOCNT_SHIFT             (0)
 #define STM32_SDMMC_FIFOCNT_MASK              (0x0ffffff << STM32_SDMMC_FIFOCNT_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SDMMC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SDMMC_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_spi.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_spi.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_spi.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_spi.h
index fb42f44bc0b..38fbe13d4ef 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_spi.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_spi.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_spi.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_spi.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SPI_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SPI_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SPI_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SPI_H
 
 /************************************************************************************
  * Included Files
@@ -252,4 +252,4 @@
 #define SPI_I2SPR_ODD             (1 << 8)  /* Bit 8: Odd factor for the prescaler */
 #define SPI_I2SPR_MCKOE           (1 << 9)  /* Bit 9: Master clock output enable */
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SPI_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SPI_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_syscfg.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_syscfg.h
similarity index 97%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_syscfg.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_syscfg.h
index 4a341e1a917..d3e9bfacb5b 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_syscfg.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_syscfg.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx74xx_syscfg.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx74xx_syscfg.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SYSCFG_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SYSCFG_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SYSCFG_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SYSCFG_H
 
 /****************************************************************************************************
  * Included Files
@@ -159,4 +159,4 @@
 #define SYSCFG_CMPCR_READY            (1 << 8)  /* Bit 8: Compensation cell ready flag */
 
 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_SYSCFG_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_SYSCFG_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_tim.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_tim.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_tim.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_tim.h
index 3e91342ea74..08dd4362668 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_tim.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_tim.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f72xx73xx_tim.h
+ * arch/arm/src/stm32f7/hardware/stm32f72xx73xx_tim.h
  *
  *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_TIM_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_TIM_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_TIM_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_TIM_H
 
 /****************************************************************************************************
  * Pre-processor Definitions
@@ -1127,4 +1127,4 @@
 
 #define BTIM_EGR_UG               (1 << 0)  /* Bit 0: Update generation */
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_TIM_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_TIM_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_uart.h b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_uart.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32f72xx73xx_uart.h
rename to arch/arm/src/stm32f7/hardware/stm32f72xx73xx_uart.h
index 64d55996766..01c755a30ae 100644
--- a/arch/arm/src/stm32f7/chip/stm32f72xx73xx_uart.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f72xx73xx_uart.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xxf77xx_uart.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xxf77xx_uart.h
  *
  *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_UART_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_UART_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_UART_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_UART_H
 
 /************************************************************************************
  * Included Files
@@ -368,4 +368,4 @@
 #define USART_TDR_MASK            (0x1ff << USART_TDR_SHIFT)
 
 #endif /* CONFIG_STM32F7_STM32F72XX || CONFIG_STM32F7_STM32F73XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F72XX73XX_UART_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F72XX73XX_UART_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_dbgmcu.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dbgmcu.h
similarity index 96%
rename from arch/arm/src/stm32f7/chip/stm32f74xx75xx_dbgmcu.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dbgmcu.h
index 33842b73410..d88cef1fa09 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_dbgmcu.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dbgmcu.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_dbgmcu.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dbgmcu.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XXDBGMCU_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XXDBGMCU_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XXDBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XXDBGMCU_H
 
 /****************************************************************************
  * Included Files
@@ -109,4 +109,4 @@
 #define DBGMCU_APB2_TIM10STOP     (1 << 17)  /* Bit 17: TIM10 stopped when core is halted */
 #define DBGMCU_APB2_TIM11STOP     (1 << 18)  /* Bit 18: TIM11 stopped when core is halted */
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XXDBGMCU_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XXDBGMCU_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_dma.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dma.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f74xx75xx_dma.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dma.h
index 6b7fed23c16..ad8525a8e68 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_dma.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dma.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_dma.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_dma.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XX_DMA_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XX_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XX_DMA_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XX_DMA_H
 
 /************************************************************************************
  * Included Files
@@ -548,4 +548,4 @@
 #define DMAMAP_TIM8_COM            STM32_DMA_MAP(DMA2,DMA_STREAM7,DMA_CHAN7)
 
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XX_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XX_DMA_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_flash.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_flash.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f74xx75xx_flash.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx75xx_flash.h
index 08b62e191a4..2fdce0492b6 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_flash.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_flash.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_flash.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_flash.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_gpio.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_gpio.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32f74xx75xx_gpio.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx75xx_gpio.h
index b8818f6e49b..3b28d3c3e72 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_gpio.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_gpio.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xxx75xx_gpio.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xxx75xx_gpio.h
  *
  *   Copyright (C) 2005 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_GPIO_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_GPIO_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_GPIO_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_GPIO_H
 
 /************************************************************************************
  * Included Files
@@ -400,4 +400,4 @@
 #define GPIO_AFRH15_MASK           (15 << GPIO_AFRH15_SHIFT)
 
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_GPIO_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_GPIO_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_memorymap.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx75xx_memorymap.h
index eb98f260f97..86ce9d08f47 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm3fr2/chip/stm32f74xxx75xxx_memorymap.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xxx75xxx_memorymap.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XXX_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XXX_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XXX_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XXX_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -213,4 +213,4 @@
 #define STM32_DEBUGMCU_BASE 0xe0042000
 
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XXX_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XXX_MEMORYMAP_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_pinmap.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_pinmap.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f74xx75xx_pinmap.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx75xx_pinmap.h
index 865a1d1ffb1..7622eaac2a8 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_pinmap.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_pinmap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_pinmap.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_pinmap.h
  *
  *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_PINMAP_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_PINMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_PINMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_PINMAP_H
 
 /************************************************************************************
  * Included Files
@@ -1184,4 +1184,4 @@
 #define GPIO_UART8_TX         (GPIO_ALT|GPIO_AF8|GPIO_PULLUP|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTE|GPIO_PIN1)
 
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_PINMAP_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_pwr.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_pwr.h
similarity index 97%
rename from arch/arm/src/stm32f7/chip/stm32f74xx75xx_pwr.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx75xx_pwr.h
index 547b555a92b..3b41c0cf918 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_pwr.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_pwr.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_pwr.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_pwr.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_PWR_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_PWR_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_PWR_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_PWR_H
 
 /************************************************************************************
  * Included Files
@@ -157,4 +157,4 @@
 #define PWR_CSR2_EWUP6           (1 << 13) /* Bit 13: Enable wakeup pin for PI11 */
 
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_PWR_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_PWR_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_rcc.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_rcc.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f74xx75xx_rcc.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx75xx_rcc.h
index 0a4ff1e5eeb..5494002b2ca 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_rcc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_rcc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_rcc.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_rcc.h
  *
  *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_RCC_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_RCC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_RCC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_RCC_H
 
 /****************************************************************************************************
  * Included Files
@@ -709,4 +709,4 @@
 #  define RCC_DCKCFGR2_SDMMCSEL_SYSCLK  (1 << RCC_DCKCFGR2_SDMMCSEL_SHIFT)  /* System clock is selected as SDMMC clock */
 
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32F74XX75XX_RCC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_RCC_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_syscfg.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_syscfg.h
similarity index 97%
rename from arch/arm/src/stm32f7/chip/stm32f74xx75xx_syscfg.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx75xx_syscfg.h
index 55f90c56276..8e30f19dc7a 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_syscfg.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_syscfg.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_syscfg.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_syscfg.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_SYSCFG_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_SYSCFG_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_SYSCFG_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_SYSCFG_H
 
 /****************************************************************************************************
  * Included Files
@@ -156,4 +156,4 @@
 #define SYSCFG_CMPCR_READY            (1 << 8)  /* Bit 8: Compensation cell ready flag */
 
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_SYSCFG_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_SYSCFG_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_tim.h b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_tim.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f74xx75xx_tim.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx75xx_tim.h
index 5fad1f5a781..c46d57ac5a5 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_tim.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx75xx_tim.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_tim.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_tim.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_TIM_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_TIM_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_TIM_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_TIM_H
 
 /****************************************************************************************************
  * Pre-processor Definitions
@@ -1126,4 +1126,4 @@
 
 #define BTIM_EGR_UG               (1 << 0)  /* Bit 0: Update generation */
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_TIM_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX75XX_TIM_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx77xx_adc.h b/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_adc.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f74xx77xx_adc.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx77xx_adc.h
index 14685022a4e..da7338acf78 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx77xx_adc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_adc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx77xx_adc.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx77xx_adc.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_ADC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_ADC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H
 
 /****************************************************************************************************
  * Included Files
@@ -481,4 +481,4 @@
  * Public Function Prototypes
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_ADC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_ADC_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx77xx_i2c.h b/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_i2c.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f74xx77xx_i2c.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx77xx_i2c.h
index 7e2d801dc90..f6a5d848c6a 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx77xx_i2c.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_i2c.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx77xx_i2c.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx77xx_i2c.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -260,5 +260,5 @@
 
 #define I2C_TXDR_MASK             (0xff)
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_I2C_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_I2C_H */
 
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx77xx_sdmmc.h b/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_sdmmc.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32f74xx77xx_sdmmc.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx77xx_sdmmc.h
index e0d52edc4ef..8999a12be84 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx77xx_sdmmc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_sdmmc.h
@@ -1,4 +1,4 @@
- /* arch/arm/src/stm32f7/chip/stm32f74xx77xx_sdmmc.h
+ /* arch/arm/src/stm32f7/hardware/stm32f74xx77xx_sdmmc.h
  *
  *   Copyright (C) 2009, 2011-2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_SDMMC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_SDMMC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_SDMMC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_SDMMC_H
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -220,5 +220,5 @@
 #define STM32_SDMMC_FIFOCNT_SHIFT             (0)
 #define STM32_SDMMC_FIFOCNT_MASK              (0x0ffffff << STM32_SDMMC_FIFOCNT_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_SDMMC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_SDMMC_H */
 
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx77xx_spi.h b/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_spi.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32f74xx77xx_spi.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx77xx_spi.h
index fe8c899c564..98d1f84f4c8 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx77xx_spi.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_spi.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx77xx_spi.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx77xx_spi.h
  *stm32f74xx77xx
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_SPI_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_SPI_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_SPI_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_SPI_H
 
 /************************************************************************************
  * Included Files
@@ -255,4 +255,4 @@
 #define SPI_I2SPR_ODD             (1 << 8)  /* Bit 8: Odd factor for the prescaler */
 #define SPI_I2SPR_MCKOE           (1 << 9)  /* Bit 9: Master clock output enable */
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_SPI_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_SPI_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx77xx_uart.h b/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_uart.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32f74xx77xx_uart.h
rename to arch/arm/src/stm32f7/hardware/stm32f74xx77xx_uart.h
index 4d109bead0d..7e92d008260 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx77xx_uart.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f74xx77xx_uart.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xxf77xx_uart.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xxf77xx_uart.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_UART_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_UART_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_UART_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_UART_H
 
 /************************************************************************************
  * Included Files
@@ -368,4 +368,4 @@
 #define USART_TDR_MASK            (0x1ff << USART_TDR_SHIFT)
 
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_UART_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XX77XX_UART_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_dbgmcu.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dbgmcu.h
similarity index 96%
rename from arch/arm/src/stm32f7/chip/stm32f76xx77xx_dbgmcu.h
rename to arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dbgmcu.h
index 6804dc25748..9c8c3375428 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_dbgmcu.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dbgmcu.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f76xx77xx_dbgmcu.h
+ * arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dbgmcu.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XXDBGMCU_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XXDBGMCU_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XXDBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XXDBGMCU_H
 
 /****************************************************************************
  * Included Files
@@ -110,4 +110,4 @@
 #define DBGMCU_APB2_TIM10STOP     (1 << 17)  /* Bit 17: TIM10 stopped when core is halted */
 #define DBGMCU_APB2_TIM11STOP     (1 << 18)  /* Bit 18: TIM11 stopped when core is halted */
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XXDBGMCU_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XXDBGMCU_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_dma.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dma.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f76xx77xx_dma.h
rename to arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dma.h
index d4d4eb0f893..f26469ccfeb 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_dma.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dma.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f76xx77xx_dma.h
+ * arch/arm/src/stm32f7/hardware/stm32f76xx77xx_dma.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XXX77XX_DMA_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XXX77XX_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XXX77XX_DMA_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XXX77XX_DMA_H
 
 /************************************************************************************
  * Included Files
@@ -590,4 +590,4 @@
 #define DMAMAP_SDMMC2_2            STM32_DMA_MAP(DMA2,DMA_STREAM5,DMA_CHAN11)
 
 #endif /* CONFIG_STM32F7_STM32F76XX || CONFIG_STM32F7_STM32F77XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XXX77XX_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XXX77XX_DMA_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_flash.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_flash.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f76xx77xx_flash.h
rename to arch/arm/src/stm32f7/hardware/stm32f76xx77xx_flash.h
index 1e102040861..1a2065ae37e 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_flash.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_flash.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_flash.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_flash.h
  *
  *   Copyright (C) 2015, 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_gpio.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_gpio.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32f76xx77xx_gpio.h
rename to arch/arm/src/stm32f7/hardware/stm32f76xx77xx_gpio.h
index 711dc0e1247..8bc226918d0 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_gpio.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_gpio.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f76xxx77xx_gpio.h
+ * arch/arm/src/stm32f7/hardware/stm32f76xxx77xx_gpio.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XX_GPIO_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XX_GPIO_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_GPIO_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_GPIO_H
 
 /************************************************************************************
  * Included Files
@@ -401,4 +401,4 @@
 #define GPIO_AFRH15_MASK           (15 << GPIO_AFRH15_SHIFT)
 
 #endif /* CONFIG_STM32F7_STM32F76XX || CONFIG_STM32F7_STM32F77XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XX_GPIO_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_GPIO_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_memorymap.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_memorymap.h
similarity index 98%
rename from arch/arm/src/stm32f7/chip/stm32f76xx77xx_memorymap.h
rename to arch/arm/src/stm32f7/hardware/stm32f76xx77xx_memorymap.h
index 0c3285dfd89..e7e609dec48 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_memorymap.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm3fr2/chip/stm32f76xxx77xxx_memorymap.h
+ * arch/arm/src/stm32f7/hardware/stm32f76xxx77xxx_memorymap.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XXX77XXX_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XXX77XXX_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XXX77XXX_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XXX77XXX_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -220,4 +220,4 @@
 #define STM32_DEBUGMCU_BASE 0xe0042000
 
 #endif /* CONFIG_STM32F7_STM32F74XX || CONFIG_STM32F7_STM32F75XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XXX75XXX_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F74XXX75XXX_MEMORYMAP_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_pinmap.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_pinmap.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f76xx77xx_pinmap.h
rename to arch/arm/src/stm32f7/hardware/stm32f76xx77xx_pinmap.h
index 9fa724639c3..ff612bfa525 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_pinmap.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_pinmap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f76xx77xx_pinmap.h
+ * arch/arm/src/stm32f7/hardware/stm32f76xx77xx_pinmap.h
  *
  *   Copyright (C) 2016, 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F76XX77XX_PINMAP_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32F76XX77XX_PINMAP_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_PINMAP_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_PINMAP_H
 
 /************************************************************************************
  * Included Files
@@ -1347,4 +1347,4 @@
 #define GPIO_UART8_TX         (GPIO_ALT|GPIO_AF8|GPIO_PULLUP|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTE|GPIO_PIN1)
 
 #endif /* CONFIG_STM32F7_STM32F76XX || CONFIG_STM32F7_STM32F77XX */
-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32F76XX77XX_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_PINMAP_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_pwr.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_pwr.h
similarity index 97%
rename from arch/arm/src/stm32f7/chip/stm32f76xx77xx_pwr.h
rename to arch/arm/src/stm32f7/hardware/stm32f76xx77xx_pwr.h
index c2f9f8a981a..ceb46ba8281 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_pwr.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_pwr.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f76xx77xx_pwr.h
+ * arch/arm/src/stm32f7/hardware/stm32f76xx77xx_pwr.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XX_PWR_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XX_PWR_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_PWR_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_PWR_H
 
 /************************************************************************************
  * Included Files
@@ -156,4 +156,4 @@
 #define PWR_CSR2_EWUP6           (1 << 13) /* Bit 13: Enable wakeup pin for PI11 */
 
 #endif /* CONFIG_STM32F7_STM32F76XX || CONFIG_STM32F7_STM32F77XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XX_PWR_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_PWR_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_rcc.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_rcc.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f76xx77xx_rcc.h
rename to arch/arm/src/stm32f7/hardware/stm32f76xx77xx_rcc.h
index b7f73c27b5e..d33b448ed03 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_rcc.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_rcc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f74xx75xx_rcc.h
+ * arch/arm/src/stm32f7/hardware/stm32f74xx75xx_rcc.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32F76XX77XX_RCC_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32F76XX77XX_RCC_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_RCC_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_RCC_H
 
 /****************************************************************************************************
  * Included Files
@@ -740,4 +740,4 @@
 #  define RCC_DCKCFGR2_DSISEL_SYSCLK    (1 << RCC_DCKCFGR2_DSISEL_SHIFT)  /* System clock is selected as DSI clock */
 
 #endif /* CONFIG_STM32F7_STM32F76XX || CONFIG_STM32F7_STM32F77XX */
-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32F76XX77XX_RCC_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_RCC_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_syscfg.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_syscfg.h
similarity index 97%
rename from arch/arm/src/stm32f7/chip/stm32f76xx77xx_syscfg.h
rename to arch/arm/src/stm32f7/hardware/stm32f76xx77xx_syscfg.h
index d3a469fe8a6..58dd0110075 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_syscfg.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_syscfg.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f76xx77xx_syscfg.h
+ * arch/arm/src/stm32f7/hardware/stm32f76xx77xx_syscfg.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XX_SYSCFG_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XX_SYSCFG_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_SYSCFG_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_SYSCFG_H
 
 /****************************************************************************************************
  * Included Files
@@ -177,4 +177,5 @@
 #define SYSCFG_CMPCR_READY            (1 << 8)  /* Bit 8: Compensation cell ready flag */
 
 #endif /* CONFIG_STM32F7_STM32F76XX || CONFIG_STM32F7_STM32F77XX */
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XX_SYSCFG_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_SYSCFG_H */
+
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_tim.h b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_tim.h
similarity index 99%
rename from arch/arm/src/stm32f7/chip/stm32f76xx77xx_tim.h
rename to arch/arm/src/stm32f7/hardware/stm32f76xx77xx_tim.h
index bb6a657aa84..f2b14287098 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_tim.h
+++ b/arch/arm/src/stm32f7/hardware/stm32f76xx77xx_tim.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f76xx77xx_tim.h
+ * arch/arm/src/stm32f7/hardware/stm32f76xx77xx_tim.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XX_TIM_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XX_TIM_H
+#ifndef __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_TIM_H
+#define __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_TIM_H
 
 /****************************************************************************************************
  * Pre-processor Definitions
@@ -1144,4 +1144,4 @@
 
 #define BTIM_EGR_UG               (1 << 0)  /* Bit 0: Update generation */
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XX_TIM_H */
+#endif /* __ARCH_ARM_SRC_STM32F7_HARDWARE_STM32F76XX77XX_TIM_H */
diff --git a/arch/arm/src/stm32f7/stm32_adc.h b/arch/arm/src/stm32f7/stm32_adc.h
index fa1c0bb2ec3..0a0794c18a5 100644
--- a/arch/arm/src/stm32f7/stm32_adc.h
+++ b/arch/arm/src/stm32f7/stm32_adc.h
@@ -46,7 +46,7 @@
 #include <nuttx/config.h>
 #include <nuttx/analog/adc.h>
 #include "chip.h"
-#include "chip/stm32_adc.h"
+#include "hardware/stm32_adc.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32f7/stm32_allocateheap.c b/arch/arm/src/stm32f7/stm32_allocateheap.c
index afc23bbe0d0..92749a054c0 100644
--- a/arch/arm/src/stm32f7/stm32_allocateheap.c
+++ b/arch/arm/src/stm32f7/stm32_allocateheap.c
@@ -57,7 +57,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/stm32_memorymap.h"
+#include "hardware/stm32_memorymap.h"
 #include "stm32_mpuinit.h"
 #include "stm32_dtcm.h"
 
diff --git a/arch/arm/src/stm32f7/stm32_can.h b/arch/arm/src/stm32f7/stm32_can.h
index 1667b022df0..52237109db2 100644
--- a/arch/arm/src/stm32f7/stm32_can.h
+++ b/arch/arm/src/stm32f7/stm32_can.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/stm32_can.h"
+#include "hardware/stm32_can.h"
 
 #include <nuttx/can/can.h>
 
diff --git a/arch/arm/src/stm32f7/stm32_capture.h b/arch/arm/src/stm32f7/stm32_capture.h
index 4bc386e68bf..ab8db0ca040 100644
--- a/arch/arm/src/stm32f7/stm32_capture.h
+++ b/arch/arm/src/stm32f7/stm32_capture.h
@@ -44,7 +44,7 @@
 
 #include "chip.h"
 #include <arch/board/board.h>
-#include "chip/stm32_tim.h"
+#include "hardware/stm32_tim.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32f7/stm32_dbgmcu.h b/arch/arm/src/stm32f7/stm32_dbgmcu.h
index 0aef4d5f0a0..f6d976b2b85 100644
--- a/arch/arm/src/stm32f7/stm32_dbgmcu.h
+++ b/arch/arm/src/stm32f7/stm32_dbgmcu.h
@@ -43,6 +43,6 @@
 
 #include <nuttx/config.h>
 
-#include "chip/stm32_dbgmcu.h"
+#include "hardware/stm32_dbgmcu.h"
 
 #endif /* __ARCH_ARM_SRC_STM32F7_STM32_DBGMCU_H */
diff --git a/arch/arm/src/stm32f7/stm32_dma.h b/arch/arm/src/stm32f7/stm32_dma.h
index 567e2330647..20e52db04ef 100644
--- a/arch/arm/src/stm32f7/stm32_dma.h
+++ b/arch/arm/src/stm32f7/stm32_dma.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <sys/types.h>
 
-#include "chip/stm32_dma.h"
+#include "hardware/stm32_dma.h"
 
 /* These definitions provide the bit encoding of the 'status' parameter passed to the
  * DMA callback function (see dma_callback_t).
diff --git a/arch/arm/src/stm32f7/stm32_dma2d.c b/arch/arm/src/stm32f7/stm32_dma2d.c
index 81dfbedbfbb..dfe587cc0bf 100644
--- a/arch/arm/src/stm32f7/stm32_dma2d.c
+++ b/arch/arm/src/stm32f7/stm32_dma2d.c
@@ -57,9 +57,9 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "chip/stm32_ltdc.h"
-#include "chip/stm32_dma2d.h"
-#include "chip/stm32_dtcm.h"
+#include "hardware/stm32_ltdc.h"
+#include "hardware/stm32_dma2d.h"
+#include "hardware/stm32_dtcm.h"
 #include "stm32_dma2d.h"
 #include "stm32_ltdc.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c
index 89adec6c50e..e80ae02af2f 100644
--- a/arch/arm/src/stm32f7/stm32_ethernet.c
+++ b/arch/arm/src/stm32f7/stm32_ethernet.c
@@ -65,8 +65,8 @@
 #include "up_internal.h"
 #include "barriers.h"
 
-#include "chip/stm32_syscfg.h"
-#include "chip/stm32_pinmap.h"
+#include "hardware/stm32_syscfg.h"
+#include "hardware/stm32_pinmap.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
 #include "stm32_ethernet.h"
diff --git a/arch/arm/src/stm32f7/stm32_ethernet.h b/arch/arm/src/stm32f7/stm32_ethernet.h
index 2916232e26b..6c872545140 100644
--- a/arch/arm/src/stm32f7/stm32_ethernet.h
+++ b/arch/arm/src/stm32f7/stm32_ethernet.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/stm32_ethernet.h"
+#include "hardware/stm32_ethernet.h"
 
 #if STM32F7_NETHERNET > 0
 #ifndef __ASSEMBLY__
diff --git a/arch/arm/src/stm32f7/stm32_exti.h b/arch/arm/src/stm32f7/stm32_exti.h
index e6e4786d954..3e546d161e9 100644
--- a/arch/arm/src/stm32f7/stm32_exti.h
+++ b/arch/arm/src/stm32f7/stm32_exti.h
@@ -45,7 +45,7 @@
 #include <nuttx/irq.h>
 
 #include "chip.h"
-#include "chip/stm32_exti.h"
+#include "hardware/stm32_exti.h"
 
 /****************************************************************************
  * Public Data
diff --git a/arch/arm/src/stm32f7/stm32_flash.c b/arch/arm/src/stm32f7/stm32_flash.c
index ca0da67f58f..bff212e4410 100644
--- a/arch/arm/src/stm32f7/stm32_flash.c
+++ b/arch/arm/src/stm32f7/stm32_flash.c
@@ -60,7 +60,7 @@
 
 #include "barriers.h"
 
-#include "chip/stm32_flash.h"
+#include "hardware/stm32_flash.h"
 #include "up_arch.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32f7/stm32_gpio.c b/arch/arm/src/stm32f7/stm32_gpio.c
index af861578cfd..9d3d7660eb2 100644
--- a/arch/arm/src/stm32f7/stm32_gpio.c
+++ b/arch/arm/src/stm32f7/stm32_gpio.c
@@ -50,7 +50,7 @@
 #include <arch/stm32f7/chip.h>
 
 #include "up_arch.h"
-#include "chip/stm32_syscfg.h"
+#include "hardware/stm32_syscfg.h"
 #include "stm32_gpio.h"
 
 /* Content of this file requires verification before it is used with other
diff --git a/arch/arm/src/stm32f7/stm32_gpio.h b/arch/arm/src/stm32f7/stm32_gpio.h
index e3b49e81303..eb7fd3d29eb 100644
--- a/arch/arm/src/stm32f7/stm32_gpio.h
+++ b/arch/arm/src/stm32f7/stm32_gpio.h
@@ -50,7 +50,7 @@
 #include <nuttx/irq.h>
 
 #include "chip.h"
-#include "chip/stm32_gpio.h"
+#include "hardware/stm32_gpio.h"
 
 /************************************************************************************
  * Pre-Processor Declarations
diff --git a/arch/arm/src/stm32f7/stm32_i2c.c b/arch/arm/src/stm32f7/stm32_i2c.c
index 665060e1c55..eac2435e003 100644
--- a/arch/arm/src/stm32f7/stm32_i2c.c
+++ b/arch/arm/src/stm32f7/stm32_i2c.c
@@ -252,7 +252,7 @@
 #include "stm32_rcc.h"
 #include "stm32_i2c.h"
 #include "stm32_gpio.h"
-#include "chip/stm32_pinmap.h"
+#include "hardware/stm32_pinmap.h"
 
 /* At least one I2C peripheral must be enabled */
 
diff --git a/arch/arm/src/stm32f7/stm32_i2c.h b/arch/arm/src/stm32f7/stm32_i2c.h
index e2223f53c8f..6a1ac38884e 100644
--- a/arch/arm/src/stm32f7/stm32_i2c.h
+++ b/arch/arm/src/stm32f7/stm32_i2c.h
@@ -44,7 +44,7 @@
 #include <nuttx/i2c/i2c_master.h>
 
 #include "chip.h"
-#include "chip/stm32_i2c.h"
+#include "hardware/stm32_i2c.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32f7/stm32_lowputc.c b/arch/arm/src/stm32f7/stm32_lowputc.c
index d642c862a69..9aefb4295cf 100644
--- a/arch/arm/src/stm32f7/stm32_lowputc.c
+++ b/arch/arm/src/stm32f7/stm32_lowputc.c
@@ -46,7 +46,7 @@
 
 #include "chip.h"
 
-#include "chip/stm32_pinmap.h"
+#include "hardware/stm32_pinmap.h"
 #include "stm32_rcc.h"
 #include "stm32_gpio.h"
 #include "stm32_uart.h"
diff --git a/arch/arm/src/stm32f7/stm32_ltdc.c b/arch/arm/src/stm32f7/stm32_ltdc.c
index 22f1c3c6c20..ec83b816166 100644
--- a/arch/arm/src/stm32f7/stm32_ltdc.c
+++ b/arch/arm/src/stm32f7/stm32_ltdc.c
@@ -57,8 +57,8 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "chip/stm32_ltdc.h"
-#include "chip/stm32_dma2d.h"
+#include "hardware/stm32_ltdc.h"
+#include "hardware/stm32_dma2d.h"
 #include "stm32_rcc.h"
 #include "stm32_gpio.h"
 #include "stm32_ltdc.h"
diff --git a/arch/arm/src/stm32f7/stm32_otg.h b/arch/arm/src/stm32f7/stm32_otg.h
index 62def82427f..90672ae24a9 100644
--- a/arch/arm/src/stm32f7/stm32_otg.h
+++ b/arch/arm/src/stm32f7/stm32_otg.h
@@ -45,7 +45,7 @@
 #include <stdint.h>
 
 #include "chip.h"
-#include "chip/stm32_otg.h"
+#include "hardware/stm32_otg.h"
 
 #if defined(CONFIG_STM32F7_OTGFS) || defined(CONFIG_STM32F7_OTGFSHS)
 
diff --git a/arch/arm/src/stm32f7/stm32_pwm.h b/arch/arm/src/stm32f7/stm32_pwm.h
index 2b4916d3829..c648cc47200 100644
--- a/arch/arm/src/stm32f7/stm32_pwm.h
+++ b/arch/arm/src/stm32f7/stm32_pwm.h
@@ -128,7 +128,7 @@
     defined(CONFIG_STM32F7_TIM17_PWM)
 
 #include <arch/board/board.h>
-#include "chip/stm32_tim.h"
+#include "hardware/stm32_tim.h"
 
 #ifdef CONFIG_PWM_MULTICHAN
 
diff --git a/arch/arm/src/stm32f7/stm32_pwr.h b/arch/arm/src/stm32f7/stm32_pwr.h
index b332e424a0d..77174a2f65c 100644
--- a/arch/arm/src/stm32f7/stm32_pwr.h
+++ b/arch/arm/src/stm32f7/stm32_pwr.h
@@ -46,7 +46,7 @@
 #include <stdbool.h>
 
 #include "chip.h"
-#include "chip/stm32_pwr.h"
+#include "hardware/stm32_pwr.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32f7/stm32_qspi.c b/arch/arm/src/stm32f7/stm32_qspi.c
index 63ababa1341..7436390c8c6 100644
--- a/arch/arm/src/stm32f7/stm32_qspi.c
+++ b/arch/arm/src/stm32f7/stm32_qspi.c
@@ -68,7 +68,7 @@
 #include "stm32_gpio.h"
 #include "stm32_dma.h"
 #include "stm32_rcc.h"
-#include "chip/stm32_qspi.h"
+#include "hardware/stm32_qspi.h"
 
 #ifdef CONFIG_STM32F7_QUADSPI
 
diff --git a/arch/arm/src/stm32f7/stm32_rcc.c b/arch/arm/src/stm32f7/stm32_rcc.c
index 27396e5ecea..a0b8b60298e 100644
--- a/arch/arm/src/stm32f7/stm32_rcc.c
+++ b/arch/arm/src/stm32f7/stm32_rcc.c
@@ -50,7 +50,7 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "chip/stm32_flash.h"
+#include "hardware/stm32_flash.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
 #include "stm32_pwr.h"
@@ -77,7 +77,7 @@
 /* Include chip-specific clocking initialization logic */
 
 #if defined(CONFIG_STM32F7_STM32F72XX) || defined(CONFIG_STM32F7_STM32F73XX)
-#  include "chip/stm32f72xx73xx_rcc.c"
+#  include "hardware/stm32f72xx73xx_rcc.c"
 #elif defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
 #  include "stm32f74xx75xx_rcc.c"
 #elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
diff --git a/arch/arm/src/stm32f7/stm32_rcc.h b/arch/arm/src/stm32f7/stm32_rcc.h
index 073b972958f..b1c704afa3e 100644
--- a/arch/arm/src/stm32f7/stm32_rcc.h
+++ b/arch/arm/src/stm32f7/stm32_rcc.h
@@ -44,7 +44,7 @@
 
 #include "up_arch.h"
 
-#include "chip/stm32_rcc.h"
+#include "hardware/stm32_rcc.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32f7/stm32_rng.c b/arch/arm/src/stm32f7/stm32_rng.c
index b307dc2c32c..947088cdf68 100644
--- a/arch/arm/src/stm32f7/stm32_rng.c
+++ b/arch/arm/src/stm32f7/stm32_rng.c
@@ -52,7 +52,7 @@
 #include <nuttx/drivers/drivers.h>
 
 #include "up_arch.h"
-#include "chip/stm32_rng.h"
+#include "hardware/stm32_rng.h"
 #include "up_internal.h"
 
 #if defined(CONFIG_STM32F7_RNG)
diff --git a/arch/arm/src/stm32f7/stm32_rtc.h b/arch/arm/src/stm32f7/stm32_rtc.h
index 8244e4c8d48..959aeead927 100644
--- a/arch/arm/src/stm32f7/stm32_rtc.h
+++ b/arch/arm/src/stm32f7/stm32_rtc.h
@@ -52,7 +52,7 @@
  * the RTCC in these families.
  */
 
-#include "chip/stm32_rtcc.h"
+#include "hardware/stm32_rtcc.h"
 #include "stm32_alarm.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.h b/arch/arm/src/stm32f7/stm32_sdmmc.h
index 095af548052..0d79a297ade 100644
--- a/arch/arm/src/stm32f7/stm32_sdmmc.h
+++ b/arch/arm/src/stm32f7/stm32_sdmmc.h
@@ -45,7 +45,7 @@
 #include <stdbool.h>
 
 #include "chip.h"
-#include "chip/stm32_sdmmc.h"
+#include "hardware/stm32_sdmmc.h"
 
 
 /************************************************************************************
diff --git a/arch/arm/src/stm32f7/stm32_serial.c b/arch/arm/src/stm32f7/stm32_serial.c
index a57db4aa221..cdf924ea093 100644
--- a/arch/arm/src/stm32f7/stm32_serial.c
+++ b/arch/arm/src/stm32f7/stm32_serial.c
@@ -64,7 +64,7 @@
 
 #include "chip.h"
 #include "stm32_gpio.h"
-#include "chip/stm32_pinmap.h"
+#include "hardware/stm32_pinmap.h"
 #include "stm32_dma.h"
 #include "stm32_rcc.h"
 #include "stm32_uart.h"
diff --git a/arch/arm/src/stm32f7/stm32_spi.h b/arch/arm/src/stm32f7/stm32_spi.h
index f8c1ee9a1fc..094c1a67d05 100644
--- a/arch/arm/src/stm32f7/stm32_spi.h
+++ b/arch/arm/src/stm32f7/stm32_spi.h
@@ -46,7 +46,7 @@
 #include <stdbool.h>
 
 #include "chip.h"
-#include "chip/stm32_spi.h"
+#include "hardware/stm32_spi.h"
 
 /************************************************************************************
  * Public Functions
diff --git a/arch/arm/src/stm32f7/stm32_tim.h b/arch/arm/src/stm32f7/stm32_tim.h
index 5304071fbbd..becbc84cc86 100644
--- a/arch/arm/src/stm32f7/stm32_tim.h
+++ b/arch/arm/src/stm32f7/stm32_tim.h
@@ -48,7 +48,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/stm32_tim.h"
+#include "hardware/stm32_tim.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32f7/stm32_uart.h b/arch/arm/src/stm32f7/stm32_uart.h
index b53f532693d..15ad3dfca5d 100644
--- a/arch/arm/src/stm32f7/stm32_uart.h
+++ b/arch/arm/src/stm32f7/stm32_uart.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <nuttx/serial/serial.h>
 
-#include "chip/stm32_uart.h"
+#include "hardware/stm32_uart.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32f7/stm32_uid.c b/arch/arm/src/stm32f7/stm32_uid.c
index 078f888d1cf..521a6274de0 100644
--- a/arch/arm/src/stm32f7/stm32_uid.c
+++ b/arch/arm/src/stm32f7/stm32_uid.c
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include <chip/stm32_memorymap.h>
+#include "hardware/stm32_memorymap.h"
 
 #include "stm32_uid.h"