diff --git a/Makefile b/Makefile
index 934216f7..28bb19bc 100644
--- a/Makefile
+++ b/Makefile
@@ -76,7 +76,7 @@ BUILD_TIMESTAMP		:=	$(strip $(shell date --utc '+%Y-%m-%d %T UTC'))
 
 TARGET				:=	${APP_TITLE}
 BUILD				:=	build
-SOURCES				:=	source source/core source/core/fatfs source/core/devoptab source/tasks source/utils source/views
+SOURCES				:=	source source/core source/core/devoptab source/core/devoptab/fatfs source/tasks source/utils source/views
 DATA				:=	data
 ICON				:=	romfs/icon/${APP_TITLE}.jpg
 INCLUDES			:=	include
diff --git a/include/core/fatfs/diskio.h b/include/core/devoptab/fatfs/diskio.h
similarity index 100%
rename from include/core/fatfs/diskio.h
rename to include/core/devoptab/fatfs/diskio.h
diff --git a/include/core/fatfs/ff.h b/include/core/devoptab/fatfs/ff.h
similarity index 100%
rename from include/core/fatfs/ff.h
rename to include/core/devoptab/fatfs/ff.h
diff --git a/include/core/fatfs/ffconf.h b/include/core/devoptab/fatfs/ffconf.h
similarity index 99%
rename from include/core/fatfs/ffconf.h
rename to include/core/devoptab/fatfs/ffconf.h
index 4b7210a1..7e2cd0cf 100644
--- a/include/core/fatfs/ffconf.h
+++ b/include/core/devoptab/fatfs/ffconf.h
@@ -1,4 +1,4 @@
-#include "../../defines.h"
+#include "../../../defines.h"
 
 /*---------------------------------------------------------------------------/
 /  Configurations of FatFs Module
diff --git a/include/core/devoptab/nxdt_devoptab.h b/include/core/devoptab/nxdt_devoptab.h
index 8b8d2dce..034a1cea 100644
--- a/include/core/devoptab/nxdt_devoptab.h
+++ b/include/core/devoptab/nxdt_devoptab.h
@@ -27,7 +27,7 @@
 #include "../pfs.h"
 #include "../hfs.h"
 #include "../romfs.h"
-#include "../fatfs/ff.h"
+#include "fatfs/ff.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/core/bis_storage.c b/source/core/bis_storage.c
index 355160df..c617e753 100644
--- a/source/core/bis_storage.c
+++ b/source/core/bis_storage.c
@@ -46,7 +46,7 @@ const char *bisStorageGet##property##ByBisPartitionId(u8 bis_partition_id) { \
 /* Type definitions. */
 
 typedef struct {
-    u8 bis_partition_id;    ///< FsBisPartitionId.
+    u8 bis_partition_id;                ///< FsBisPartitionId.
     const char *gpt_name;
     const char *sysinit_name;
     const char *devoptab_mount_name;
diff --git a/source/core/devoptab/fat_dev.c b/source/core/devoptab/fat_dev.c
index 3f90cd6d..17b4e731 100644
--- a/source/core/devoptab/fat_dev.c
+++ b/source/core/devoptab/fat_dev.c
@@ -24,7 +24,6 @@
 #include <core/nxdt_utils.h>
 #include <core/devoptab/nxdt_devoptab.h>
 #include <core/devoptab/ro_dev.h>
-#include <core/fatfs/ff.h>
 
 /* Helper macros. */
 
diff --git a/source/core/fatfs/diskio.c b/source/core/devoptab/fatfs/diskio.c
similarity index 96%
rename from source/core/fatfs/diskio.c
rename to source/core/devoptab/fatfs/diskio.c
index 79bb54e5..3cfbcd43 100644
--- a/source/core/fatfs/diskio.c
+++ b/source/core/devoptab/fatfs/diskio.c
@@ -10,8 +10,8 @@
 #include <core/nxdt_utils.h>
 #include <core/bis_storage.h>
 
-#include <core/fatfs/ff.h>		/* Obtains integer types */
-#include <core/fatfs/diskio.h>	/* Declarations of disk functions */
+#include <core/devoptab/fatfs/ff.h>		/* Obtains integer types */
+#include <core/devoptab/fatfs/diskio.h>	/* Declarations of disk functions */
 
 /*-----------------------------------------------------------------------*/
 /* Get Drive Status                                                      */
diff --git a/source/core/fatfs/ff.c b/source/core/devoptab/fatfs/ff.c
similarity index 99%
rename from source/core/fatfs/ff.c
rename to source/core/devoptab/fatfs/ff.c
index dc957c61..3fc5c61a 100644
--- a/source/core/fatfs/ff.c
+++ b/source/core/devoptab/fatfs/ff.c
@@ -20,8 +20,8 @@
 
 
 #include <string.h>
-#include <core/fatfs/ff.h>			/* Declarations of FatFs API */
-#include <core/fatfs/diskio.h>		/* Declarations of device I/O functions */
+#include <core/devoptab/fatfs/ff.h>			/* Declarations of FatFs API */
+#include <core/devoptab/fatfs/diskio.h>		/* Declarations of device I/O functions */
 
 
 /*--------------------------------------------------------------------------
diff --git a/source/core/fatfs/ffsystem.c b/source/core/devoptab/fatfs/ffsystem.c
similarity index 99%
rename from source/core/fatfs/ffsystem.c
rename to source/core/devoptab/fatfs/ffsystem.c
index fbd7bb08..0d8262bd 100644
--- a/source/core/fatfs/ffsystem.c
+++ b/source/core/devoptab/fatfs/ffsystem.c
@@ -2,7 +2,7 @@
 /* A Sample Code of User Provided OS Dependent Functions for FatFs        */
 /*------------------------------------------------------------------------*/
 
-#include <core/fatfs/ff.h>
+#include <core/devoptab/fatfs/ff.h>
 
 
 #if FF_USE_LFN == 3	/* Use dynamic memory allocation */
diff --git a/source/core/fatfs/ffunicode.c b/source/core/devoptab/fatfs/ffunicode.c
similarity index 99%
rename from source/core/fatfs/ffunicode.c
rename to source/core/devoptab/fatfs/ffunicode.c
index 181c233e..058d090e 100644
--- a/source/core/fatfs/ffunicode.c
+++ b/source/core/devoptab/fatfs/ffunicode.c
@@ -23,7 +23,7 @@
 */
 
 
-#include <core/fatfs/ff.h>
+#include <core/devoptab/fatfs/ff.h>
 
 #if FF_USE_LFN != 0	/* This module will be blanked if in non-LFN configuration */
 
diff --git a/todo.txt b/todo.txt
index 7e7b83b3..57c600fb 100644
--- a/todo.txt
+++ b/todo.txt
@@ -13,7 +13,6 @@ todo:
 
     others: check todo with grep
     others: dump verification via no-intro
-    others: fatfs browser for emmc partitions
 
 reminder: