diff --git a/arch/arm/src/lpc43xx/chip.h b/arch/arm/src/lpc43xx/chip.h
index 59702c7948..dee6106b4f 100644
--- a/arch/arm/src/lpc43xx/chip.h
+++ b/arch/arm/src/lpc43xx/chip.h
@@ -67,88 +67,88 @@
 
 #if defined(CONFIG_ARCH_CHIP_LPC4310FBD144)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc4310203050_memorymap.h"
-#  include "chip/lpc4310203050_pinconfig.h"
+#  include "hardware/lpc4310203050_memorymap.h"
+#  include "hardware/lpc4310203050_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4310FET100)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc4310203050_memorymap.h"
-#  include "chip/lpc4310203050_pinconfig.h"
+#  include "hardware/lpc4310203050_memorymap.h"
+#  include "hardware/lpc4310203050_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4320FBD144)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc4310203050_memorymap.h"
-#  include "chip/lpc4310203050_pinconfig.h"
+#  include "hardware/lpc4310203050_memorymap.h"
+#  include "hardware/lpc4310203050_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4320FET100)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc4310203050_memorymap.h"
-#  include "chip/lpc4310203050_pinconfig.h"
+#  include "hardware/lpc4310203050_memorymap.h"
+#  include "hardware/lpc4310203050_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4330FBD144)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc4310203050_memorymap.h"
-#  include "chip/lpc4310203050_pinconfig.h"
+#  include "hardware/lpc4310203050_memorymap.h"
+#  include "hardware/lpc4310203050_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4330FET100)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc4310203050_memorymap.h"
-#  include "chip/lpc4310203050_pinconfig.h"
+#  include "hardware/lpc4310203050_memorymap.h"
+#  include "hardware/lpc4310203050_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4330FET180)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc4310203050_memorymap.h"
-#  include "chip/lpc4310203050_pinconfig.h"
+#  include "hardware/lpc4310203050_memorymap.h"
+#  include "hardware/lpc4310203050_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4330FET256)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc4310203050_memorymap.h"
-#  include "chip/lpc4310203050_pinconfig.h"
+#  include "hardware/lpc4310203050_memorymap.h"
+#  include "hardware/lpc4310203050_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4337JBD144)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc435357_memorymap.h"
-#  include "chip/lpc4357fet256_pinconfig.h"
+#  include "hardware/lpc435357_memorymap.h"
+#  include "hardware/lpc4357fet256_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4337FET256)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc435357_memorymap.h"
-#  include "chip/lpc4310203050_pinconfig.h"
+#  include "hardware/lpc435357_memorymap.h"
+#  include "hardware/lpc4310203050_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4350FBD208)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc4310203050_memorymap.h"
-#  include "chip/lpc4310203050_pinconfig.h"
+#  include "hardware/lpc4310203050_memorymap.h"
+#  include "hardware/lpc4310203050_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4350FET180)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc4310203050_memorymap.h"
-#  include "chip/lpc4310203050_pinconfig.h"
+#  include "hardware/lpc4310203050_memorymap.h"
+#  include "hardware/lpc4310203050_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4350FET256)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc4310203050_memorymap.h"
-#  include "chip/lpc4310203050_pinconfig.h"
+#  include "hardware/lpc4310203050_memorymap.h"
+#  include "hardware/lpc4310203050_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4353FBD208)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc435357_memorymap.h"
-#  include "chip/lpc4353fbd208_pinconfig.h"
+#  include "hardware/lpc435357_memorymap.h"
+#  include "hardware/lpc4353fbd208_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4353FET180)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc435357_memorymap.h"
-#  include "chip/lpc4353fet180_pinconfig.h"
+#  include "hardware/lpc435357_memorymap.h"
+#  include "hardware/lpc4353fet180_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4353FET256)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc435357_memorymap.h"
-#  include "chip/lpc4353fet256_pinconfig.h"
+#  include "hardware/lpc435357_memorymap.h"
+#  include "hardware/lpc4353fet256_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4357FET180)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc435357_memorymap.h"
-#  include "chip/lpc4357fet180_pinconfig.h"
+#  include "hardware/lpc435357_memorymap.h"
+#  include "hardware/lpc4357fet180_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4357FBD208)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc435357_memorymap.h"
-#  include "chip/lpc4357fbd208_pinconfig.h"
+#  include "hardware/lpc435357_memorymap.h"
+#  include "hardware/lpc4357fbd208_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4357FET256)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc435357_memorymap.h"
-#  include "chip/lpc4357fet256_pinconfig.h"
+#  include "hardware/lpc435357_memorymap.h"
+#  include "hardware/lpc4357fet256_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4370FET100)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc435357_memorymap.h"
-#  include "chip/lpc4357fet256_pinconfig.h"
+#  include "hardware/lpc435357_memorymap.h"
+#  include "hardware/lpc4357fet256_pinconfig.h"
 #elif defined(CONFIG_ARCH_CHIP_LPC4337JET100)
 #  define  ARMV7M_PERIPHERAL_INTERRUPTS 53
-#  include "chip/lpc435357_memorymap.h"
-#  include "chip/lpc4337jet100_pinconfig.h"
+#  include "hardware/lpc435357_memorymap.h"
+#  include "hardware/lpc4337jet100_pinconfig.h"
 #else
 #  error "Unsupported LPC43xx chip"
 #endif
