diff --git a/arch/arm/src/lpc17xx/lpc17_clockconfig.c b/arch/arm/src/lpc17xx/lpc17_clockconfig.c
index 0dc378c98ed..97ef496f0df 100644
--- a/arch/arm/src/lpc17xx/lpc17_clockconfig.c
+++ b/arch/arm/src/lpc17xx/lpc17_clockconfig.c
@@ -56,9 +56,9 @@
 #include <arch/lpc17xx/chip.h>
 
 #if defined(LPC176x)
-#  include "hardware/lpc176x_clockconfig.c"
+#  include "chip/lpc176x_clockconfig.c"
 #elif defined(LPC178x)
-#  include "hardware/lpc178x_clockconfig.c"
+#  include "chip/lpc178x_clockconfig.c"
 #else
 #  error "Unrecognized LPC17xx family"
 #endif
diff --git a/arch/arm/src/nuc1xx/chip.h b/arch/arm/src/nuc1xx/chip.h
index d47f4f5e28c..618d9f1960e 100644
--- a/arch/arm/src/nuc1xx/chip.h
+++ b/arch/arm/src/nuc1xx/chip.h
@@ -54,7 +54,7 @@
  * this file for the proper setup.
  */
 
-#include "chip/nuc_memorymap.h"
+#include "hardware/nuc_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/nuc1xx/chip/nuc_adc.h b/arch/arm/src/nuc1xx/hardware/nuc_adc.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_adc.h
rename to arch/arm/src/nuc1xx/hardware/nuc_adc.h
index cea74a0fd6f..e4918b7e0b0 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_adc.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_adc.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_adc.h
+ * arch/arm/src/nuc1xx/hardware/nuc_adc.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_ADC_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_ADC_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_ADC_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_ADC_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_ADC_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_ADC_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_clk.h b/arch/arm/src/nuc1xx/hardware/nuc_clk.h
similarity index 99%
rename from arch/arm/src/nuc1xx/chip/nuc_clk.h
rename to arch/arm/src/nuc1xx/hardware/nuc_clk.h
index 69c54b9ce0d..2c7b20ec7d5 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_clk.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_clk.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_clk.h
+ * arch/arm/src/nuc1xx/hardware/nuc_clk.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_CLK_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_CLK_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_CLK_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_CLK_H
 
 /********************************************************************************************
  * Included Files
@@ -285,4 +285,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_CLK_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_CLK_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_cmp.h b/arch/arm/src/nuc1xx/hardware/nuc_cmp.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_cmp.h
rename to arch/arm/src/nuc1xx/hardware/nuc_cmp.h
index 64d11b31e02..1d130d9d736 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_cmp.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_cmp.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_cmp.h
+ * arch/arm/src/nuc1xx/hardware/nuc_cmp.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_CMP_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_CMP_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_CMP_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_CMP_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_CMP_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_CMP_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_config.h b/arch/arm/src/nuc1xx/hardware/nuc_config.h
similarity index 96%
rename from arch/arm/src/nuc1xx/chip/nuc_config.h
rename to arch/arm/src/nuc1xx/hardware/nuc_config.h
index cfc15bae994..984121f9636 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_config.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_config.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_config.h
+ * arch/arm/src/nuc1xx/hardware/nuc_config.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_CONFIG_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_CONFIG_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_CONFIG_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_CONFIG_H
 
 /********************************************************************************************
  * Included Files
@@ -114,4 +114,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_CONFIG_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_CONFIG_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_ebi.h b/arch/arm/src/nuc1xx/hardware/nuc_ebi.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_ebi.h
rename to arch/arm/src/nuc1xx/hardware/nuc_ebi.h
index 142ae60ab9a..f7d474f99de 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_ebi.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_ebi.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_ebi.h
+ * arch/arm/src/nuc1xx/hardware/nuc_ebi.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_EBI_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_EBI_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_EBI_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_EBI_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_EBI_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_EBI_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_gcr.h b/arch/arm/src/nuc1xx/hardware/nuc_gcr.h
similarity index 99%
rename from arch/arm/src/nuc1xx/chip/nuc_gcr.h
rename to arch/arm/src/nuc1xx/hardware/nuc_gcr.h
index 9612dfac3ca..8486e59b34c 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_gcr.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_gcr.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_gcr.h
+ * arch/arm/src/nuc1xx/hardware/nuc_gcr.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_GCR_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_GCR_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_GCR_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_GCR_H
 
 /********************************************************************************************
  * Included Files
@@ -370,4 +370,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_GCR_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_GCR_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_gpio.h b/arch/arm/src/nuc1xx/hardware/nuc_gpio.h
similarity index 99%
rename from arch/arm/src/nuc1xx/chip/nuc_gpio.h
rename to arch/arm/src/nuc1xx/hardware/nuc_gpio.h
index 7d99118e0e8..362d345ca77 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_gpio.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_gpio.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_gpio.h
+ * arch/arm/src/nuc1xx/hardware/nuc_gpio.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_GPIO_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_GPIO_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_GPIO_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_GPIO_H
 
 /********************************************************************************************
  * Included Files
@@ -553,4 +553,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_GPIO_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_GPIO_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_i2c.h b/arch/arm/src/nuc1xx/hardware/nuc_i2c.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_i2c.h
rename to arch/arm/src/nuc1xx/hardware/nuc_i2c.h
index 9b30e579799..6e761ecb3ac 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_i2c.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_i2c.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_i2c.h
+ * arch/arm/src/nuc1xx/hardware/nuc_i2c.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_I2C_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_I2C_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_I2C_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_I2C_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_I2C_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_I2C_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_i2s.h b/arch/arm/src/nuc1xx/hardware/nuc_i2s.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_i2s.h
rename to arch/arm/src/nuc1xx/hardware/nuc_i2s.h
index c94206324ac..95e89d2f946 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_i2s.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_i2s.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_i2s.h
+ * arch/arm/src/nuc1xx/hardware/nuc_i2s.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_I2S_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_I2S_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_I2S_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_I2S_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_I2S_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_I2S_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_memorymap.h b/arch/arm/src/nuc1xx/hardware/nuc_memorymap.h
similarity index 96%
rename from arch/arm/src/nuc1xx/chip/nuc_memorymap.h
rename to arch/arm/src/nuc1xx/hardware/nuc_memorymap.h
index 4cdccfa7275..04a9e881ca6 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_memorymap.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_memorymap.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_memorymap.h
+ * arch/arm/src/nuc1xx/hardware/nuc_memorymap.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_MEMORYMAP_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_MEMORYMAP_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_MEMORYMAP_H
 
 /********************************************************************************************
  * Included Files
@@ -109,4 +109,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_MEMORYMAP_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_pdma.h b/arch/arm/src/nuc1xx/hardware/nuc_pdma.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_pdma.h
rename to arch/arm/src/nuc1xx/hardware/nuc_pdma.h
index 964c01f0d58..0433c5ffad3 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_pdma.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_pdma.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_pdma.h
+ * arch/arm/src/nuc1xx/hardware/nuc_pdma.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_PDMA_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_PDMA_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_PDMA_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_PDMA_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_PDMA_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_PDMA_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_ps2d.h b/arch/arm/src/nuc1xx/hardware/nuc_ps2d.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_ps2d.h
rename to arch/arm/src/nuc1xx/hardware/nuc_ps2d.h
index f011093324a..c6184611b3e 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_ps2d.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_ps2d.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_ps2d.h
+ * arch/arm/src/nuc1xx/hardware/nuc_ps2d.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_PS2D_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_PS2D_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_PS2D_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_PS2D_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_PS2D_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_PS2D_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_pwm.h b/arch/arm/src/nuc1xx/hardware/nuc_pwm.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_pwm.h
rename to arch/arm/src/nuc1xx/hardware/nuc_pwm.h
index 49f4f25a47f..06741e72acb 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_pwm.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_pwm.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_pwm.h
+ * arch/arm/src/nuc1xx/hardware/nuc_pwm.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_PWM_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_PWM_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_PWM_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_PWM_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_PWM_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_PWM_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_rtc.h b/arch/arm/src/nuc1xx/hardware/nuc_rtc.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_rtc.h
rename to arch/arm/src/nuc1xx/hardware/nuc_rtc.h
index 1ec5e2baef2..94280ab62ec 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_rtc.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_rtc.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_rtc.h
+ * arch/arm/src/nuc1xx/hardware/nuc_rtc.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_RTC_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_RTC_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_RTC_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_RTC_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_RTC_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_RTC_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_spi.h b/arch/arm/src/nuc1xx/hardware/nuc_spi.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_spi.h
rename to arch/arm/src/nuc1xx/hardware/nuc_spi.h
index 74f46b1db5d..670128096d9 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_spi.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_spi.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_spi.h
+ * arch/arm/src/nuc1xx/hardware/nuc_spi.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_SPI_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_SPI_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_SPI_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_SPI_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_SPI_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_SPI_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_tmr.h b/arch/arm/src/nuc1xx/hardware/nuc_tmr.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_tmr.h
rename to arch/arm/src/nuc1xx/hardware/nuc_tmr.h
index e97615ce940..cc2c47808a8 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_tmr.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_tmr.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_tmr.h
+ * arch/arm/src/nuc1xx/hardware/nuc_tmr.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_TMR_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_TMR_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_TMR_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_TMR_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_TMR_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_TMR_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_uart.h b/arch/arm/src/nuc1xx/hardware/nuc_uart.h
similarity index 98%
rename from arch/arm/src/nuc1xx/chip/nuc_uart.h
rename to arch/arm/src/nuc1xx/hardware/nuc_uart.h
index 18b0122b112..701eba048d4 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_uart.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_uart.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_uart.h
+ * arch/arm/src/nuc1xx/hardware/nuc_uart.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_UART_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_UART_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_UART_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_UART_H
 
 /********************************************************************************************
  * Included Files
@@ -287,4 +287,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_UART_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_UART_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_usbd.h b/arch/arm/src/nuc1xx/hardware/nuc_usbd.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_usbd.h
rename to arch/arm/src/nuc1xx/hardware/nuc_usbd.h
index d950c3e8f79..8531407cdfc 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_usbd.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_usbd.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_usbd.h
+ * arch/arm/src/nuc1xx/hardware/nuc_usbd.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_USBD_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_USBD_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_USBD_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_USBD_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_USBD_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_USBD_H */
diff --git a/arch/arm/src/nuc1xx/chip/nuc_wdt.h b/arch/arm/src/nuc1xx/hardware/nuc_wdt.h
similarity index 94%
rename from arch/arm/src/nuc1xx/chip/nuc_wdt.h
rename to arch/arm/src/nuc1xx/hardware/nuc_wdt.h
index 458efe9774d..b86775179b6 100644
--- a/arch/arm/src/nuc1xx/chip/nuc_wdt.h
+++ b/arch/arm/src/nuc1xx/hardware/nuc_wdt.h
@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/nuc1xx/chip/nuc_wdt.h
+ * arch/arm/src/nuc1xx/hardware/nuc_wdt.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_WDT_H
-#define __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_WDT_H
+#ifndef __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_WDT_H
+#define __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_WDT_H
 
 /********************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_NUC1XX_CHIP_NUC_WDT_H */
