diff --git a/CmakeLists.txt b/CmakeLists.txt
index 373b7e8..0e20249 100644
--- a/CmakeLists.txt
+++ b/CmakeLists.txt
@@ -9,8 +9,9 @@ if (NOT TARGET pico_fatfs)
     )
 
     target_include_directories(pico_fatfs INTERFACE
-        ${CMAKE_CURRENT_LIST_DIR}/fatfs
         ${CMAKE_CURRENT_LIST_DIR}
+        ${CMAKE_CURRENT_LIST_DIR}/fatfs
+        ${CMAKE_CURRENT_LIST_DIR}/fatfs/conf
     )
 
     target_link_libraries(pico_fatfs INTERFACE
diff --git a/fatfs/CMakeLists.txt b/fatfs/CMakeLists.txt
deleted file mode 100644
index d914e75..0000000
--- a/fatfs/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-if (NOT TARGET fatfs)
-    add_library(fatfs INTERFACE)
-
-    target_sources(fatfs INTERFACE
-            ${CMAKE_CURRENT_LIST_DIR}/ff.c
-            ${CMAKE_CURRENT_LIST_DIR}/ffsystem.c
-            ${CMAKE_CURRENT_LIST_DIR}/ffunicode.c
-            ${CMAKE_CURRENT_LIST_DIR}/tf_card.c
-    )
-
-    target_link_libraries(fatfs INTERFACE pico_stdlib hardware_clocks hardware_spi)
-    #target_include_directories(fatfs INTERFACE ${CMAKE_CURRENT_LIST_DIR}/include)
-endif()
diff --git a/fatfs/ffconf.h b/fatfs/conf/ffconf.h
similarity index 100%
rename from fatfs/ffconf.h
rename to fatfs/conf/ffconf.h