diff --git a/src/CMakeLists.txt b/main/CMakeLists.txt
similarity index 94%
rename from src/CMakeLists.txt
rename to main/CMakeLists.txt
index f834d3b..2b36ccc 100644
--- a/src/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -2,7 +2,7 @@
 file (GLOB SOURCES *.cpp  highint5.S)
 idf_component_register(SRCS ${SOURCES}
     INCLUDE_DIRS .
-    REQUIRES lvgl_esp32_drivers lvgl lvgl_tft lvgl_touch lvgl_cpp minmea)
+    REQUIRES lvgl_esp32_drivers lvgl lvgl_tft lvgl_touch lvgl_cpp minmea nvs_flash)
 target_compile_definitions(${COMPONENT_LIB} PRIVATE LV_CONF_INCLUDE_SIMPLE=1)
 component_compile_options(-std=c++17)
 target_link_libraries(${COMPONENT_TARGET} "-u ld_include_my_isr_file")
diff --git a/src/Config.cpp b/main/Config.cpp
similarity index 100%
rename from src/Config.cpp
rename to main/Config.cpp
diff --git a/src/Config.h b/main/Config.h
similarity index 100%
rename from src/Config.h
rename to main/Config.h
diff --git a/src/DS3231.cpp b/main/DS3231.cpp
similarity index 100%
rename from src/DS3231.cpp
rename to main/DS3231.cpp
diff --git a/src/DS3231.h b/main/DS3231.h
similarity index 100%
rename from src/DS3231.h
rename to main/DS3231.h
diff --git a/src/Display.cpp b/main/Display.cpp
similarity index 100%
rename from src/Display.cpp
rename to main/Display.cpp
diff --git a/src/Display.h b/main/Display.h
similarity index 100%
rename from src/Display.h
rename to main/Display.h
diff --git a/src/FieldText.cpp b/main/FieldText.cpp
similarity index 100%
rename from src/FieldText.cpp
rename to main/FieldText.cpp
diff --git a/src/FieldText.h b/main/FieldText.h
similarity index 100%
rename from src/FieldText.h
rename to main/FieldText.h
diff --git a/src/GPS.cpp b/main/GPS.cpp
similarity index 100%
rename from src/GPS.cpp
rename to main/GPS.cpp
diff --git a/src/GPS.h b/main/GPS.h
similarity index 100%
rename from src/GPS.h
rename to main/GPS.h
diff --git a/src/Kconfig.projbuild b/main/Kconfig.projbuild
similarity index 100%
rename from src/Kconfig.projbuild
rename to main/Kconfig.projbuild
diff --git a/src/MicroSecondTimer.cpp b/main/MicroSecondTimer.cpp
similarity index 100%
rename from src/MicroSecondTimer.cpp
rename to main/MicroSecondTimer.cpp
diff --git a/src/MicroSecondTimer.h b/main/MicroSecondTimer.h
similarity index 100%
rename from src/MicroSecondTimer.h
rename to main/MicroSecondTimer.h
diff --git a/src/NTP.cpp b/main/NTP.cpp
similarity index 100%
rename from src/NTP.cpp
rename to main/NTP.cpp
diff --git a/src/NTP.h b/main/NTP.h
similarity index 100%
rename from src/NTP.h
rename to main/NTP.h
diff --git a/src/Network.cpp b/main/Network.cpp
similarity index 100%
rename from src/Network.cpp
rename to main/Network.cpp
diff --git a/src/Network.h b/main/Network.h
similarity index 100%
rename from src/Network.h
rename to main/Network.h
diff --git a/src/PPS.cpp b/main/PPS.cpp
similarity index 100%
rename from src/PPS.cpp
rename to main/PPS.cpp
diff --git a/src/PPS.h b/main/PPS.h
similarity index 100%
rename from src/PPS.h
rename to main/PPS.h
diff --git a/src/PageAbout.cpp b/main/PageAbout.cpp
similarity index 100%
rename from src/PageAbout.cpp
rename to main/PageAbout.cpp
diff --git a/src/PageAbout.h b/main/PageAbout.h
similarity index 100%
rename from src/PageAbout.h
rename to main/PageAbout.h
diff --git a/src/PageConfig.cpp b/main/PageConfig.cpp
similarity index 100%
rename from src/PageConfig.cpp
rename to main/PageConfig.cpp
diff --git a/src/PageConfig.h b/main/PageConfig.h
similarity index 100%
rename from src/PageConfig.h
rename to main/PageConfig.h
diff --git a/src/PageDelta.cpp b/main/PageDelta.cpp
similarity index 100%
rename from src/PageDelta.cpp
rename to main/PageDelta.cpp
diff --git a/src/PageDelta.h b/main/PageDelta.h
similarity index 100%
rename from src/PageDelta.h
rename to main/PageDelta.h
diff --git a/src/PageGPS.cpp b/main/PageGPS.cpp
similarity index 100%
rename from src/PageGPS.cpp
rename to main/PageGPS.cpp
diff --git a/src/PageGPS.h b/main/PageGPS.h
similarity index 100%
rename from src/PageGPS.h
rename to main/PageGPS.h
diff --git a/src/PageNTP.cpp b/main/PageNTP.cpp
similarity index 100%
rename from src/PageNTP.cpp
rename to main/PageNTP.cpp
diff --git a/src/PageNTP.h b/main/PageNTP.h
similarity index 100%
rename from src/PageNTP.h
rename to main/PageNTP.h
diff --git a/src/PagePPS.cpp b/main/PagePPS.cpp
similarity index 100%
rename from src/PagePPS.cpp
rename to main/PagePPS.cpp
diff --git a/src/PagePPS.h b/main/PagePPS.h
similarity index 100%
rename from src/PagePPS.h
rename to main/PagePPS.h
diff --git a/src/PageSats.cpp b/main/PageSats.cpp
similarity index 100%
rename from src/PageSats.cpp
rename to main/PageSats.cpp
diff --git a/src/PageSats.h b/main/PageSats.h
similarity index 100%
rename from src/PageSats.h
rename to main/PageSats.h
diff --git a/src/PageSync.cpp b/main/PageSync.cpp
similarity index 100%
rename from src/PageSync.cpp
rename to main/PageSync.cpp
diff --git a/src/PageSync.h b/main/PageSync.h
similarity index 100%
rename from src/PageSync.h
rename to main/PageSync.h
diff --git a/src/PageTask.cpp b/main/PageTask.cpp
similarity index 100%
rename from src/PageTask.cpp
rename to main/PageTask.cpp
diff --git a/src/PageTask.h b/main/PageTask.h
similarity index 100%
rename from src/PageTask.h
rename to main/PageTask.h
diff --git a/src/SyncManager.cpp b/main/SyncManager.cpp
similarity index 100%
rename from src/SyncManager.cpp
rename to main/SyncManager.cpp
diff --git a/src/SyncManager.h b/main/SyncManager.h
similarity index 100%
rename from src/SyncManager.h
rename to main/SyncManager.h
diff --git a/src/WithDisplayLock.cpp b/main/WithDisplayLock.cpp
similarity index 100%
rename from src/WithDisplayLock.cpp
rename to main/WithDisplayLock.cpp
diff --git a/src/WithDisplayLock.h b/main/WithDisplayLock.h
similarity index 100%
rename from src/WithDisplayLock.h
rename to main/WithDisplayLock.h
diff --git a/src/highint5.S b/main/highint5.S
similarity index 100%
rename from src/highint5.S
rename to main/highint5.S
diff --git a/src/main.cpp b/main/main.cpp
similarity index 100%
rename from src/main.cpp
rename to main/main.cpp
diff --git a/platformio.ini b/platformio.ini
index 10ba8b0..3f1e9e3 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1,5 +1,6 @@
 [platformio]
 default_envs = default
+src_dir = main
 extra_configs =
   local.ini