+#endif /* __ARCH_ARM_SRC_NUC1XX_HARDWARE_NUC_WDT_H */
diff --git a/arch/arm/src/nuc1xx/nuc_clockconfig.c b/arch/arm/src/nuc1xx/nuc_clockconfig.c
index 95e4332ce7a..12e88a05a76 100644
--- a/arch/arm/src/nuc1xx/nuc_clockconfig.c
+++ b/arch/arm/src/nuc1xx/nuc_clockconfig.c
@@ -50,8 +50,8 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/chip/nuc_gcr.h"
-#include "chip/chip/nuc_clk.h"
+#include "hardware/chip/nuc_gcr.h"
+#include "hardware/chip/nuc_clk.h"
 
 #include "nuc_clockconfig.h"
 
diff --git a/arch/arm/src/nuc1xx/nuc_gpio.c b/arch/arm/src/nuc1xx/nuc_gpio.c
index e5c86c29347..98d08a6f5bf 100644
--- a/arch/arm/src/nuc1xx/nuc_gpio.c
+++ b/arch/arm/src/nuc1xx/nuc_gpio.c
@@ -49,7 +49,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/nuc_gpio.h"
+#include "hardware/nuc_gpio.h"
 
 #include "nuc_gpio.h"
 
diff --git a/arch/arm/src/nuc1xx/nuc_gpio.h b/arch/arm/src/nuc1xx/nuc_gpio.h
index 9d08dbac1ad..ba293fbb75f 100644
--- a/arch/arm/src/nuc1xx/nuc_gpio.h
+++ b/arch/arm/src/nuc1xx/nuc_gpio.h
@@ -50,7 +50,7 @@
 #include <nuttx/irq.h>
 
 #include "chip.h"
-#include "chip/nuc_gpio.h"
+#include "hardware/nuc_gpio.h"
 
 /****************************************************************************
  * Pre-processor Declarations
diff --git a/arch/arm/src/nuc1xx/nuc_lowputc.c b/arch/arm/src/nuc1xx/nuc_lowputc.c
index be949b2c9a1..ef4179ef5a7 100644
--- a/arch/arm/src/nuc1xx/nuc_lowputc.c
+++ b/arch/arm/src/nuc1xx/nuc_lowputc.c
@@ -49,10 +49,10 @@
 
 #include "chip.h"
 #include "nuc_config.h"
-#include "chip/chip/nuc_clk.h"
-#include "chip/chip/nuc_uart.h"
+#include "hardware/chip/nuc_clk.h"
+#include "hardware/chip/nuc_uart.h"
 
-#include "chip/nuc_gcr.h"
+#include "hardware/nuc_gcr.h"
 #include "nuc_lowputc.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/nuc1xx/nuc_serial.c b/arch/arm/src/nuc1xx/nuc_serial.c
index 9791a6ae9a9..b9ff2fa1c7a 100644
--- a/arch/arm/src/nuc1xx/nuc_serial.c
+++ b/arch/arm/src/nuc1xx/nuc_serial.c
@@ -63,7 +63,7 @@
 #include "up_internal.h"
 
 #include "chip.h"
-#include "chip/nuc_uart.h"
+#include "hardware/nuc_uart.h"
 #include "nuc_lowputc.h"
 #include "nuc_serial.h"
 
diff --git a/arch/arm/src/nuc1xx/nuc_serial.h b/arch/arm/src/nuc1xx/nuc_serial.h
index 950e30d1a9e..5a67851ae1d 100644
--- a/arch/arm/src/nuc1xx/nuc_serial.h
+++ b/arch/arm/src/nuc1xx/nuc_serial.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "nuc_config.h"
-#include "chip/nuc_uart.h"
+#include "hardware/nuc_uart.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/nuc1xx/nuc_timerisr.c b/arch/arm/src/nuc1xx/nuc_timerisr.c
index d6ec1fa9491..338d2419add 100644
--- a/arch/arm/src/nuc1xx/nuc_timerisr.c
+++ b/arch/arm/src/nuc1xx/nuc_timerisr.c
@@ -51,8 +51,8 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/nuc_clk.h"
-#include "chip/nuc_gcr.h"
+#include "hardware/nuc_clk.h"
+#include "hardware/nuc_gcr.h"
 
 /****************************************************************************
  * Pre-processor Definitions