diff --git a/arch/arm/src/lpc43xx/chip/lpc4310203050_memorymap.h b/arch/arm/src/lpc43xx/hardware/lpc4310203050_memorymap.h
similarity index 97%
rename from arch/arm/src/lpc43xx/chip/lpc4310203050_memorymap.h
rename to arch/arm/src/lpc43xx/hardware/lpc4310203050_memorymap.h
index 33de4577d2..ea5669bd73 100644
--- a/arch/arm/src/lpc43xx/chip/lpc4310203050_memorymap.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc4310203050_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc4310203050_memorymap.h
+ * arch/arm/src/lpc43xx/hardware/lpc4310203050_memorymap.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC4310203050_MEMORYMAP_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC4310203050_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4310203050_MEMORYMAP_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4310203050_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -193,4 +193,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC4310203050_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4310203050_MEMORYMAP_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc4310203050_pinconfig.h b/arch/arm/src/lpc43xx/hardware/lpc4310203050_pinconfig.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc4310203050_pinconfig.h
rename to arch/arm/src/lpc43xx/hardware/lpc4310203050_pinconfig.h
index bd61476e89..79dd54d28c 100644
--- a/arch/arm/src/lpc43xx/chip/lpc4310203050_pinconfig.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc4310203050_pinconfig.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc4310203050_pinconfig.h
+ * arch/arm/src/lpc43xx/hardware/lpc4310203050_pinconfig.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC4310203050_PINCONF_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC4310203050_PINCONF_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4310203050_PINCONF_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4310203050_PINCONF_H
 
 /****************************************************************************************************
  * Included Files
@@ -986,4 +986,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC4310203050_PINCONF_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4310203050_PINCONF_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc4337jet100_pinconfig.h b/arch/arm/src/lpc43xx/hardware/lpc4337jet100_pinconfig.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc4337jet100_pinconfig.h
rename to arch/arm/src/lpc43xx/hardware/lpc4337jet100_pinconfig.h
index 7f74cd821a..f64194353c 100644
--- a/arch/arm/src/lpc43xx/chip/lpc4337jet100_pinconfig.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc4337jet100_pinconfig.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc4337jet100_pinconfig.h
+ * arch/arm/src/lpc43xx/hardware/lpc4337jet100_pinconfig.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC4337JET100_PINCONF_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC4337JET100_PINCONF_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4337JET100_PINCONF_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4337JET100_PINCONF_H
 
 /****************************************************************************************************
  * Included Files
@@ -985,4 +985,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC4337JET100_PINCONF_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4337JET100_PINCONF_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc435357_memorymap.h b/arch/arm/src/lpc43xx/hardware/lpc435357_memorymap.h
similarity index 97%
rename from arch/arm/src/lpc43xx/chip/lpc435357_memorymap.h
rename to arch/arm/src/lpc43xx/hardware/lpc435357_memorymap.h
index 852bd2a862..956c869dfa 100644
--- a/arch/arm/src/lpc43xx/chip/lpc435357_memorymap.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc435357_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc435357_memorymap.h
+ * arch/arm/src/lpc43xx/hardware/lpc435357_memorymap.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC435357_MEMORYMAP_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC435357_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC435357_MEMORYMAP_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC435357_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -199,4 +199,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC435357_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC435357_MEMORYMAP_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc4357fet256_pinconfig.h b/arch/arm/src/lpc43xx/hardware/lpc4357fet256_pinconfig.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc4357fet256_pinconfig.h
rename to arch/arm/src/lpc43xx/hardware/lpc4357fet256_pinconfig.h
index 0db1e91963..6f002d4dfc 100644
--- a/arch/arm/src/lpc43xx/chip/lpc4357fet256_pinconfig.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc4357fet256_pinconfig.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc4310203050_pinconfig.h
+ * arch/arm/src/lpc43xx/hardware/lpc4310203050_pinconfig.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC4357FET256_PINCONF_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC4357FET256_PINCONF_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4357FET256_PINCONF_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4357FET256_PINCONF_H
 
 /****************************************************************************************************
  * Included Files
@@ -984,4 +984,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC4357FET256_PINCONF_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC4357FET256_PINCONF_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_adc.h b/arch/arm/src/lpc43xx/hardware/lpc43_adc.h
similarity index 98%
rename from arch/arm/src/lpc43xx/chip/lpc43_adc.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_adc.h
index 523cbcb45c..292589f1c4 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_adc.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_adc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_adc.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_adc.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_ADC_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_ADC_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_ADC_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_ADC_H
 
 /************************************************************************************
  * Included Files
@@ -195,4 +195,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_ADC_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_ADC_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_aes.h b/arch/arm/src/lpc43xx/hardware/lpc43_aes.h
similarity index 95%
rename from arch/arm/src/lpc43xx/chip/lpc43_aes.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_aes.h
index fbd557f3d4..087907ecab 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_aes.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_aes.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_aes.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_aes.h
  *
  *   Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_AES_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_AES_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_AES_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_AES_H
 
 /************************************************************************************
  * Included Files
@@ -123,4 +123,4 @@ enum lpc43_aes_errorcodes_e
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_AES_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_AES_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_atimer.h b/arch/arm/src/lpc43xx/hardware/lpc43_atimer.h
similarity index 96%
rename from arch/arm/src/lpc43xx/chip/lpc43_atimer.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_atimer.h
index 1a5ef86027..40bfad4f72 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_atimer.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_atimer.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_atimer.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_atimer.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_ATIMER_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_ATIMER_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_ATIMER_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_ATIMER_H
 
 /************************************************************************************
  * Included Files
@@ -114,4 +114,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_ATIMER_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_ATIMER_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_can.h b/arch/arm/src/lpc43xx/hardware/lpc43_can.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_can.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_can.h
index c03ceab04b..1519529882 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_can.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_can.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_can.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_can.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_CAN_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_CAN_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_CAN_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_CAN_H
 
 /************************************************************************************
  * Included Files
@@ -455,4 +455,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_CAN_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_CAN_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_ccu.h b/arch/arm/src/lpc43xx/hardware/lpc43_ccu.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_ccu.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_ccu.h
index 51cdcdb9fc..1bec32d81f 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_ccu.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_ccu.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_ccu.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_ccu.h
  *
  *   Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_CCU_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_CCU_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_CCU_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_CCU_H
 
 /****************************************************************************************************
  * Included Files
@@ -373,4 +373,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_CCU_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_CCU_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_cgu.h b/arch/arm/src/lpc43xx/hardware/lpc43_cgu.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_cgu.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_cgu.h
index 7f60f38836..b2059f86a9 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_cgu.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_cgu.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_cgu.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_cgu.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_CGU_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_CGU_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_CGU_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_CGU_H
 
 /****************************************************************************************************
  * Included Files
@@ -888,4 +888,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_CGU_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_CGU_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_creg.h b/arch/arm/src/lpc43xx/hardware/lpc43_creg.h
similarity index 98%
rename from arch/arm/src/lpc43xx/chip/lpc43_creg.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_creg.h
index 61a62e6940..046be810dc 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_creg.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_creg.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_creg.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_creg.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_CREG_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_CREG_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_CREG_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_CREG_H
 
 /************************************************************************************
  * Included Files
@@ -288,4 +288,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_CREG_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_CREG_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_dac.h b/arch/arm/src/lpc43xx/hardware/lpc43_dac.h
similarity index 95%
rename from arch/arm/src/lpc43xx/chip/lpc43_dac.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_dac.h
index e06ecf442c..d1d08c6e87 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_dac.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_dac.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_dac.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_dac.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_DAC_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_DAC_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_DAC_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_DAC_H
 
 /************************************************************************************
  * Included Files
@@ -91,4 +91,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_DAC_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_DAC_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_eeprom.h b/arch/arm/src/lpc43xx/hardware/lpc43_eeprom.h
similarity index 97%
rename from arch/arm/src/lpc43xx/chip/lpc43_eeprom.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_eeprom.h
index 8b0398447e..d5cf561500 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_eeprom.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_eeprom.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_eeprom.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_eeprom.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_EEPROM_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_EEPROM_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_EEPROM_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_EEPROM_H
 
 /************************************************************************************
  * Included Files
@@ -155,4 +155,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_EEPROM_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_EEPROM_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_emc.h b/arch/arm/src/lpc43xx/hardware/lpc43_emc.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_emc.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_emc.h
index b61cbcbc58..730df06271 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_emc.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_emc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_emc.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_emc.h
  *
  *   Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_EMC_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_EMC_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_EMC_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_EMC_H
 
 /****************************************************************************************************
  * Included Files
@@ -504,4 +504,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_EMC_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_EMC_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_ethernet.h b/arch/arm/src/lpc43xx/hardware/lpc43_ethernet.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_ethernet.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_ethernet.h
index d03ed7123b..c0d34d1b1b 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_ethernet.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_ethernet.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_ethernet.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_ethernet.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_ETHERNET_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_ETHERNET_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_ETHERNET_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_ETHERNET_H
 
 /****************************************************************************************************
  * Included Files
@@ -654,4 +654,4 @@ struct eth_rxdesc_s
  ****************************************************************************************************/
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_ETHERNET_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_ETHERNET_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_evntmntr.h b/arch/arm/src/lpc43xx/hardware/lpc43_evntmntr.h
similarity index 97%
rename from arch/arm/src/lpc43xx/chip/lpc43_evntmntr.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_evntmntr.h
index a12112eced..85854a9499 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_evntmntr.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_evntmntr.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_eventmntr.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_eventmntr.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_EVNTMNTR_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_EVNTMNTR_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_EVNTMNTR_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_EVNTMNTR_H
 
 /****************************************************************************************************
  * Included Files
@@ -147,4 +147,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_EVNTMNTR_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_EVNTMNTR_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_evntrtr.h b/arch/arm/src/lpc43xx/hardware/lpc43_evntrtr.h
similarity index 97%
rename from arch/arm/src/lpc43xx/chip/lpc43_evntrtr.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_evntrtr.h
index 1287dfd875..c4ce2e925d 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_evntrtr.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_evntrtr.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_evntrtr.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_evntrtr.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_EVNTRTR_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_EVNTRTR_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_EVNTRTR_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_EVNTRTR_H
 
 /************************************************************************************
  * Included Files
@@ -156,4 +156,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_EVNTRTR_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_EVNTRTR_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_flash.h b/arch/arm/src/lpc43xx/hardware/lpc43_flash.h
similarity index 96%
rename from arch/arm/src/lpc43xx/chip/lpc43_flash.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_flash.h
index 4f99484dac..1b8d2e9c35 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_flash.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_flash.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_flash.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_flash.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_FLASH_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_FLASH_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_FLASH_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_FLASH_H
 
 /************************************************************************************
  * Included Files
@@ -184,4 +184,4 @@ typedef void (*iap_t)(unsigned int *cmd, unsigned int *result);
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_FLASH_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_FLASH_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_gima.h b/arch/arm/src/lpc43xx/hardware/lpc43_gima.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_gima.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_gima.h
index 993242ebe4..58cbf9528e 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_gima.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_gima.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_gima.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_gima.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_GIMA_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_GIMA_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_GIMA_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_GIMA_H
 
 /****************************************************************************************************
  * Included Files
@@ -333,4 +333,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_GIMA_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_GIMA_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_gpdma.h b/arch/arm/src/lpc43xx/hardware/lpc43_gpdma.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_gpdma.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_gpdma.h
index 6becfe9222..ab1599d1fb 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_gpdma.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_gpdma.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_gpdma.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_gpdma.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_GPDMA_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_GPDMA_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_GPDMA_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_GPDMA_H
 
 /****************************************************************************************************
  * Included Files
@@ -469,4 +469,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_GPDMA_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_GPDMA_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_gpio.h b/arch/arm/src/lpc43xx/hardware/lpc43_gpio.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_gpio.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_gpio.h
index a4d0ad7ad0..cf1c255578 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_gpio.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_gpio.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_gpio.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_gpio.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_GPIO_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_GPIO_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_GPIO_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_GPIO_H
 
 /****************************************************************************************************
  * Included Files
@@ -438,4 +438,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_GPIO_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_GPIO_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_i2c.h b/arch/arm/src/lpc43xx/hardware/lpc43_i2c.h
similarity index 98%
rename from arch/arm/src/lpc43xx/chip/lpc43_i2c.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_i2c.h
index 000fbed515..ebdef8c6fb 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_i2c.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_i2c.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_i2c.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_i2c.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_I2C_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_I2C_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_I2C_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_I2C_H
 
 /************************************************************************************
  * Included Files
@@ -202,4 +202,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_I2C_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_I2C_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_i2s.h b/arch/arm/src/lpc43xx/hardware/lpc43_i2s.h
similarity index 98%
rename from arch/arm/src/lpc43xx/chip/lpc43_i2s.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_i2s.h
index 71fc875e98..861c8489f4 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_i2s.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_i2s.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_i2s
+ * arch/arm/src/lpc43xx/hardware/lpc43_i2s
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_I2S_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_I2S_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_I2S_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_I2S_H
 
 /************************************************************************************
  * Included Files
@@ -199,4 +199,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_I2S_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_I2S_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_lcd.h b/arch/arm/src/lpc43xx/hardware/lpc43_lcd.h
similarity index 98%
rename from arch/arm/src/lpc43xx/chip/lpc43_lcd.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_lcd.h
index 5762bed5e2..0899235c09 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_lcd.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_lcd.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_lcd.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_lcd.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_LCD_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_LCD_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_LCD_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_LCD_H
 
 /****************************************************************************************************
  * Included Files
@@ -301,4 +301,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_LCD_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_LCD_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_mcpwm.h b/arch/arm/src/lpc43xx/hardware/lpc43_mcpwm.h
similarity index 98%
rename from arch/arm/src/lpc43xx/chip/lpc43_mcpwm.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_mcpwm.h
index 720b8affc4..76a67434b9 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_mcpwm.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_mcpwm.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_mcpwm.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_mcpwm.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_MCPWM_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_MCPWM_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_MCPWM_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_MCPWM_H
 
 /************************************************************************************
  * Included Files
@@ -271,4 +271,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_MCPWM_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_MCPWM_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_otp.h b/arch/arm/src/lpc43xx/hardware/lpc43_otp.h
similarity index 97%
rename from arch/arm/src/lpc43xx/chip/lpc43_otp.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_otp.h
index 45a777fd94..549ad0f53a 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_otp.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_otp.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_otp.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_otp.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_OTP_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_OTP_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_OTP_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_OTP_H
 
 /************************************************************************************
  * Included Files
@@ -189,4 +189,4 @@ struct lpc43_otp_s
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_OTP_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_OTP_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_pmc.h b/arch/arm/src/lpc43xx/hardware/lpc43_pmc.h
similarity index 94%
rename from arch/arm/src/lpc43xx/chip/lpc43_pmc.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_pmc.h
index 511c515a28..dc23971830 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_pmc.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_pmc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_pmc.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_pmc.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_PMC_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_PMC_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_PMC_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_PMC_H
 
 /************************************************************************************
  * Included Files
@@ -79,4 +79,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_PMC_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_PMC_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_qei.h b/arch/arm/src/lpc43xx/hardware/lpc43_qei.h
similarity index 98%
rename from arch/arm/src/lpc43xx/chip/lpc43_qei.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_qei.h
index 9994c4e9e7..acacade654 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_qei.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_qei.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_qei.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_qei.h
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_QEI_H
-#define __ARCH_ARM_SRC_LPC43XX_LPC43_QEI_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43QEI_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43QEI_H
 
 /************************************************************************************
  * Included Files
@@ -208,4 +208,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_QEI_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43QEI_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_rgu.h b/arch/arm/src/lpc43xx/hardware/lpc43_rgu.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_rgu.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_rgu.h
index acf2fdc5d8..c560cec5f7 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_rgu.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_rgu.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_rgu.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_rgu.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_RGU_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_RGU_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_RGU_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_RGU_H
 
 /****************************************************************************************************
  * Included Files
@@ -666,4 +666,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_RGU_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_RGU_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_rit.h b/arch/arm/src/lpc43xx/hardware/lpc43_rit.h
similarity index 95%
rename from arch/arm/src/lpc43xx/chip/lpc43_rit.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_rit.h
index 71671cd3ab..d7541f7f11 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_rit.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_rit.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_rit.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_rit.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Brandon Warhurst <warhurst_002@yahoo.com>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_RIT_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_RIT_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_RIT_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_RIT_H
 
 /************************************************************************************
  * Included Files
@@ -87,4 +87,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_RIT_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_RIT_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_rtc.h b/arch/arm/src/lpc43xx/hardware/lpc43_rtc.h
similarity index 98%
rename from arch/arm/src/lpc43xx/chip/lpc43_rtc.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_rtc.h
index 9713493543..9c518b9bc3 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_rtc.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_rtc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_rtc.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_rtc.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_LPC43_RTC_H
-#define __ARCH_ARM_SRC_LPC43XX_LPC43_RTC_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43RTC_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43RTC_H
 
 /************************************************************************************
  * Included Files
@@ -368,4 +368,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_LPC43_RTC_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43RTC_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_sct.h b/arch/arm/src/lpc43xx/hardware/lpc43_sct.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_sct.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_sct.h
index 4393d2cc41..1b38e3f9a0 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_sct.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_sct.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_sct.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_sct.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SCT_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SCT_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SCT_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SCT_H
 
 /****************************************************************************************************
  * Included Files
@@ -1525,4 +1525,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SCT_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SCT_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_scu.h b/arch/arm/src/lpc43xx/hardware/lpc43_scu.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_scu.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_scu.h
index 0c0dea3cb4..4075dd918b 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_scu.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_scu.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_scu.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_scu.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SCU_SCU_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SCU_SCU_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SCU_SCU_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SCU_SCU_H
 
 /****************************************************************************************************
  * Included Files
@@ -453,4 +453,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SCU_SCU_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SCU_SCU_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_sdmmc.h b/arch/arm/src/lpc43xx/hardware/lpc43_sdmmc.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_sdmmc.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_sdmmc.h
index a61c254894..05b8cbbd56 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_sdmmc.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_sdmmc.h
@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_sdmmc.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_sdmmc.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SDMMC_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SDMMC_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SDMMC_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SDMMC_H
 
 /************************************************************************************************
  * Included Files
@@ -406,4 +406,4 @@
  * Public Functions
  ************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SDMMC_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SDMMC_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_sgpio.h b/arch/arm/src/lpc43xx/hardware/lpc43_sgpio.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_sgpio.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_sgpio.h
index bb68b872a0..8b4c2b1ec1 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_sgpio.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_sgpio.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc43xx/chip/lpc43_sgpio.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_sgpio.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SGPIO_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SGPIO_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SGPIO_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SGPIO_H
 
 /****************************************************************************************************
  * Included Files
@@ -686,4 +686,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SGPIO_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SGPIO_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_spi.h b/arch/arm/src/lpc43xx/hardware/lpc43_spi.h
similarity index 97%
rename from arch/arm/src/lpc43xx/chip/lpc43_spi.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_spi.h
index 5f6e26d6b9..18f155099b 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_spi.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_spi.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_spi.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_spi.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SPI_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SPI_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SPI_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SPI_H
 
 /************************************************************************************
  * Included Files
@@ -135,4 +135,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SPI_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SPI_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_spifi.h b/arch/arm/src/lpc43xx/hardware/lpc43_spifi.h
similarity index 97%
rename from arch/arm/src/lpc43xx/chip/lpc43_spifi.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_spifi.h
index df70d727ed..d006f421ce 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_spifi.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_spifi.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- *  arch/arm/src/lpc43/chip/lpc43_spifi.h
+ *  arch/arm/src/lpc43xx/hardware/lpc43_spifi.h
  *
  *   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -58,8 +58,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SPIFI_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SPIFI_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SPIFI_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SPIFI_H
 
 /****************************************************************************
  * Included Files
@@ -292,4 +292,4 @@ int32_t spifi_erase(struct spifi_dev_s *dev,
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SPIFI_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SPIFI_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_ssp.h b/arch/arm/src/lpc43xx/hardware/lpc43_ssp.h
similarity index 97%
rename from arch/arm/src/lpc43xx/chip/lpc43_ssp.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_ssp.h
index 2bf9340973..5286b79c75 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_ssp.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_ssp.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_ssp.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_ssp.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SSP_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SSP_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SSP_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SSP_H
 
 /************************************************************************************
  * Included Files
@@ -168,4 +168,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_SSP_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_SSP_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_timer.h b/arch/arm/src/lpc43xx/hardware/lpc43_timer.h
similarity index 98%
rename from arch/arm/src/lpc43xx/chip/lpc43_timer.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_timer.h
index b62f1352a3..43a9dbffcb 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_timer.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_timer.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_timer.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_timer.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_TIMER_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_TIMER_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_TIMER_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_TIMER_H
 
 /************************************************************************************
  * Included Files
@@ -270,4 +270,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_TIMER_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_TIMER_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_uart.h b/arch/arm/src/lpc43xx/hardware/lpc43_uart.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_uart.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_uart.h
index de6944030e..e841c57286 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_uart.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_uart.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_uart.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_uart.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_UART_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_UART_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_UART_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_UART_H
 
 /********************************************************************************************
  * Included Files
@@ -416,4 +416,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_UART_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_UART_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_usb0.h b/arch/arm/src/lpc43xx/hardware/lpc43_usb0.h
similarity index 99%
rename from arch/arm/src/lpc43xx/chip/lpc43_usb0.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_usb0.h
index 0a89232bb9..d047346128 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_usb0.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_usb0.h
@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_usb0.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_usb0.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_USB0_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_USB0_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_USB0_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_USB0_H
 
 /************************************************************************************************
  * Included Files
@@ -716,4 +716,4 @@
  * Public Functions
  ************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_USB0_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_USB0_H */
diff --git a/arch/arm/src/lpc43xx/chip/lpc43_wwdt.h b/arch/arm/src/lpc43xx/hardware/lpc43_wwdt.h
similarity index 96%
rename from arch/arm/src/lpc43xx/chip/lpc43_wwdt.h
rename to arch/arm/src/lpc43xx/hardware/lpc43_wwdt.h
index df9d172c75..09b04a54d3 100644
--- a/arch/arm/src/lpc43xx/chip/lpc43_wwdt.h
+++ b/arch/arm/src/lpc43xx/hardware/lpc43_wwdt.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc43xx/lpc43_wwdt.h
+ * arch/arm/src/lpc43xx/hardware/lpc43_wwdt.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_WWDT_H
-#define __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_WWDT_H
+#ifndef __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_WWDT_H
+#define __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_WWDT_H
 
 /************************************************************************************
  * Included Files
@@ -108,4 +108,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC43XX_CHIP_LPC43_WWDT_H */
+#endif /* __ARCH_ARM_SRC_LPC43XX_HARDWARE_LPC43_WWDT_H */
diff --git a/arch/arm/src/lpc43xx/lpc43_adc.c b/arch/arm/src/lpc43xx/lpc43_adc.c
index 3217755a74..bcb3db1509 100644
--- a/arch/arm/src/lpc43xx/lpc43_adc.c
+++ b/arch/arm/src/lpc43xx/lpc43_adc.c
@@ -74,8 +74,8 @@
 #include "lpc43_ccu.h"
 #include "lpc43_creg.h"
 
