diff --git a/arch/arm/src/lpc11xx/chip.h b/arch/arm/src/lpc11xx/chip.h
index 5057045b71f..e9a8f52c747 100644
--- a/arch/arm/src/lpc11xx/chip.h
+++ b/arch/arm/src/lpc11xx/chip.h
@@ -53,7 +53,7 @@
  * this file for the proper setup.
  */
 
-#include "chip/lpc11_memorymap.h"
+#include "hardware/lpc11_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc11xx/chip/lpc111x_iocon.h b/arch/arm/src/lpc11xx/hardware/lpc111x_iocon.h
similarity index 98%
rename from arch/arm/src/lpc11xx/chip/lpc111x_iocon.h
rename to arch/arm/src/lpc11xx/hardware/lpc111x_iocon.h
index 61fc8877a12..1836d35dc1e 100644
--- a/arch/arm/src/lpc11xx/chip/lpc111x_iocon.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc111x_iocon.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc111x_iocon.h
+ * arch/arm/src/lpc11xx/hardware/lpc111x_iocon.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Rommel Marcelo
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_CHIP_LPC111X_IOCON_H
-#define __ARCH_ARM_SRC_LPC11XX_CHIP_LPC111X_IOCON_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC111X_IOCON_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC111X_IOCON_H
 
 /************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc11_memorymap.h"
+#include "hardware/lpc11_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -266,4 +266,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC118X_IOCON_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC118X_IOCON_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc111x_memorymap.h b/arch/arm/src/lpc11xx/hardware/lpc111x_memorymap.h
similarity index 95%
rename from arch/arm/src/lpc11xx/chip/lpc111x_memorymap.h
rename to arch/arm/src/lpc11xx/hardware/lpc111x_memorymap.h
index 21c12d01b03..948d9e89945 100644
--- a/arch/arm/src/lpc11xx/chip/lpc111x_memorymap.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc111x_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/lpc111x_memorymap.h
+ * arch/arm/src/lpc11xx/hardware/lpc111x_memorymap.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_LPC111X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_LPC11XX_LPC111X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC111X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC111X_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -104,4 +104,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_LPC116X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC116X_MEMORYMAP_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc111x_pinconfig.h b/arch/arm/src/lpc11xx/hardware/lpc111x_pinconfig.h
similarity index 96%
rename from arch/arm/src/lpc11xx/chip/lpc111x_pinconfig.h
rename to arch/arm/src/lpc11xx/hardware/lpc111x_pinconfig.h
index 0c40b08ac54..e160b554b67 100644
--- a/arch/arm/src/lpc11xx/chip/lpc111x_pinconfig.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc111x_pinconfig.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc111x_pinconfig.h
+ * arch/arm/src/lpc11xx/hardware/lpc111x_pinconfig.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_CHIP_LPC111X_PINCONFIG_H
-#define __ARCH_ARM_SRC_LPC11XX_CHIP_LPC111X_PINCONFIG_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC111X_PINCONFIG_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC111X_PINCONFIG_H
 
 /************************************************************************************
  * Included Files
@@ -119,4 +119,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC116X_PINCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC116X_PINCONFIG_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_adc.h b/arch/arm/src/lpc11xx/hardware/lpc11_adc.h
similarity index 97%
rename from arch/arm/src/lpc11xx/chip/lpc11_adc.h
rename to arch/arm/src/lpc11xx/hardware/lpc11_adc.h
index 1324bff6c22..a1566b05140 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_adc.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc11_adc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc11_adc.h
+ * arch/arm/src/lpc11xx/hardware/lpc11_adc.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_LPC11_CHIP_ADC_H
-#define __ARCH_ARM_SRC_LPC11XX_LPC11_CHIP_ADC_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_CHIP_ADC_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_CHIP_ADC_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc11_memorymap.h"
+#include "hardware/lpc11_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -168,4 +168,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_LPC11_CHIP_ADC_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_CHIP_ADC_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_gpio.h b/arch/arm/src/lpc11xx/hardware/lpc11_gpio.h
similarity index 97%
rename from arch/arm/src/lpc11xx/chip/lpc11_gpio.h
rename to arch/arm/src/lpc11xx/hardware/lpc11_gpio.h
index 99daa2445f7..93ae758a090 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_gpio.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc11_gpio.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc11_gpio.h
+ * arch/arm/src/lpc11xx/hardware/lpc11_gpio.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_LPC11_CHIP_GPIO_H
-#define __ARCH_ARM_SRC_LPC11XX_LPC11_CHIP_GPIO_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_CHIP_GPIO_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_CHIP_GPIO_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc11_memorymap.h"
+#include "hardware/lpc11_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -143,4 +143,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_LPC11_CHIP_GPIO_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_CHIP_GPIO_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_i2c.h b/arch/arm/src/lpc11xx/hardware/lpc11_i2c.h
similarity index 97%
rename from arch/arm/src/lpc11xx/chip/lpc11_i2c.h
rename to arch/arm/src/lpc11xx/hardware/lpc11_i2c.h
index 53c7089c6ee..84384fca051 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_i2c.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc11_i2c.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc11_i2c.h
+ * arch/arm/src/lpc11xx/hardware/lpc11_i2c.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_I2C_H
-#define __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_I2C_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_I2C_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_I2C_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc11_memorymap.h"
+#include "hardware/lpc11_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -205,4 +205,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_I2C_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_I2C_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_memorymap.h b/arch/arm/src/lpc11xx/hardware/lpc11_memorymap.h
similarity index 91%
rename from arch/arm/src/lpc11xx/chip/lpc11_memorymap.h
rename to arch/arm/src/lpc11xx/hardware/lpc11_memorymap.h
index c01a346c269..24f6cdf1cce 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_memorymap.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc11_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc11_memorymap.h
+ * arch/arm/src/lpc11xx/hardware/lpc11_memorymap.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_MEMORYMAP_H
-#define __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_MEMORYMAP_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -49,7 +49,7 @@
 #include <arch/lpc11xx/chip.h>
 
 #if defined(LPC111x)
-#  include "chip/lpc111x_memorymap.h"
+#  include "hardware/lpc111x_memorymap.h"
 #else
 #  error "Unrecognized LPC11xx family"
 #endif
@@ -70,4 +70,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_MEMORYMAP_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_pinconfig.h b/arch/arm/src/lpc11xx/hardware/lpc11_pinconfig.h
similarity index 91%
rename from arch/arm/src/lpc11xx/chip/lpc11_pinconfig.h
rename to arch/arm/src/lpc11xx/hardware/lpc11_pinconfig.h
index c53b6b3d37e..08c6ab11d1e 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_pinconfig.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc11_pinconfig.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc11_pinconfig.h
+ * arch/arm/src/lpc11xx/hardware/lpc11_pinconfig.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_PINCONFIG_H
-#define __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_PINCONFIG_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_PINCONFIG_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_PINCONFIG_H
 
 /************************************************************************************
  * Included Files
@@ -49,7 +49,7 @@
 #include <arch/lpc11xx/chip.h>
 
 #if defined(LPC111x)
-#  include "chip/lpc111x_pinconfig.h"
+#  include "hardware/lpc111x_pinconfig.h"
 #else
 #  error "Unrecognized LPC11xx family"
 #endif
@@ -70,4 +70,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_PINCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_PINCONFIG_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_pmu.h b/arch/arm/src/lpc11xx/hardware/lpc11_pmu.h
similarity index 95%
rename from arch/arm/src/lpc11xx/chip/lpc11_pmu.h
rename to arch/arm/src/lpc11xx/hardware/lpc11_pmu.h
index 6a8b5a6865e..226405bc038 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_pmu.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc11_pmu.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc11_pmu.h
+ * arch/arm/src/lpc11xx/hardware/lpc11_pmu.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_PMU_H
-#define __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_PMU_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_PMU_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_PMU_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc11_memorymap.h"
+#include "hardware/lpc11_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -103,4 +103,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_PMU_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_PMU_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_ssp.h b/arch/arm/src/lpc11xx/hardware/lpc11_ssp.h
similarity index 97%
rename from arch/arm/src/lpc11xx/chip/lpc11_ssp.h
rename to arch/arm/src/lpc11xx/hardware/lpc11_ssp.h
index 1c67102c044..ad64d838408 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_ssp.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc11_ssp.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc11_ssp.h
+ * arch/arm/src/lpc11xx/hardware/lpc11_ssp.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_SSP_H
-#define __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_SSP_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_SSP_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_SSP_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc11_memorymap.h"
+#include "hardware/lpc11_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -179,4 +179,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_SPI_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_SPI_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_syscon.h b/arch/arm/src/lpc11xx/hardware/lpc11_syscon.h
similarity index 99%
rename from arch/arm/src/lpc11xx/chip/lpc11_syscon.h
rename to arch/arm/src/lpc11xx/hardware/lpc11_syscon.h
index 62f48680535..ac9a15477c1 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_syscon.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc11_syscon.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc11_syscon.h
+ * arch/arm/src/lpc11xx/hardware/lpc11_syscon.h
  *
  *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_SYSCON_H
-#define __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_SYSCON_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_SYSCON_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_SYSCON_H
 
 /********************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc11_memorymap.h"
+#include "hardware/lpc11_memorymap.h"
 
 /********************************************************************************************
  * Pre-processor Definitions
@@ -446,4 +446,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_SYSCON_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_SYSCON_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_timer.h b/arch/arm/src/lpc11xx/hardware/lpc11_timer.h
similarity index 98%
rename from arch/arm/src/lpc11xx/chip/lpc11_timer.h
rename to arch/arm/src/lpc11xx/hardware/lpc11_timer.h
index 28e1122323b..cc343f28c0a 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_timer.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc11_timer.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc11_timer.h
+ * arch/arm/src/lpc11xx/hardware/lpc11_timer.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_TIMER_H
-#define __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_TIMER_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_TIMER_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_TIMER_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc11_memorymap.h"
+#include "hardware/lpc11_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -268,4 +268,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_TIMER_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_TIMER_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_uart.h b/arch/arm/src/lpc11xx/hardware/lpc11_uart.h
similarity index 98%
rename from arch/arm/src/lpc11xx/chip/lpc11_uart.h
rename to arch/arm/src/lpc11xx/hardware/lpc11_uart.h
index 7d3dffd3b24..a8be2e9bbe0 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_uart.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc11_uart.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc11_uart.h
+ * arch/arm/src/lpc11xx/hardware/lpc11_uart.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_UART_H
-#define __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_UART_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_UART_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_UART_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc11_memorymap.h"
+#include "hardware/lpc11_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -258,4 +258,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_CHIP_LPC11_UART_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_UART_H */
diff --git a/arch/arm/src/lpc11xx/chip/lpc11_wdt.h b/arch/arm/src/lpc11xx/hardware/lpc11_wdt.h
similarity index 95%
rename from arch/arm/src/lpc11xx/chip/lpc11_wdt.h
rename to arch/arm/src/lpc11xx/hardware/lpc11_wdt.h
index e17eb48048d..9f3f5a99dc4 100644
--- a/arch/arm/src/lpc11xx/chip/lpc11_wdt.h
+++ b/arch/arm/src/lpc11xx/hardware/lpc11_wdt.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc11xx/chip/lpc11_wdt.h
+ * arch/arm/src/lpc11xx/hardware/lpc11_wdt.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC11XX_LPC11_WDT_H
-#define __ARCH_ARM_SRC_LPC11XX_LPC11_WDT_H
+#ifndef __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_WDT_H
+#define __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_WDT_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc11_memorymap.h"
+#include "hardware/lpc11_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -99,4 +99,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC11XX_LPC11_WDT_H */
+#endif /* __ARCH_ARM_SRC_LPC11XX_HARDWARE_LPC11_WDT_H */
diff --git a/arch/arm/src/lpc11xx/lpc111x_gpio.c b/arch/arm/src/lpc11xx/lpc111x_gpio.c
index cba1ee71734..630d68f9b16 100644
--- a/arch/arm/src/lpc11xx/lpc111x_gpio.c
+++ b/arch/arm/src/lpc11xx/lpc111x_gpio.c
@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "chip/lpc111x_iocon.h"
+#include "hardware/lpc111x_iocon.h"
 #include "lpc11_gpio.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc11xx/lpc11_clockconfig.c b/arch/arm/src/lpc11xx/lpc11_clockconfig.c
