diff --git a/include/espressif/esp_spiffs.h b/components/spiffs/include/esp_spiffs.h
similarity index 100%
rename from include/espressif/esp_spiffs.h
rename to components/spiffs/include/esp_spiffs.h
diff --git a/include/spiffs/spiffs.h b/components/spiffs/include/spiffs.h
similarity index 100%
rename from include/spiffs/spiffs.h
rename to components/spiffs/include/spiffs.h
diff --git a/include/spiffs/spiffs_config.h b/components/spiffs/include/spiffs_config.h
similarity index 100%
rename from include/spiffs/spiffs_config.h
rename to components/spiffs/include/spiffs_config.h
diff --git a/include/spiffs/spiffs_nucleus.h b/components/spiffs/include/spiffs_nucleus.h
similarity index 100%
rename from include/spiffs/spiffs_nucleus.h
rename to components/spiffs/include/spiffs_nucleus.h
diff --git a/third_party/spiffs/Makefile b/components/spiffs/library/Makefile
similarity index 100%
rename from third_party/spiffs/Makefile
rename to components/spiffs/library/Makefile
diff --git a/third_party/spiffs/esp_spiffs.c b/components/spiffs/library/esp_spiffs.c
similarity index 100%
rename from third_party/spiffs/esp_spiffs.c
rename to components/spiffs/library/esp_spiffs.c
diff --git a/third_party/spiffs/spiffs_cache.c b/components/spiffs/library/spiffs_cache.c
similarity index 100%
rename from third_party/spiffs/spiffs_cache.c
rename to components/spiffs/library/spiffs_cache.c
diff --git a/third_party/spiffs/spiffs_check.c b/components/spiffs/library/spiffs_check.c
similarity index 100%
rename from third_party/spiffs/spiffs_check.c
rename to components/spiffs/library/spiffs_check.c
diff --git a/third_party/spiffs/spiffs_gc.c b/components/spiffs/library/spiffs_gc.c
similarity index 100%
rename from third_party/spiffs/spiffs_gc.c
rename to components/spiffs/library/spiffs_gc.c
diff --git a/third_party/spiffs/spiffs_hydrogen.c b/components/spiffs/library/spiffs_hydrogen.c
similarity index 100%
rename from third_party/spiffs/spiffs_hydrogen.c
rename to components/spiffs/library/spiffs_hydrogen.c
diff --git a/third_party/spiffs/spiffs_nucleus.c b/components/spiffs/library/spiffs_nucleus.c
similarity index 100%
rename from third_party/spiffs/spiffs_nucleus.c
rename to components/spiffs/library/spiffs_nucleus.c