-#include "chip/lpc43_gima.h"
-#include "chip/lpc43_timer.h"
+#include "hardware/lpc43_gima.h"
+#include "hardware/lpc43_timer.h"
 
 #include "lpc43_pinconfig.h"
 
diff --git a/arch/arm/src/lpc43xx/lpc43_adc.h b/arch/arm/src/lpc43xx/lpc43_adc.h
index 62b2cc5b85..ebfc2b2128 100644
--- a/arch/arm/src/lpc43xx/lpc43_adc.h
+++ b/arch/arm/src/lpc43xx/lpc43_adc.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/analog/adc.h>
-#include "chip/lpc43_adc.h"
+#include "hardware/lpc43_adc.h"
 
 #ifdef CONFIG_LPC43_ADC0
 
diff --git a/arch/arm/src/lpc43xx/lpc43_can.c b/arch/arm/src/lpc43xx/lpc43_can.c
index 630e00e0f1..a57bbf65be 100644
--- a/arch/arm/src/lpc43xx/lpc43_can.c
+++ b/arch/arm/src/lpc43xx/lpc43_can.c
@@ -55,8 +55,8 @@
 
 #include "chip.h"
 #include "lpc43_gpio.h"
-#include "chip/lpc43_can.h"
-#include "chip/lpc43_rgu.h"
+#include "hardware/lpc43_can.h"
+#include "hardware/lpc43_rgu.h"
 #include "lpc43_ccu.h"
 #include "lpc43_cgu.h"
 
