diff --git a/ChangeLog b/ChangeLog
index d1705043b0..6c13b6e144 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6059,6 +6059,9 @@
 	  compilation for the set of writable file systems.  Noted by
 	  Daniel Palmer (2013-11-15).
 	* arch/arm/src/sama5/sam_nand.c and .h:  Framework for an MTD driver
-	  that will provide raw access to NAND (2013-11015).
+	  that will provide raw access to NAND (2013-11-15).
 	* configs/sama5d3x-ek/src/sam_nandflash.c:  Provides board-specific
-	  memory controller initialize for NAND flash (2013-11015).
+	  memory controller initialize for NAND flash (2013-11-15).
+	* include/nuttx/mtd/mtd.h:  Move include/nutt/mtd.h to
+	  include/nuttx/mtd/mtd.h where it will, hopefully, soon be joined by
+	  other MTD-related header files (2013-11-15).
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 9e5c8122a9..65f4820bf0 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -3246,7 +3246,7 @@ extern void up_ledoff(int led);
 <ul>
   <li>
     <p>
-      <b><code>include/nuttx/mtd.h</code></b>.
+      <b><code>include/nuttx/mtd/mtd.h</code></b>.
       All structures and APIs needed to work with MTD drivers are provided in this header file.
     </p>
   </li>
diff --git a/arch/arm/src/lm/lm_flash.c b/arch/arm/src/lm/lm_flash.c
index ca14f45d5c..1a54905259 100644
--- a/arch/arm/src/lm/lm_flash.c
+++ b/arch/arm/src/lm/lm_flash.c
@@ -52,7 +52,7 @@
 #include <debug.h>
 
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "up_arch.h"
 #include "chip.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c
index ad6ce0ad51..f7a7e41b7b 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include <arch/irq.h>
 #include <arch/board/board.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.h b/arch/arm/src/lpc43xx/lpc43_spifi.h
index f7cc0d775f..2193a3b2f8 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.h
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "chip.h"
 #include "chip/lpc43_spifi.h"
diff --git a/arch/arm/src/sama5/Kconfig b/arch/arm/src/sama5/Kconfig
index 813c7baaed..acc34bee1f 100644
--- a/arch/arm/src/sama5/Kconfig
+++ b/arch/arm/src/sama5/Kconfig
@@ -3033,6 +3033,8 @@ config SAMA5_EBICS0_NOR
 
 config SAMA5_EBICS0_NAND
 	bool "NAND Flash"
+	select MTD
+	select MTD_NAND
 
 endchoice # CS0 Memory Type
 endif # SAMA5_EBICS0
@@ -3082,6 +3084,8 @@ config SAMA5_EBICS1_NOR
 
 config SAMA5_EBICS1_NAND
 	bool "NAND Flash"
+	select MTD
+	select MTD_NAND
 
 endchoice # CS1 Memory Type
 endif # SAMA5_EBICS1
@@ -3131,6 +3135,8 @@ config SAMA5_EBICS2_NOR
 
 config SAMA5_EBICS2_NAND
 	bool "NAND Flash"
+	select MTD
+	select MTD_NAND
 
 endchoice # CS2 Memory Type
 endif # SAMA5_EBICS2
@@ -3180,6 +3186,8 @@ config SAMA5_EBICS3_NOR
 
 config SAMA5_EBICS3_NAND
 	bool "NAND Flash"
+	select MTD
+	select MTD_NAND
 
 endchoice # CS3 Memory Type
 endif # SAMA5_EBICS3
diff --git a/arch/arm/src/sama5/sam_nand.c b/arch/arm/src/sama5/sam_nand.c
index 4e3b910d69..819134a7fb 100644
--- a/arch/arm/src/sama5/sam_nand.c
+++ b/arch/arm/src/sama5/sam_nand.c
@@ -4,6 +4,15 @@
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
+ * References:
+ *   SAMA5D3 Series Data Sheet
+ *   Atmel NoOS sample code.
+ *
+ * The Atmel sample code has a BSD compatibile license that requires this
+ * copyright notice:
+ *
+ *   Copyright (c) 2011, 2012, Atmel Corporation
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -14,8 +23,8 @@
  *    notice, this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