index 804b6d29610..f906de18dd8 100644
--- a/arch/arm/src/lpc11xx/lpc11_clockconfig.c
+++ b/arch/arm/src/lpc11xx/lpc11_clockconfig.c
@@ -48,9 +48,9 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "lpc11_clockconfig.h"
-#include "chip/lpc11_syscon.h"
-#include "chip/lpc111x_iocon.h"
-#include "chip/lpc11_gpio.h"
+#include "hardware/lpc11_syscon.h"
+#include "hardware/lpc111x_iocon.h"
+#include "hardware/lpc11_gpio.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc11xx/lpc11_gpio.h b/arch/arm/src/lpc11xx/lpc11_gpio.h
index f77b748613e..dea2a0cef8f 100644
--- a/arch/arm/src/lpc11xx/lpc11_gpio.h
+++ b/arch/arm/src/lpc11xx/lpc11_gpio.h
@@ -49,8 +49,8 @@
 
 #include <arch/lpc11xx/chip.h>
 
-#include "chip/lpc11_gpio.h"
-#include "chip/lpc11_pinconfig.h"
+#include "hardware/lpc11_gpio.h"
+#include "hardware/lpc11_pinconfig.h"
 
 /* Include the GPIO definitions for the selected LPC17xx family. */
 
diff --git a/arch/arm/src/lpc11xx/lpc11_i2c.c b/arch/arm/src/lpc11xx/lpc11_i2c.c
index 5873a18ff3a..0fee3d96025 100644
--- a/arch/arm/src/lpc11xx/lpc11_i2c.c
+++ b/arch/arm/src/lpc11xx/lpc11_i2c.c
@@ -70,7 +70,7 @@
 #include "up_internal.h"
 
 #include "chip.h"
-#include "chip/lpc11_syscon.h"
+#include "hardware/lpc11_syscon.h"
 #include "lpc11_gpio.h"
 #include "lpc11_i2c.h"
 
diff --git a/arch/arm/src/lpc11xx/lpc11_i2c.h b/arch/arm/src/lpc11xx/lpc11_i2c.h
index cd739be1a3a..27a490b20ef 100644
--- a/arch/arm/src/lpc11xx/lpc11_i2c.h
+++ b/arch/arm/src/lpc11xx/lpc11_i2c.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/i2c/i2c_master.h>
-#include "chip/lpc11_i2c.h"
+#include "hardware/lpc11_i2c.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/lpc11xx/lpc11_lowputc.c b/arch/arm/src/lpc11xx/lpc11_lowputc.c
index dcba013127f..8bf3759f488 100644
--- a/arch/arm/src/lpc11xx/lpc11_lowputc.c
+++ b/arch/arm/src/lpc11xx/lpc11_lowputc.c
@@ -47,8 +47,8 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "chip/lpc11_syscon.h"
-#include "chip/lpc11_uart.h"
+#include "hardware/lpc11_syscon.h"
+#include "hardware/lpc11_uart.h"
 
 #include "lpc11_gpio.h"
 #include "lpc11_lowputc.h"