diff --git a/arch/arm/src/lpc43xx/lpc43_can.h b/arch/arm/src/lpc43xx/lpc43_can.h
index 37074c6df3..8fd1eaff3a 100644
--- a/arch/arm/src/lpc43xx/lpc43_can.h
+++ b/arch/arm/src/lpc43xx/lpc43_can.h
@@ -45,7 +45,7 @@
 #include <nuttx/config.h>
 #include <nuttx/can/can.h>
 
-#include "chip/lpc43_can.h"
+#include "hardware/lpc43_can.h"
 
 #ifndef __ASSEMBLY__
 
diff --git a/arch/arm/src/lpc43xx/lpc43_ccu.h b/arch/arm/src/lpc43xx/lpc43_ccu.h
index 21fd0b1b14..45914b6295 100644
--- a/arch/arm/src/lpc43xx/lpc43_ccu.h
+++ b/arch/arm/src/lpc43xx/lpc43_ccu.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc43_ccu.h"
+#include "hardware/lpc43_ccu.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc43xx/lpc43_cgu.h b/arch/arm/src/lpc43xx/lpc43_cgu.h
index 6cdfff5ba7..294dc41901 100644
--- a/arch/arm/src/lpc43xx/lpc43_cgu.h
+++ b/arch/arm/src/lpc43xx/lpc43_cgu.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include "chip.h"
-#include "chip/lpc43_cgu.h"
+#include "hardware/lpc43_cgu.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc43xx/lpc43_creg.h b/arch/arm/src/lpc43xx/lpc43_creg.h
index d917bd6381..01b8360849 100644
--- a/arch/arm/src/lpc43xx/lpc43_creg.h
+++ b/arch/arm/src/lpc43xx/lpc43_creg.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc43_creg.h"
+#include "hardware/lpc43_creg.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc43xx/lpc43_dac.h b/arch/arm/src/lpc43xx/lpc43_dac.h
index f652d71c9b..41983ea378 100644
--- a/arch/arm/src/lpc43xx/lpc43_dac.h
+++ b/arch/arm/src/lpc43xx/lpc43_dac.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/analog/dac.h>
-#include "chip/lpc43_dac.h"
+#include "hardware/lpc43_dac.h"
 
 #ifdef CONFIG_LPC43_DAC
 
diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c
index 91f6886710..d7fa789fa4 100644
--- a/arch/arm/src/lpc43xx/lpc43_ehci.c
+++ b/arch/arm/src/lpc43xx/lpc43_ehci.c
@@ -62,12 +62,12 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "chip/lpc43_usb0.h"
+#include "hardware/lpc43_usb0.h"
 #include "up_arch.h"
 
 #include "lpc43_cgu.h"
-#include "chip/lpc43_creg.h"
-#include "chip/lpc43_evntrtr.h"
+#include "hardware/lpc43_creg.h"
+#include "hardware/lpc43_evntrtr.h"
 
 #if defined(CONFIG_LPC43_USBOTG) && defined(CONFIG_USBHOST)
 
diff --git a/arch/arm/src/lpc43xx/lpc43_emc.c b/arch/arm/src/lpc43xx/lpc43_emc.c
index a15ecb5610..17273a5b5d 100644
--- a/arch/arm/src/lpc43xx/lpc43_emc.c
+++ b/arch/arm/src/lpc43xx/lpc43_emc.c
@@ -30,9 +30,9 @@
 #include "chip.h"
 #include "lpc43_pinconfig.h"
 #include "lpc43_emc.h"
-#include "chip/lpc43_creg.h"
-#include "chip/lpc43_cgu.h"
-#include "chip/lpc43_ccu.h"
+#include "hardware/lpc43_creg.h"
+#include "hardware/lpc43_cgu.h"
+#include "hardware/lpc43_ccu.h"
 #include "lpc43_rgu.h"
 #include "lpc43_gpio.h"
 #include "up_arch.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_emc.h b/arch/arm/src/lpc43xx/lpc43_emc.h
index 77b71d8612..576106b82b 100644
--- a/arch/arm/src/lpc43xx/lpc43_emc.h
+++ b/arch/arm/src/lpc43xx/lpc43_emc.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include "chip.h"
-#include "chip/lpc43_emc.h"
+#include "hardware/lpc43_emc.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c
index befb76174f..d9f845ad85 100644
--- a/arch/arm/src/lpc43xx/lpc43_ethernet.c
+++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c
@@ -66,9 +66,9 @@
 #include "chip.h"
 #include "lpc43_pinconfig.h"
 #include "lpc43_ethernet.h"
