diff --git a/fusee/fusee-primary/src/diskio.c b/fusee/fusee-primary/src/lib/fatfs/diskio.c
similarity index 99%
rename from fusee/fusee-primary/src/diskio.c
rename to fusee/fusee-primary/src/lib/fatfs/diskio.c
index e064dfa5f..ad9d4159b 100644
--- a/fusee/fusee-primary/src/diskio.c
+++ b/fusee/fusee-primary/src/lib/fatfs/diskio.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include "diskio.h"		/* FatFs lower layer API */
-#include "sdmmc.h"
+#include "../../sdmmc.h"
 
 /* Global sd struct. */
 extern struct mmc sd_mmc;
diff --git a/fusee/fusee-primary/src/diskio.h b/fusee/fusee-primary/src/lib/fatfs/diskio.h
similarity index 100%
rename from fusee/fusee-primary/src/diskio.h
rename to fusee/fusee-primary/src/lib/fatfs/diskio.h
diff --git a/fusee/fusee-primary/src/ff.c b/fusee/fusee-primary/src/lib/fatfs/ff.c
similarity index 99%
rename from fusee/fusee-primary/src/ff.c
rename to fusee/fusee-primary/src/lib/fatfs/ff.c
index 4422bfdea..5ea657350 100644
--- a/fusee/fusee-primary/src/ff.c
+++ b/fusee/fusee-primary/src/lib/fatfs/ff.c
@@ -2237,7 +2237,7 @@ void init_alloc_info (
 /* exFAT: Load the object's directory entry block */
 /*------------------------------------------------*/
 static
-FRESULT load_obj_xdir (	
+FRESULT load_obj_xdir (
 	DIR* dp,			/* Blank directory object to be used to access containing direcotry */
 	const FFOBJID* obj	/* Object with its containing directory information */
 )
diff --git a/fusee/fusee-primary/src/ff.h b/fusee/fusee-primary/src/lib/fatfs/ff.h
similarity index 100%
rename from fusee/fusee-primary/src/ff.h
rename to fusee/fusee-primary/src/lib/fatfs/ff.h
diff --git a/fusee/fusee-primary/src/ffconf.h b/fusee/fusee-primary/src/lib/fatfs/ffconf.h
similarity index 100%
rename from fusee/fusee-primary/src/ffconf.h
rename to fusee/fusee-primary/src/lib/fatfs/ffconf.h
diff --git a/fusee/fusee-primary/src/ffsystem.c b/fusee/fusee-primary/src/lib/fatfs/ffsystem.c
similarity index 100%
rename from fusee/fusee-primary/src/ffsystem.c
rename to fusee/fusee-primary/src/lib/fatfs/ffsystem.c
diff --git a/fusee/fusee-primary/src/ffunicode.c b/fusee/fusee-primary/src/lib/fatfs/ffunicode.c
similarity index 100%
rename from fusee/fusee-primary/src/ffunicode.c
rename to fusee/fusee-primary/src/lib/fatfs/ffunicode.c
diff --git a/fusee/fusee-primary/src/integer.h b/fusee/fusee-primary/src/lib/fatfs/integer.h
similarity index 100%
rename from fusee/fusee-primary/src/integer.h
rename to fusee/fusee-primary/src/lib/fatfs/integer.h
diff --git a/fusee/fusee-primary/src/sd_utils.c b/fusee/fusee-primary/src/sd_utils.c
index 3576d9b66..965ad2f01 100644
--- a/fusee/fusee-primary/src/sd_utils.c
+++ b/fusee/fusee-primary/src/sd_utils.c
@@ -2,7 +2,7 @@
 #include "hwinit.h"
 #include "sdmmc.h"
 #include "lib/printk.h"
-#include "ff.h"
+#include "lib/fatfs/ff.h"
 
 /* This is used by diskio.h. */
 struct mmc sd_mmc;
@@ -51,15 +51,15 @@ size_t read_sd_file(void *dst, size_t dst_size, const char *filename) {
     if (!mounted_sd && mount_sd() == 0) {
         return 0;
     }
-    
+
     FIL f;
     if (f_open(&f, filename, FA_READ) != FR_OK) {
         return 0;
     }
-    
+
     UINT br;
     int res = f_read(&f, dst, dst_size, &br);
     f_close(&f);
-    
+
     return res == FR_OK ? (int)br : 0;
-}
\ No newline at end of file
+}
diff --git a/fusee/fusee-primary/src/sd_utils.h b/fusee/fusee-primary/src/sd_utils.h
index 0ff473aa9..11401335c 100644
--- a/fusee/fusee-primary/src/sd_utils.h
+++ b/fusee/fusee-primary/src/sd_utils.h
@@ -3,11 +3,11 @@
 
 #include "utils.h"
 #include "sdmmc.h"
-#include "ff.h"
+#include "lib/fatfs/ff.h"
 
 void save_sd_state(void **mmc, void **ff);
 void resume_sd_state(void *mmc, void *ff);
 
 size_t read_sd_file(void *dst, size_t dst_size, const char *filename);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/fusee/fusee-secondary/src/diskio.c b/fusee/fusee-secondary/src/lib/fatfs/diskio.c
similarity index 99%
rename from fusee/fusee-secondary/src/diskio.c
rename to fusee/fusee-secondary/src/lib/fatfs/diskio.c
index e064dfa5f..ad9d4159b 100644
--- a/fusee/fusee-secondary/src/diskio.c
+++ b/fusee/fusee-secondary/src/lib/fatfs/diskio.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include "diskio.h"		/* FatFs lower layer API */
-#include "sdmmc.h"
+#include "../../sdmmc.h"
 
 /* Global sd struct. */
 extern struct mmc sd_mmc;
diff --git a/fusee/fusee-secondary/src/diskio.h b/fusee/fusee-secondary/src/lib/fatfs/diskio.h
similarity index 100%
rename from fusee/fusee-secondary/src/diskio.h
rename to fusee/fusee-secondary/src/lib/fatfs/diskio.h
diff --git a/fusee/fusee-secondary/src/ff.c b/fusee/fusee-secondary/src/lib/fatfs/ff.c
similarity index 99%
rename from fusee/fusee-secondary/src/ff.c
rename to fusee/fusee-secondary/src/lib/fatfs/ff.c
index 4422bfdea..5ea657350 100644
--- a/fusee/fusee-secondary/src/ff.c
+++ b/fusee/fusee-secondary/src/lib/fatfs/ff.c
@@ -2237,7 +2237,7 @@ void init_alloc_info (
 /* exFAT: Load the object's directory entry block */
 /*------------------------------------------------*/
 static
-FRESULT load_obj_xdir (	
+FRESULT load_obj_xdir (
 	DIR* dp,			/* Blank directory object to be used to access containing direcotry */
 	const FFOBJID* obj	/* Object with its containing directory information */
 )
diff --git a/fusee/fusee-secondary/src/ff.h b/fusee/fusee-secondary/src/lib/fatfs/ff.h
similarity index 100%
rename from fusee/fusee-secondary/src/ff.h
rename to fusee/fusee-secondary/src/lib/fatfs/ff.h
diff --git a/fusee/fusee-secondary/src/ffconf.h b/fusee/fusee-secondary/src/lib/fatfs/ffconf.h
similarity index 100%
rename from fusee/fusee-secondary/src/ffconf.h
rename to fusee/fusee-secondary/src/lib/fatfs/ffconf.h
diff --git a/fusee/fusee-secondary/src/ffsystem.c b/fusee/fusee-secondary/src/lib/fatfs/ffsystem.c
similarity index 100%
rename from fusee/fusee-secondary/src/ffsystem.c
rename to fusee/fusee-secondary/src/lib/fatfs/ffsystem.c
diff --git a/fusee/fusee-secondary/src/ffunicode.c b/fusee/fusee-secondary/src/lib/fatfs/ffunicode.c
similarity index 100%
rename from fusee/fusee-secondary/src/ffunicode.c
rename to fusee/fusee-secondary/src/lib/fatfs/ffunicode.c
diff --git a/fusee/fusee-secondary/src/integer.h b/fusee/fusee-secondary/src/lib/fatfs/integer.h
similarity index 100%
rename from fusee/fusee-secondary/src/integer.h
rename to fusee/fusee-secondary/src/lib/fatfs/integer.h
diff --git a/fusee/fusee-secondary/src/sd_utils.c b/fusee/fusee-secondary/src/sd_utils.c
index 3576d9b66..965ad2f01 100644
--- a/fusee/fusee-secondary/src/sd_utils.c
+++ b/fusee/fusee-secondary/src/sd_utils.c
@@ -2,7 +2,7 @@
 #include "hwinit.h"
 #include "sdmmc.h"
 #include "lib/printk.h"
-#include "ff.h"
+#include "lib/fatfs/ff.h"
 
 /* This is used by diskio.h. */
 struct mmc sd_mmc;
@@ -51,15 +51,15 @@ size_t read_sd_file(void *dst, size_t dst_size, const char *filename) {
     if (!mounted_sd && mount_sd() == 0) {
         return 0;
     }
-    
+
     FIL f;
     if (f_open(&f, filename, FA_READ) != FR_OK) {
         return 0;
     }
-    
+
     UINT br;
     int res = f_read(&f, dst, dst_size, &br);
     f_close(&f);
-    
+
     return res == FR_OK ? (int)br : 0;
-}
\ No newline at end of file
+}
diff --git a/fusee/fusee-secondary/src/sd_utils.h b/fusee/fusee-secondary/src/sd_utils.h
index 0ff473aa9..11401335c 100644
--- a/fusee/fusee-secondary/src/sd_utils.h
+++ b/fusee/fusee-secondary/src/sd_utils.h
@@ -3,11 +3,11 @@
 
 #include "utils.h"
 #include "sdmmc.h"
-#include "ff.h"
+#include "lib/fatfs/ff.h"
 
 void save_sd_state(void **mmc, void **ff);
 void resume_sd_state(void *mmc, void *ff);
 
 size_t read_sd_file(void *dst, size_t dst_size, const char *filename);
 
-#endif
\ No newline at end of file
+#endif