diff --git a/arch/arm/src/lpc11xx/lpc11_serial.c b/arch/arm/src/lpc11xx/lpc11_serial.c
index 95f3f17bc61..00ec359fb2f 100644
--- a/arch/arm/src/lpc11xx/lpc11_serial.c
+++ b/arch/arm/src/lpc11xx/lpc11_serial.c
@@ -62,7 +62,7 @@
 #include "up_internal.h"
 
 #include "chip.h"
-#include "chip/lpc11_uart.h"
+#include "hardware/lpc11_uart.h"
 #include "lpc11_gpio.h"
 #include "lpc11_serial.h"
 
diff --git a/arch/arm/src/lpc11xx/lpc11_serial.h b/arch/arm/src/lpc11xx/lpc11_serial.h
index 59e6cc36f08..82d4e59051a 100644
--- a/arch/arm/src/lpc11xx/lpc11_serial.h
+++ b/arch/arm/src/lpc11xx/lpc11_serial.h
@@ -43,8 +43,8 @@
 #include <nuttx/config.h>
 #include <arch/board/board.h>
 
-#include "chip/lpc11_uart.h"
-#include "chip/lpc11_syscon.h"
+#include "hardware/lpc11_uart.h"
+#include "hardware/lpc11_syscon.h"
 
 #include "lpc11_gpio.h"
 