-#include "chip/lpc43_creg.h"
-#include "chip/lpc43_cgu.h"
-#include "chip/lpc43_ccu.h"
+#include "hardware/lpc43_creg.h"
+#include "hardware/lpc43_cgu.h"
+#include "hardware/lpc43_ccu.h"
 #include "lpc43_rgu.h"
 #include "lpc43_gpio.h"
 #include "up_arch.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.h b/arch/arm/src/lpc43xx/lpc43_ethernet.h
index ca27e1739f..010203f7e2 100644
--- a/arch/arm/src/lpc43xx/lpc43_ethernet.h
+++ b/arch/arm/src/lpc43xx/lpc43_ethernet.h
@@ -44,7 +44,7 @@
 
 #include "chip.h"
 
-#include "chip/lpc43_ethernet.h"
+#include "hardware/lpc43_ethernet.h"
 
 #ifndef __ASSEMBLY__
 
diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.h b/arch/arm/src/lpc43xx/lpc43_gpdma.h
index d40e303f7a..388e92367b 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpdma.h
+++ b/arch/arm/src/lpc43xx/lpc43_gpdma.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc43_gpdma.h"
+#include "hardware/lpc43_gpdma.h"
 
 #ifdef CONFIG_LPC43_GPDMA
 
diff --git a/arch/arm/src/lpc43xx/lpc43_gpio.h b/arch/arm/src/lpc43xx/lpc43_gpio.h
index 24a492beae..cfc29adf96 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpio.h
+++ b/arch/arm/src/lpc43xx/lpc43_gpio.h
@@ -46,7 +46,7 @@
 /* Include the chip capabilities and GPIO definitions file */
 
 #include "chip.h"
-#include "chip/lpc43_gpio.h"
+#include "hardware/lpc43_gpio.h"
 
 /********************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc43xx/lpc43_gpioint.c b/arch/arm/src/lpc43xx/lpc43_gpioint.c
index e8726420c1..f7a9cbf417 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpioint.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpioint.c
@@ -66,8 +66,8 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "chip/lpc43_scu.h"
-#include "chip/lpc43_gpio.h"
+#include "hardware/lpc43_scu.h"
+#include "hardware/lpc43_gpio.h"
 #include "lpc43_gpio.h"
 #include "lpc43_gpioint.h"
 
diff --git a/arch/arm/src/lpc43xx/lpc43_gpioint.h b/arch/arm/src/lpc43xx/lpc43_gpioint.h
index ae479f83c6..64ef43b222 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpioint.h
+++ b/arch/arm/src/lpc43xx/lpc43_gpioint.h
@@ -59,7 +59,7 @@
 
 #include <nuttx/config.h>
 #include "chip.h"
-#include "chip/lpc43_gpio.h"
+#include "hardware/lpc43_gpio.h"
 
 #ifdef CONFIG_LPC43_GPIO_IRQ
 
diff --git a/arch/arm/src/lpc43xx/lpc43_i2c.h b/arch/arm/src/lpc43xx/lpc43_i2c.h
index 224fbaa593..ec5b50679b 100644
--- a/arch/arm/src/lpc43xx/lpc43_i2c.h
+++ b/arch/arm/src/lpc43xx/lpc43_i2c.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/i2c/i2c_master.h>
-#include "chip/lpc43_i2c.h"
+#include "hardware/lpc43_i2c.h"
 
 /****************************************************************************
  * Public Function Prototypes
diff --git a/arch/arm/src/lpc43xx/lpc43_pinconfig.h b/arch/arm/src/lpc43xx/lpc43_pinconfig.h
index 6b82878981..7ba22670b0 100644
--- a/arch/arm/src/lpc43xx/lpc43_pinconfig.h
+++ b/arch/arm/src/lpc43xx/lpc43_pinconfig.h
@@ -45,7 +45,7 @@
 /* Include the chip capabilities and SCU definitions file */
 
 #include "chip.h"