+ * 3. Neither the names NuttX nor Atmel nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -46,7 +55,7 @@
 #include <debug.h>
 
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "sam_nand.h"
 
diff --git a/configs/cloudctrl/src/up_w25.c b/configs/cloudctrl/src/up_w25.c
index e4df22a173..b9e018a900 100644
--- a/configs/cloudctrl/src/up_w25.c
+++ b/configs/cloudctrl/src/up_w25.c
@@ -50,7 +50,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
 
diff --git a/configs/ea3131/src/up_fillpage.c b/configs/ea3131/src/up_fillpage.c
index eaed9a8a2c..35ba206567 100644
--- a/configs/ea3131/src/up_fillpage.c
+++ b/configs/ea3131/src/up_fillpage.c
@@ -66,7 +66,7 @@
 #  include <sys/ioctl.h>
 #  include <nuttx/fs/ioctl.h>
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 /****************************************************************************
diff --git a/configs/ea3152/src/up_fillpage.c b/configs/ea3152/src/up_fillpage.c
index 9f470ee320..3b9f02a884 100644
--- a/configs/ea3152/src/up_fillpage.c
+++ b/configs/ea3152/src/up_fillpage.c
@@ -66,7 +66,7 @@
 #  include <sys/ioctl.h>
 #  include <nuttx/fs/ioctl.h>
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 /****************************************************************************
diff --git a/configs/fire-stm32v2/src/up_w25.c b/configs/fire-stm32v2/src/up_w25.c
index 56bbde6344..bfd27cd1f3 100644
--- a/configs/fire-stm32v2/src/up_w25.c
+++ b/configs/fire-stm32v2/src/up_w25.c
@@ -49,7 +49,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
 
diff --git a/configs/hymini-stm32v/src/up_nsh.c b/configs/hymini-stm32v/src/up_nsh.c
index e8019ae087..a28ffb0e96 100644
--- a/configs/hymini-stm32v/src/up_nsh.c
+++ b/configs/hymini-stm32v/src/up_nsh.c
@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_STM32_SDIO
diff --git a/configs/lpc4330-xplorer/src/up_nsh.c b/configs/lpc4330-xplorer/src/up_nsh.c
index a09acd771c..3a7fa83cd4 100644
--- a/configs/lpc4330-xplorer/src/up_nsh.c
+++ b/configs/lpc4330-xplorer/src/up_nsh.c
@@ -47,7 +47,7 @@
 #include "chip.h"
 
 #ifdef CONFIG_LPC43_SPIFI
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include "lpc43_spifi.h"
 
 #  ifdef CONFIG_SPFI_NXFFS
diff --git a/configs/mikroe-stm32f4/src/up_nsh.c b/configs/mikroe-stm32f4/src/up_nsh.c
index cfb41a2838..9abd860540 100644
--- a/configs/mikroe-stm32f4/src/up_nsh.c
+++ b/configs/mikroe-stm32f4/src/up_nsh.c
@@ -52,7 +52,7 @@
 #endif
 
 #ifdef CONFIG_MTD_M25P
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_SYSTEM_USBMONITOR
diff --git a/configs/mirtoo/src/up_nsh.c b/configs/mirtoo/src/up_nsh.c
index 482e91445c..f81104c2bd 100644
--- a/configs/mirtoo/src/up_nsh.c
+++ b/configs/mirtoo/src/up_nsh.c
@@ -49,7 +49,7 @@
 
 #ifdef CONFIG_PIC32MX_SPI2
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
 
diff --git a/configs/sama5d3x-ek/src/sam_at24.c b/configs/sama5d3x-ek/src/sam_at24.c
index 961b3d7879..e935672cab 100644
--- a/configs/sama5d3x-ek/src/sam_at24.c
+++ b/configs/sama5d3x-ek/src/sam_at24.c
@@ -65,7 +65,7 @@
 #include <debug.h>
 
 #include <nuttx/i2c.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/nxffs.h>
 
 #include "sama5d3x-ek.h"
diff --git a/configs/sama5d3x-ek/src/sam_at25.c b/configs/sama5d3x-ek/src/sam_at25.c
index 680c11c0fc..4ecef3cf13 100644
--- a/configs/sama5d3x-ek/src/sam_at25.c
+++ b/configs/sama5d3x-ek/src/sam_at25.c
@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/nxffs.h>
 
 #include "sam_spi.h"
diff --git a/configs/shenzhou/src/up_w25.c b/configs/shenzhou/src/up_w25.c
index dfbb18ef99..6dcfe093af 100644
--- a/configs/shenzhou/src/up_w25.c
+++ b/configs/shenzhou/src/up_w25.c
@@ -49,7 +49,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <nuttx/fs/nxffs.h>
 #endif
 
diff --git a/configs/spark/src/up_composite.c b/configs/spark/src/up_composite.c
index 8cb3470571..a82ad75dc8 100644
--- a/configs/spark/src/up_composite.c
+++ b/configs/spark/src/up_composite.c
@@ -50,7 +50,7 @@
 
 #ifdef CONFIG_MTD_SST25
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <sys/mount.h>
 #endif
 
diff --git a/configs/spark/src/up_nsh.c b/configs/spark/src/up_nsh.c
index 1fb2b4846a..45bd8f5e4d 100644
--- a/configs/spark/src/up_nsh.c
+++ b/configs/spark/src/up_nsh.c
@@ -50,7 +50,7 @@
 
 #ifdef CONFIG_MTD_SST25
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #  include <sys/mount.h>
 #endif
 
diff --git a/configs/stm3210e-eval/src/up_nsh.c b/configs/stm3210e-eval/src/up_nsh.c
index 95f919fac3..6caa12dbdf 100644
--- a/configs/stm3210e-eval/src/up_nsh.c
+++ b/configs/stm3210e-eval/src/up_nsh.c
@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_STM32_SDIO
diff --git a/configs/stm3220g-eval/src/up_nsh.c b/configs/stm3220g-eval/src/up_nsh.c
index afdd017981..37becd242c 100644
--- a/configs/stm3220g-eval/src/up_nsh.c
+++ b/configs/stm3220g-eval/src/up_nsh.c
@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_STM32_SDIO
diff --git a/configs/stm3240g-eval/src/up_nsh.c b/configs/stm3240g-eval/src/up_nsh.c
index 3b1038747d..a0add13b48 100644
--- a/configs/stm3240g-eval/src/up_nsh.c
+++ b/configs/stm3240g-eval/src/up_nsh.c
@@ -47,7 +47,7 @@
 
 #ifdef CONFIG_STM32_SPI1
 #  include <nuttx/spi/spi.h>
-#  include <nuttx/mtd.h>
+#  include <nuttx/mtd/mtd.h>
 #endif
 
 #ifdef CONFIG_STM32_SDIO
diff --git a/drivers/Kconfig b/drivers/Kconfig
index fa32c2b6e4..03577be3c1 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -327,7 +327,7 @@ menuconfig MTD
 	---help---
 		Memory Technology Device (MTD) drivers.  Some simple drivers for
 		memory technologies like FLASH, EEPROM, NVRAM, etc.  See
-		include/nuttx/mtd.h
+		include/nuttx/mtd/mtd.h
 
 		(Note: This is a simple memory interface and should not be
 		confused with the "real" MTD developed at infradead.org.  This
diff --git a/drivers/README.txt b/drivers/README.txt
index e27e8c5831..d4c3982e32 100644
--- a/drivers/README.txt
+++ b/drivers/README.txt
@@ -85,7 +85,7 @@ mmcsd/
 mtd/
   Memory Technology Device (MTD) drivers.  Some simple drivers for
   memory technologies like FLASH, EEPROM, NVRAM, etc.  See
-  include/nuttx/mtd.h
+  include/nuttx/mtd/mtd.h
 
   (Note: This is a simple memory interface and should not be
   confused with the "real" MTD developed at infradead.org.  This
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 0d703ed515..c869352490 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -19,7 +19,7 @@ config MTD_PARTITION
 		each managed by a separate MTD driver.  The MTD parition interface
 		is described in:
 
-			include/nuttx/mtd.h
+			include/nuttx/mtd/mtd.h
 			FAR struct mtd_dev_s *mtd_partition(FAR struct mtd_dev_s *mtd, off_t offset, off_t nblocks);
 
 		Each call to mtd_partition() will create a new MTD driver instance
@@ -75,6 +75,15 @@ config MTD_CONFIG_ERASEDVALUE
 
 comment "MTD Device Drivers"
 
+config MTD_NAND
+	bool "Enable NAND support"
+	default n
+	---help---
+		Enable support for NAND FLASH devices.
+
+if MTD_NAND
+endif # MTD_NAND
+
 config RAMMTD
 	bool "RAM-based MTD driver"
 	default n
diff --git a/drivers/mtd/at24xx.c b/drivers/mtd/at24xx.c
index 326c6f86b2..abf4d84d8c 100644
--- a/drivers/mtd/at24xx.c
+++ b/drivers/mtd/at24xx.c
@@ -60,7 +60,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/i2c.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #ifdef CONFIG_MTD_AT24XX
 
diff --git a/drivers/mtd/at25.c b/drivers/mtd/at25.c
index 86556ac330..880398aa13 100644
--- a/drivers/mtd/at25.c
+++ b/drivers/mtd/at25.c
@@ -52,7 +52,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/drivers/mtd/at45db.c b/drivers/mtd/at45db.c
index 9b9f9ead73..372e6be575 100644
--- a/drivers/mtd/at45db.c
+++ b/drivers/mtd/at45db.c
@@ -63,7 +63,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/drivers/mtd/flash_eraseall.c b/drivers/mtd/flash_eraseall.c
index ce0cfe6491..67e93f0efa 100644
--- a/drivers/mtd/flash_eraseall.c
+++ b/drivers/mtd/flash_eraseall.c
@@ -44,7 +44,7 @@
 
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /****************************************************************************
  * Private Definitions
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index d3d62c6558..cffede20ba 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -52,7 +52,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/rwbuffer.h>
 
 /****************************************************************************
diff --git a/drivers/mtd/m25px.c b/drivers/mtd/m25px.c
index 02aad5e7cf..3268a9f9fb 100644
--- a/drivers/mtd/m25px.c
+++ b/drivers/mtd/m25px.c
@@ -52,7 +52,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/drivers/mtd/mtd_config.c b/drivers/mtd/mtd_config.c
index 73112d803b..4fa7b15d52 100644
--- a/drivers/mtd/mtd_config.c
+++ b/drivers/mtd/mtd_config.c
@@ -58,7 +58,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/configdata.h>
 
 #ifdef CONFIG_MTD_CONFIG
diff --git a/drivers/mtd/mtd_partition.c b/drivers/mtd/mtd_partition.c
index 91ccdc74fa..550a775c8d 100644
--- a/drivers/mtd/mtd_partition.c
+++ b/drivers/mtd/mtd_partition.c
@@ -46,7 +46,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 
diff --git a/drivers/mtd/rammtd.c b/drivers/mtd/rammtd.c
index 575c3fb316..c901499bcb 100644
--- a/drivers/mtd/rammtd.c
+++ b/drivers/mtd/rammtd.c
@@ -48,7 +48,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/drivers/mtd/ramtron.c b/drivers/mtd/ramtron.c
index d2180c91a5..a77d7d82be 100644
--- a/drivers/mtd/ramtron.c
+++ b/drivers/mtd/ramtron.c
@@ -69,7 +69,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/drivers/mtd/skeleton.c b/drivers/mtd/skeleton.c
index fe550f55ed..ebb128030a 100644
--- a/drivers/mtd/skeleton.c
+++ b/drivers/mtd/skeleton.c
@@ -44,7 +44,7 @@
 #include <errno.h>
 
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/drivers/mtd/smart.c b/drivers/mtd/smart.c
index 35a367e5b2..a6c8fa2c22 100644
--- a/drivers/mtd/smart.c
+++ b/drivers/mtd/smart.c
@@ -55,7 +55,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/smart.h>
 
 /****************************************************************************
diff --git a/drivers/mtd/sst25.c b/drivers/mtd/sst25.c
index 923eea670d..358a7763f0 100644
--- a/drivers/mtd/sst25.c
+++ b/drivers/mtd/sst25.c
@@ -59,7 +59,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/drivers/mtd/sst39vf.c b/drivers/mtd/sst39vf.c
index 7c0bac7865..0f7f49cf6f 100644
--- a/drivers/mtd/sst39vf.c
+++ b/drivers/mtd/sst39vf.c
@@ -51,7 +51,7 @@
 #include <nuttx/clock.h>
 #include <nuttx/arch.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/drivers/mtd/w25.c b/drivers/mtd/w25.c
index b87dba0443..097662d099 100644
--- a/drivers/mtd/w25.c
+++ b/drivers/mtd/w25.c
@@ -54,7 +54,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/fs/nxffs/nxffs.h b/fs/nxffs/nxffs.h
index b2ac44b9c7..f434fa4c97 100644
--- a/fs/nxffs/nxffs.h
+++ b/fs/nxffs/nxffs.h
@@ -49,7 +49,7 @@
 #include <stdbool.h>
 #include <semaphore.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/nxffs.h>
 
 /****************************************************************************
diff --git a/fs/nxffs/nxffs_block.c b/fs/nxffs/nxffs_block.c
index a0f76766a6..4cc2ac263b 100644
--- a/fs/nxffs/nxffs_block.c
+++ b/fs/nxffs/nxffs_block.c
@@ -46,7 +46,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 
diff --git a/fs/nxffs/nxffs_blockstats.c b/fs/nxffs/nxffs_blockstats.c
index 348374e670..f345b19b4a 100644
--- a/fs/nxffs/nxffs_blockstats.c
+++ b/fs/nxffs/nxffs_blockstats.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 
diff --git a/fs/nxffs/nxffs_cache.c b/fs/nxffs/nxffs_cache.c
index 059c1e7291..2f328aac79 100644
--- a/fs/nxffs/nxffs_cache.c
+++ b/fs/nxffs/nxffs_cache.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 
diff --git a/fs/nxffs/nxffs_dirent.c b/fs/nxffs/nxffs_dirent.c
index 221549438f..2afc694e52 100644
--- a/fs/nxffs/nxffs_dirent.c
+++ b/fs/nxffs/nxffs_dirent.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/fs/fs.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/dirent.h>
 
 #include "nxffs.h"
diff --git a/fs/nxffs/nxffs_dump.c b/fs/nxffs/nxffs_dump.c
index 3201a68f9c..032c5f8751 100644
--- a/fs/nxffs/nxffs_dump.c
+++ b/fs/nxffs/nxffs_dump.c
@@ -48,7 +48,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 
diff --git a/fs/nxffs/nxffs_initialize.c b/fs/nxffs/nxffs_initialize.c
index 83596ee171..8cf2edcdb0 100644
--- a/fs/nxffs/nxffs_initialize.c
+++ b/fs/nxffs/nxffs_initialize.c
@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
 
diff --git a/fs/nxffs/nxffs_inode.c b/fs/nxffs/nxffs_inode.c
index 505a6c6863..bf21eafcd0 100644
--- a/fs/nxffs/nxffs_inode.c
+++ b/fs/nxffs/nxffs_inode.c
@@ -48,7 +48,7 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 
diff --git a/fs/nxffs/nxffs_ioctl.c b/fs/nxffs/nxffs_ioctl.c
index 332878eb0c..a6d85bf4e1 100644
--- a/fs/nxffs/nxffs_ioctl.c
+++ b/fs/nxffs/nxffs_ioctl.c
@@ -48,7 +48,7 @@
 
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 
diff --git a/fs/nxffs/nxffs_open.c b/fs/nxffs/nxffs_open.c
index 4d8f62c844..4e5fe3cae4 100644
--- a/fs/nxffs/nxffs_open.c
+++ b/fs/nxffs/nxffs_open.c
@@ -51,7 +51,7 @@
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 
diff --git a/fs/nxffs/nxffs_read.c b/fs/nxffs/nxffs_read.c
index a97c09263e..315b41e884 100644
--- a/fs/nxffs/nxffs_read.c
+++ b/fs/nxffs/nxffs_read.c
@@ -49,7 +49,7 @@
 #include <debug.h>
 
 #include <nuttx/fs/fs.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 
diff --git a/fs/nxffs/nxffs_reformat.c b/fs/nxffs/nxffs_reformat.c
index f77a40e065..3453b387d2 100644
--- a/fs/nxffs/nxffs_reformat.c
+++ b/fs/nxffs/nxffs_reformat.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 
diff --git a/fs/nxffs/nxffs_stat.c b/fs/nxffs/nxffs_stat.c
index d4d58a72c9..0d232226e8 100644
--- a/fs/nxffs/nxffs_stat.c
+++ b/fs/nxffs/nxffs_stat.c
@@ -50,7 +50,7 @@
 #include <debug.h>
 
 #include <nuttx/fs/fs.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 
diff --git a/fs/nxffs/nxffs_unlink.c b/fs/nxffs/nxffs_unlink.c
index 8c8553025b..36bc507962 100644
--- a/fs/nxffs/nxffs_unlink.c
+++ b/fs/nxffs/nxffs_unlink.c
@@ -47,7 +47,7 @@
 #include <debug.h>
 
 #include <nuttx/fs/fs.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 
diff --git a/fs/nxffs/nxffs_write.c b/fs/nxffs/nxffs_write.c
index 756ac7467a..3a95e82a73 100644
--- a/fs/nxffs/nxffs_write.c
+++ b/fs/nxffs/nxffs_write.c
@@ -49,7 +49,7 @@
 #include <debug.h>
 
 #include <nuttx/fs/fs.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 
 #include "nxffs.h"
 
diff --git a/fs/smartfs/smartfs.h b/fs/smartfs/smartfs.h
index d1d3928c40..6ff07ad64c 100644
--- a/fs/smartfs/smartfs.h
+++ b/fs/smartfs/smartfs.h
@@ -49,7 +49,7 @@
 #include <stdbool.h>
 #include <semaphore.h>
 
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/smart.h>
 
 /****************************************************************************
diff --git a/fs/smartfs/smartfs_smart.c b/fs/smartfs/smartfs_smart.c
index accf1b04e7..43c241374a 100644
--- a/fs/smartfs/smartfs_smart.c
+++ b/fs/smartfs/smartfs_smart.c
@@ -57,7 +57,7 @@
 #include <nuttx/fs/fat.h>
 #include <nuttx/fs/dirent.h>
 #include <nuttx/fs/ioctl.h>
-#include <nuttx/mtd.h>
+#include <nuttx/mtd/mtd.h>
 #include <nuttx/smart.h>
 
 #include "smartfs.h"
diff --git a/include/nuttx/mtd.h b/include/nuttx/mtd/mtd.h
similarity index 98%
rename from include/nuttx/mtd.h
rename to include/nuttx/mtd/mtd.h
index cf6945dfb3..ab3f4608ba 100644
--- a/include/nuttx/mtd.h
+++ b/include/nuttx/mtd/mtd.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/mtd.h
+ * include/nuttx/mtd/mtd.h
  * Memory Technology Device (MTD) interface
  *
  *   Copyright (C) 2009-2013 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_MTD_H
-#define __INCLUDE_NUTTX_MTD_H
+#ifndef __INCLUDE_NUTTX_MTD_MTD_H
+#define __INCLUDE_NUTTX_MTD_MTD_H
 
 /****************************************************************************
  * Included Files
@@ -346,4 +346,4 @@ FAR struct mtd_dev_s *up_flashinitialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __INCLUDE_NUTTX_MTD_H */
+#endif /* __INCLUDE_NUTTX_MTD_MTD_H */