diff --git a/arch/arm/src/lpc11xx/lpc11_spi.c b/arch/arm/src/lpc11xx/lpc11_spi.c
index e1bb8e0d6ca..78b306549ba 100644
--- a/arch/arm/src/lpc11xx/lpc11_spi.c
+++ b/arch/arm/src/lpc11xx/lpc11_spi.c
@@ -55,7 +55,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/lpc11_syscon.h"
+#include "hardware/lpc11_syscon.h"
 #include "lpc11_gpio.h"
 #include "lpc11_spi.h"
 
diff --git a/arch/arm/src/lpc11xx/lpc11_spi.h b/arch/arm/src/lpc11xx/lpc11_spi.h
index 30ee2bbecff..3e81dbc97c9 100644
--- a/arch/arm/src/lpc11xx/lpc11_spi.h
+++ b/arch/arm/src/lpc11xx/lpc11_spi.h
@@ -44,7 +44,7 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "chip/lpc11_spi.h"
+#include "hardware/lpc11_spi.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc11xx/lpc11_ssp.c b/arch/arm/src/lpc11xx/lpc11_ssp.c
index c0c1498f7e6..780a8945626 100644
--- a/arch/arm/src/lpc11xx/lpc11_ssp.c
+++ b/arch/arm/src/lpc11xx/lpc11_ssp.c
@@ -55,7 +55,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/lpc11_syscon.h"
+#include "hardware/lpc11_syscon.h"
 #include "lpc11_gpio.h"
 #include "lpc11_ssp.h"
 
diff --git a/arch/arm/src/lpc11xx/lpc11_ssp.h b/arch/arm/src/lpc11xx/lpc11_ssp.h
index 825c67faa3a..c38b4dbdf2f 100644
--- a/arch/arm/src/lpc11xx/lpc11_ssp.h
+++ b/arch/arm/src/lpc11xx/lpc11_ssp.h
@@ -44,7 +44,7 @@
 
 #include <nuttx/spi/spi.h>
 
-#include "chip/lpc11_ssp.h"
+#include "hardware/lpc11_ssp.h"
 
 #if defined(CONFIG_LPC11_SSP0) || defined(CONFIG_LPC11_SSP1)
 
diff --git a/arch/arm/src/lpc11xx/lpc11_timer.c b/arch/arm/src/lpc11xx/lpc11_timer.c
index 75d3d334a43..3af6342cd58 100644
--- a/arch/arm/src/lpc11xx/lpc11_timer.c
+++ b/arch/arm/src/lpc11xx/lpc11_timer.c
@@ -54,9 +54,9 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/lpc11_syscon.h"
+#include "hardware/lpc11_syscon.h"
 #include "lpc11_timer.h"
-#include "chip/lpc116x_pinconfig.h"
+#include "hardware/lpc116x_pinconfig.h"
 #include "lpc11_gpio.h"
 #include "lpc116x_gpio.h"
 
diff --git a/arch/arm/src/lpc11xx/lpc11_timer.h b/arch/arm/src/lpc11xx/lpc11_timer.h
index edfb621c169..02f58a50ca7 100644
--- a/arch/arm/src/lpc11xx/lpc11_timer.h
+++ b/arch/arm/src/lpc11xx/lpc11_timer.h
@@ -41,7 +41,7 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc11_timer.h"
+#include "hardware/lpc11_timer.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc11xx/lpc11_wdt.h b/arch/arm/src/lpc11xx/lpc11_wdt.h
index d963b4b064e..f2b073b5833 100644
--- a/arch/arm/src/lpc11xx/lpc11_wdt.h
+++ b/arch/arm/src/lpc11xx/lpc11_wdt.h
@@ -41,7 +41,7 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc11_wdt.h"
+#include "hardware/lpc11_wdt.h"
 
 /************************************************************************************
  * Pre-processor Definitions