-#include "chip/lpc43_scu.h"
+#include "hardware/lpc43_scu.h"
 
 /********************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc43xx/lpc43_rgu.h b/arch/arm/src/lpc43xx/lpc43_rgu.h
index f283a9aaf3..e1474e4bd2 100644
--- a/arch/arm/src/lpc43xx/lpc43_rgu.h
+++ b/arch/arm/src/lpc43xx/lpc43_rgu.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc43_rgu.h"
+#include "hardware/lpc43_rgu.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc43xx/lpc43_rit.c b/arch/arm/src/lpc43xx/lpc43_rit.c
index b538cbbf0e..f8324c069c 100644
--- a/arch/arm/src/lpc43xx/lpc43_rit.c
+++ b/arch/arm/src/lpc43xx/lpc43_rit.c
@@ -55,7 +55,7 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "chip/lpc43_rit.h"
+#include "hardware/lpc43_rit.h"
 #include "lpc43_rit.h"
 
 #ifdef CONFIG_LPC43_RIT
diff --git a/arch/arm/src/lpc43xx/lpc43_rtc.c b/arch/arm/src/lpc43xx/lpc43_rtc.c
index 9afc152977..291ba8420e 100644
--- a/arch/arm/src/lpc43xx/lpc43_rtc.c
+++ b/arch/arm/src/lpc43xx/lpc43_rtc.c
@@ -54,8 +54,8 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "chip.h"
-#include "chip/lpc43_creg.h"
-#include "chip/lpc43_rtc.h"
+#include "hardware/lpc43_creg.h"
+#include "hardware/lpc43_rtc.h"
 #include "lpc43_rtc.h"
 
 #ifdef CONFIG_RTC
diff --git a/arch/arm/src/lpc43xx/lpc43_scu.h b/arch/arm/src/lpc43xx/lpc43_scu.h
index 4345a02608..108b38bf31 100644
--- a/arch/arm/src/lpc43xx/lpc43_scu.h
+++ b/arch/arm/src/lpc43xx/lpc43_scu.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc43_scu.h"
+#include "hardware/lpc43_scu.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.c b/arch/arm/src/lpc43xx/lpc43_sdmmc.c
index c7a748f3f4..3b86cdb390 100644
--- a/arch/arm/src/lpc43xx/lpc43_sdmmc.c
+++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.c
@@ -65,7 +65,7 @@
 
 #include "up_arch.h"
 
-#include "chip/lpc43_pinconfig.h"
+#include "hardware/lpc43_pinconfig.h"
 #include "lpc43_cgu.h"
 #include "lpc43_ccu.h"
 #include "lpc43_gpio.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.h b/arch/arm/src/lpc43xx/lpc43_sdmmc.h
index 449ee0f7a5..81f061b7b1 100644
--- a/arch/arm/src/lpc43xx/lpc43_sdmmc.h
+++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.h
@@ -45,7 +45,7 @@
 #include <stdbool.h>
 
 #include "chip.h"
-#include "chip/lpc43_sdmmc.h"
+#include "hardware/lpc43_sdmmc.h"
 
 /************************************************************************************
  * Public Functions
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.h b/arch/arm/src/lpc43xx/lpc43_spi.h
index b642f9c490..3be397df87 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.h
+++ b/arch/arm/src/lpc43xx/lpc43_spi.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/spi/spi.h>
-#include "chip/lpc43_spi.h"
+#include "hardware/lpc43_spi.h"
 
 #ifdef CONFIG_LPC43_SPI
 
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.h b/arch/arm/src/lpc43xx/lpc43_spifi.h
index 30f85b8328..a016d16f1d 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.h
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.h
@@ -44,7 +44,7 @@
 #include <nuttx/mtd/mtd.h>
 
 #include "chip.h"
-#include "chip/lpc43_spifi.h"
+#include "hardware/lpc43_spifi.h"
 
 #ifdef CONFIG_LPC43_SPIFI
 
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.h b/arch/arm/src/lpc43xx/lpc43_ssp.h
index 27be5a5130..8cddd3cdbb 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.h
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/spi/spi.h>
-#include "chip/lpc43_ssp.h"
+#include "hardware/lpc43_ssp.h"
 
 #if defined(CONFIG_LPC43_SSP0) || defined(CONFIG_LPC43_SSP1)
 
diff --git a/arch/arm/src/lpc43xx/lpc43_start.c b/arch/arm/src/lpc43xx/lpc43_start.c
index 91ab197e97..5d00f47688 100644
--- a/arch/arm/src/lpc43xx/lpc43_start.c
+++ b/arch/arm/src/lpc43xx/lpc43_start.c
@@ -66,7 +66,7 @@
 #include "up_internal.h"
 #include "nvic.h"
 
-#include "chip/lpc43_creg.h"
+#include "hardware/lpc43_creg.h"
 
 #include "lpc43_rgu.h"
 #include "lpc43_cgu.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c
index 17f657ee87..f55dbbf32a 100644
--- a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c
+++ b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c
@@ -56,7 +56,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "chip/lpc43_rit.h"
+#include "hardware/lpc43_rit.h"
 
 #ifdef CONFIG_SCHED_TICKLESS
 
diff --git a/arch/arm/src/lpc43xx/lpc43_timer.h b/arch/arm/src/lpc43xx/lpc43_timer.h
index 7eed9b2dcd..1224d29c5b 100644
--- a/arch/arm/src/lpc43xx/lpc43_timer.h
+++ b/arch/arm/src/lpc43xx/lpc43_timer.h
@@ -44,8 +44,8 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc43_timer.h"
-#include "chip/lpc43_ccu.h"
+#include "hardware/lpc43_timer.h"
+#include "hardware/lpc43_ccu.h"
 
 #ifdef CONFIG_TIMER
 
diff --git a/arch/arm/src/lpc43xx/lpc43_uart.h b/arch/arm/src/lpc43xx/lpc43_uart.h
index b34efd7328..c8bc53196a 100644
--- a/arch/arm/src/lpc43xx/lpc43_uart.h
+++ b/arch/arm/src/lpc43xx/lpc43_uart.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include "chip.h"
-#include "chip/lpc43_uart.h"
+#include "hardware/lpc43_uart.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.h b/arch/arm/src/lpc43xx/lpc43_usb0dev.h
index d941632013..d145b38030 100644
--- a/arch/arm/src/lpc43xx/lpc43_usb0dev.h
+++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.h
@@ -45,7 +45,7 @@
 #include <stdint.h>
 
 #include "chip.h"
-#include "chip/lpc43_usb0.h"
+#include "hardware/lpc43_usb0.h"
 
 /************************************************************************************
  * Public Functions
diff --git a/arch/arm/src/lpc43xx/lpc43_wdt.h b/arch/arm/src/lpc43xx/lpc43_wdt.h
index b006071db5..9255a8555e 100644
--- a/arch/arm/src/lpc43xx/lpc43_wdt.h
+++ b/arch/arm/src/lpc43xx/lpc43_wdt.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc43_wwdt.h"
+#include "hardware/lpc43_wwdt.h"
 
 #ifdef CONFIG_WATCHDOG
 
diff --git a/arch/arm/src/lpc43xx/lpc43_wwdt.c b/arch/arm/src/lpc43xx/lpc43_wwdt.c
index 785be62145..9e4414a950 100644
--- a/arch/arm/src/lpc43xx/lpc43_wwdt.c
+++ b/arch/arm/src/lpc43xx/lpc43_wwdt.c
@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 #include "lpc43_wdt.h"
-#include "chip/lpc43_wwdt.h"
+#include "hardware/lpc43_wwdt.h"
 
 #if defined(CONFIG_WATCHDOG) && defined(CONFIG_LPC43_WWDT)