diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index eff7ff55..d7169db1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,4 +22,4 @@ jobs:
       - name: "Run TactilityCore Tests"
         run: build/Tests/TactilityCore/TactilityCoreTests --exit
       - name: "Run TactilityHeadless Tests"
-        run: build/Tests/TactilityHeadless/TactilityHeadlessTests --exit
+        run: build/Tests/Tactility/TactilityTests --exit
diff --git a/App/CMakeLists.txt b/App/CMakeLists.txt
index 6e0d492d..61c9603e 100644
--- a/App/CMakeLists.txt
+++ b/App/CMakeLists.txt
@@ -19,7 +19,6 @@ else ()
     target_link_libraries(AppSim
         PRIVATE Tactility
         PRIVATE TactilityCore
-        PRIVATE TactilityHeadless
         PRIVATE Simulator
         PRIVATE SDL2::SDL2-static SDL2-static
     )
diff --git a/Boards/Simulator/CMakeLists.txt b/Boards/Simulator/CMakeLists.txt
index 3c21d837..7750f97a 100644
--- a/Boards/Simulator/CMakeLists.txt
+++ b/Boards/Simulator/CMakeLists.txt
@@ -15,7 +15,6 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
     target_link_libraries(Simulator
         PRIVATE Tactility
         PRIVATE TactilityCore
-        PRIVATE TactilityHeadless
         PRIVATE lvgl
         PRIVATE SDL2-static
     )
diff --git a/Buildscripts/runtests.sh b/Buildscripts/runtests.sh
index 2f6592c5..0f484589 100755
--- a/Buildscripts/runtests.sh
+++ b/Buildscripts/runtests.sh
@@ -3,5 +3,5 @@
 cmake -S ./ -B build-sim
 cmake --build build-sim --target build-tests -j 14
 build-sim/Tests/TactilityCore/TactilityCoreTests --exit
-build-sim/Tests/TactilityHeadless/TactilityHeadlessTests --exit
+build-sim/Tests/Tactility/TactilityTests --exit
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6928e5ba..3d310e4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,6 @@ if (DEFINED ENV{ESP_IDF_VERSION})
         "Tactility"
         "TactilityC"
         "TactilityCore"
-        "TactilityHeadless"
         "Libraries/esp_lvgl_port"
         "Libraries/elf_loader"
         "Libraries/lvgl"
@@ -58,7 +57,6 @@ project(Tactility)
 if (NOT DEFINED ENV{ESP_IDF_VERSION})
     add_subdirectory(Tactility)
     add_subdirectory(TactilityCore)
-    add_subdirectory(TactilityHeadless)
     add_subdirectory(Boards/Simulator)
 endif()
 
diff --git a/Documentation/application-lifecycle.puml b/Documentation/application-lifecycle.puml
deleted file mode 100644
index a88b3f6c..00000000
--- a/Documentation/application-lifecycle.puml
+++ /dev/null
@@ -1,9 +0,0 @@
-@startuml
-[*] --> onStart : app is created
-onStart --> onShow : app becomes visible
-onShow --> onHide : app is no longer visible
-onHide --> onStop : app is preparing to be destroyed
-onStop --> [*] : app is destroyed
-skinparam ranksep 25
-skinparam padding 2
-@enduml
\ No newline at end of file
diff --git a/Documentation/project-structure.puml b/Documentation/project-structure.puml
deleted file mode 100644
index b2b567bf..00000000
--- a/Documentation/project-structure.puml
+++ /dev/null
@@ -1,19 +0,0 @@
-@startuml
-skinparam componentStyle uml1
-
-[Tactility] as t
-note right of t : to build and use graphical apps
-[TactilityHeadless] as theadless
-note right of theadless : to build and use background services
-[TactilityCore] as tcore
-note right of tcore : defines, data types, logging, async, etc.
-
-[App] as app
-
-note right of app : App depends on the board \n projects for configuration
-
-[app] ..> [t]
-[t] ..> [theadless]
-[theadless] ..> [tcore]
-
-@enduml
\ No newline at end of file
diff --git a/Tactility/CMakeLists.txt b/Tactility/CMakeLists.txt
index 26ea9640..56ee17ec 100644
--- a/Tactility/CMakeLists.txt
+++ b/Tactility/CMakeLists.txt
@@ -6,16 +6,29 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if (DEFINED ENV{ESP_IDF_VERSION})
     file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
 
+    list(APPEND REQUIRES_LIST TactilityCore lvgl driver elf_loader lv_screenshot QRCode esp_lvgl_port minmea esp_wifi nvs_flash spiffs vfs fatfs lwip)
+    if ("${IDF_TARGET}" STREQUAL "esp32s3")
+        list(APPEND REQUIRES_LIST esp_tinyusb)
+    endif ()
+
     idf_component_register(
         SRCS ${SOURCE_FILES}
         INCLUDE_DIRS "Include/"
         PRIV_INCLUDE_DIRS "Private/"
-        REQUIRES TactilityHeadless lvgl driver elf_loader lv_screenshot QRCode esp_lvgl_port
+        REQUIRES ${REQUIRES_LIST}
     )
 
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-unused-variable)
-    endif()
+    endif ()
+
+    if (NOT DEFINED TACTILITY_SKIP_SPIFFS)
+        # Read-only
+        fatfs_create_rawflash_image(system "${CMAKE_CURRENT_SOURCE_DIR}/../Data/system" FLASH_IN_PROJECT PRESERVE_TIME)
+        # Read-write
+        fatfs_create_spiflash_image(data "${CMAKE_CURRENT_SOURCE_DIR}/../Data/data" FLASH_IN_PROJECT PRESERVE_TIME)
+    endif ()
+
 else()
     file(GLOB_RECURSE SOURCES "Source/*.c*")
 
@@ -37,10 +50,11 @@ else()
     add_definitions(-D_Nonnull=)
 
     target_link_libraries(Tactility
-        PUBLIC TactilityHeadless
-        PUBLIC lvgl
+        PUBLIC TactilityCore
         PUBLIC freertos_kernel
+        PUBLIC lvgl
         PUBLIC lv_screenshot
+        PUBLIC minmea
     )
 endif()
 
diff --git a/TactilityHeadless/Include/Tactility/Assets.h b/Tactility/Include/Tactility/Assets.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/Assets.h
rename to Tactility/Include/Tactility/Assets.h
diff --git a/TactilityHeadless/Include/Tactility/Partitions.h b/Tactility/Include/Tactility/Partitions.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/Partitions.h
rename to Tactility/Include/Tactility/Partitions.h
diff --git a/TactilityHeadless/Include/Tactility/Preferences.h b/Tactility/Include/Tactility/Preferences.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/Preferences.h
rename to Tactility/Include/Tactility/Preferences.h
diff --git a/TactilityHeadless/Include/Tactility/TactilityHeadless.h b/Tactility/Include/Tactility/TactilityHeadless.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/TactilityHeadless.h
rename to Tactility/Include/Tactility/TactilityHeadless.h
diff --git a/TactilityHeadless/Include/Tactility/hal/Configuration.h b/Tactility/Include/Tactility/hal/Configuration.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/Configuration.h
rename to Tactility/Include/Tactility/hal/Configuration.h
diff --git a/TactilityHeadless/Include/Tactility/hal/Device.h b/Tactility/Include/Tactility/hal/Device.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/Device.h
rename to Tactility/Include/Tactility/hal/Device.h
diff --git a/TactilityHeadless/Include/Tactility/hal/Gpio.h b/Tactility/Include/Tactility/hal/Gpio.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/Gpio.h
rename to Tactility/Include/Tactility/hal/Gpio.h
diff --git a/TactilityHeadless/Include/Tactility/hal/display/DisplayDevice.h b/Tactility/Include/Tactility/hal/display/DisplayDevice.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/display/DisplayDevice.h
rename to Tactility/Include/Tactility/hal/display/DisplayDevice.h
diff --git a/TactilityHeadless/Include/Tactility/hal/gps/GpsConfiguration.h b/Tactility/Include/Tactility/hal/gps/GpsConfiguration.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/gps/GpsConfiguration.h
rename to Tactility/Include/Tactility/hal/gps/GpsConfiguration.h
diff --git a/TactilityHeadless/Include/Tactility/hal/gps/GpsDevice.h b/Tactility/Include/Tactility/hal/gps/GpsDevice.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/gps/GpsDevice.h
rename to Tactility/Include/Tactility/hal/gps/GpsDevice.h
diff --git a/TactilityHeadless/Include/Tactility/hal/gps/Satellites.h b/Tactility/Include/Tactility/hal/gps/Satellites.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/gps/Satellites.h
rename to Tactility/Include/Tactility/hal/gps/Satellites.h
diff --git a/TactilityHeadless/Include/Tactility/hal/i2c/I2c.h b/Tactility/Include/Tactility/hal/i2c/I2c.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/i2c/I2c.h
rename to Tactility/Include/Tactility/hal/i2c/I2c.h
diff --git a/TactilityHeadless/Include/Tactility/hal/i2c/I2cCompat.h b/Tactility/Include/Tactility/hal/i2c/I2cCompat.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/i2c/I2cCompat.h
rename to Tactility/Include/Tactility/hal/i2c/I2cCompat.h
diff --git a/TactilityHeadless/Include/Tactility/hal/i2c/I2cDevice.h b/Tactility/Include/Tactility/hal/i2c/I2cDevice.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/i2c/I2cDevice.h
rename to Tactility/Include/Tactility/hal/i2c/I2cDevice.h
diff --git a/TactilityHeadless/Include/Tactility/hal/keyboard/KeyboardDevice.h b/Tactility/Include/Tactility/hal/keyboard/KeyboardDevice.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/keyboard/KeyboardDevice.h
rename to Tactility/Include/Tactility/hal/keyboard/KeyboardDevice.h
diff --git a/TactilityHeadless/Include/Tactility/hal/power/PowerDevice.h b/Tactility/Include/Tactility/hal/power/PowerDevice.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/power/PowerDevice.h
rename to Tactility/Include/Tactility/hal/power/PowerDevice.h
diff --git a/TactilityHeadless/Include/Tactility/hal/sdcard/SdCardDevice.h b/Tactility/Include/Tactility/hal/sdcard/SdCardDevice.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/sdcard/SdCardDevice.h
rename to Tactility/Include/Tactility/hal/sdcard/SdCardDevice.h
diff --git a/TactilityHeadless/Include/Tactility/hal/sdcard/SpiSdCardDevice.h b/Tactility/Include/Tactility/hal/sdcard/SpiSdCardDevice.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/sdcard/SpiSdCardDevice.h
rename to Tactility/Include/Tactility/hal/sdcard/SpiSdCardDevice.h
diff --git a/TactilityHeadless/Include/Tactility/hal/spi/Spi.h b/Tactility/Include/Tactility/hal/spi/Spi.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/spi/Spi.h
rename to Tactility/Include/Tactility/hal/spi/Spi.h
diff --git a/TactilityHeadless/Include/Tactility/hal/spi/SpiCompat.h b/Tactility/Include/Tactility/hal/spi/SpiCompat.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/spi/SpiCompat.h
rename to Tactility/Include/Tactility/hal/spi/SpiCompat.h
diff --git a/TactilityHeadless/Include/Tactility/hal/touch/TouchDevice.h b/Tactility/Include/Tactility/hal/touch/TouchDevice.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/touch/TouchDevice.h
rename to Tactility/Include/Tactility/hal/touch/TouchDevice.h
diff --git a/TactilityHeadless/Include/Tactility/hal/uart/Configuration.h b/Tactility/Include/Tactility/hal/uart/Configuration.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/uart/Configuration.h
rename to Tactility/Include/Tactility/hal/uart/Configuration.h
diff --git a/TactilityHeadless/Include/Tactility/hal/uart/Uart.h b/Tactility/Include/Tactility/hal/uart/Uart.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/uart/Uart.h
rename to Tactility/Include/Tactility/hal/uart/Uart.h
diff --git a/TactilityHeadless/Include/Tactility/hal/uart/UartCompat.h b/Tactility/Include/Tactility/hal/uart/UartCompat.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/uart/UartCompat.h
rename to Tactility/Include/Tactility/hal/uart/UartCompat.h
diff --git a/TactilityHeadless/Include/Tactility/hal/usb/Usb.h b/Tactility/Include/Tactility/hal/usb/Usb.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/hal/usb/Usb.h
rename to Tactility/Include/Tactility/hal/usb/Usb.h
diff --git a/TactilityHeadless/Include/Tactility/kernel/SystemEvents.h b/Tactility/Include/Tactility/kernel/SystemEvents.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/kernel/SystemEvents.h
rename to Tactility/Include/Tactility/kernel/SystemEvents.h
diff --git a/TactilityHeadless/Include/Tactility/service/Service.h b/Tactility/Include/Tactility/service/Service.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/service/Service.h
rename to Tactility/Include/Tactility/service/Service.h
diff --git a/TactilityHeadless/Include/Tactility/service/ServiceContext.h b/Tactility/Include/Tactility/service/ServiceContext.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/service/ServiceContext.h
rename to Tactility/Include/Tactility/service/ServiceContext.h
diff --git a/TactilityHeadless/Include/Tactility/service/ServiceManifest.h b/Tactility/Include/Tactility/service/ServiceManifest.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/service/ServiceManifest.h
rename to Tactility/Include/Tactility/service/ServiceManifest.h
diff --git a/TactilityHeadless/Include/Tactility/service/ServiceRegistry.h b/Tactility/Include/Tactility/service/ServiceRegistry.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/service/ServiceRegistry.h
rename to Tactility/Include/Tactility/service/ServiceRegistry.h
diff --git a/TactilityHeadless/Include/Tactility/service/espnow/EspNow.h b/Tactility/Include/Tactility/service/espnow/EspNow.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/service/espnow/EspNow.h
rename to Tactility/Include/Tactility/service/espnow/EspNow.h
diff --git a/TactilityHeadless/Include/Tactility/service/gps/GpsService.h b/Tactility/Include/Tactility/service/gps/GpsService.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/service/gps/GpsService.h
rename to Tactility/Include/Tactility/service/gps/GpsService.h
diff --git a/TactilityHeadless/Include/Tactility/service/gps/GpsState.h b/Tactility/Include/Tactility/service/gps/GpsState.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/service/gps/GpsState.h
rename to Tactility/Include/Tactility/service/gps/GpsState.h
diff --git a/TactilityHeadless/Include/Tactility/service/gps/GpsUtil.h b/Tactility/Include/Tactility/service/gps/GpsUtil.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/service/gps/GpsUtil.h
rename to Tactility/Include/Tactility/service/gps/GpsUtil.h
diff --git a/TactilityHeadless/Include/Tactility/service/wifi/Wifi.h b/Tactility/Include/Tactility/service/wifi/Wifi.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/service/wifi/Wifi.h
rename to Tactility/Include/Tactility/service/wifi/Wifi.h
diff --git a/TactilityHeadless/Include/Tactility/service/wifi/WifiGlobals.h b/Tactility/Include/Tactility/service/wifi/WifiGlobals.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/service/wifi/WifiGlobals.h
rename to Tactility/Include/Tactility/service/wifi/WifiGlobals.h
diff --git a/TactilityHeadless/Include/Tactility/service/wifi/WifiSettings.h b/Tactility/Include/Tactility/service/wifi/WifiSettings.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/service/wifi/WifiSettings.h
rename to Tactility/Include/Tactility/service/wifi/WifiSettings.h
diff --git a/TactilityHeadless/Include/Tactility/time/Time.h b/Tactility/Include/Tactility/time/Time.h
similarity index 100%
rename from TactilityHeadless/Include/Tactility/time/Time.h
rename to Tactility/Include/Tactility/time/Time.h
diff --git a/TactilityHeadless/Private/Tactility/InitEsp.h b/Tactility/Private/Tactility/InitEsp.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/InitEsp.h
rename to Tactility/Private/Tactility/InitEsp.h
diff --git a/TactilityHeadless/Private/Tactility/PartitionsEsp.h b/Tactility/Private/Tactility/PartitionsEsp.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/PartitionsEsp.h
rename to Tactility/Private/Tactility/PartitionsEsp.h
diff --git a/TactilityHeadless/Private/Tactility/hal/Hal_i.h b/Tactility/Private/Tactility/hal/Hal_i.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/hal/Hal_i.h
rename to Tactility/Private/Tactility/hal/Hal_i.h
diff --git a/TactilityHeadless/Private/Tactility/hal/gps/Cas.h b/Tactility/Private/Tactility/hal/gps/Cas.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/hal/gps/Cas.h
rename to Tactility/Private/Tactility/hal/gps/Cas.h
diff --git a/TactilityHeadless/Private/Tactility/hal/gps/GpsInit.h b/Tactility/Private/Tactility/hal/gps/GpsInit.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/hal/gps/GpsInit.h
rename to Tactility/Private/Tactility/hal/gps/GpsInit.h
diff --git a/TactilityHeadless/Private/Tactility/hal/gps/Probe.h b/Tactility/Private/Tactility/hal/gps/Probe.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/hal/gps/Probe.h
rename to Tactility/Private/Tactility/hal/gps/Probe.h
diff --git a/TactilityHeadless/Private/Tactility/hal/gps/Ublox.h b/Tactility/Private/Tactility/hal/gps/Ublox.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/hal/gps/Ublox.h
rename to Tactility/Private/Tactility/hal/gps/Ublox.h
diff --git a/TactilityHeadless/Private/Tactility/hal/gps/UbloxMessages.h b/Tactility/Private/Tactility/hal/gps/UbloxMessages.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/hal/gps/UbloxMessages.h
rename to Tactility/Private/Tactility/hal/gps/UbloxMessages.h
diff --git a/TactilityHeadless/Private/Tactility/hal/i2c/I2cInit.h b/Tactility/Private/Tactility/hal/i2c/I2cInit.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/hal/i2c/I2cInit.h
rename to Tactility/Private/Tactility/hal/i2c/I2cInit.h
diff --git a/TactilityHeadless/Private/Tactility/hal/spi/SpiInit.h b/Tactility/Private/Tactility/hal/spi/SpiInit.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/hal/spi/SpiInit.h
rename to Tactility/Private/Tactility/hal/spi/SpiInit.h
diff --git a/TactilityHeadless/Private/Tactility/hal/uart/UartEsp.h b/Tactility/Private/Tactility/hal/uart/UartEsp.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/hal/uart/UartEsp.h
rename to Tactility/Private/Tactility/hal/uart/UartEsp.h
diff --git a/TactilityHeadless/Private/Tactility/hal/uart/UartInit.h b/Tactility/Private/Tactility/hal/uart/UartInit.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/hal/uart/UartInit.h
rename to Tactility/Private/Tactility/hal/uart/UartInit.h
diff --git a/TactilityHeadless/Private/Tactility/hal/uart/UartPosix.h b/Tactility/Private/Tactility/hal/uart/UartPosix.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/hal/uart/UartPosix.h
rename to Tactility/Private/Tactility/hal/uart/UartPosix.h
diff --git a/TactilityHeadless/Private/Tactility/hal/usb/UsbTusb.h b/Tactility/Private/Tactility/hal/usb/UsbTusb.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/hal/usb/UsbTusb.h
rename to Tactility/Private/Tactility/hal/usb/UsbTusb.h
diff --git a/TactilityHeadless/Private/Tactility/network/NtpPrivate.h b/Tactility/Private/Tactility/network/NtpPrivate.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/network/NtpPrivate.h
rename to Tactility/Private/Tactility/network/NtpPrivate.h
diff --git a/TactilityHeadless/Private/Tactility/service/ServiceInstance.h b/Tactility/Private/Tactility/service/ServiceInstance.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/service/ServiceInstance.h
rename to Tactility/Private/Tactility/service/ServiceInstance.h
diff --git a/TactilityHeadless/Private/Tactility/service/ServiceInstancePaths.h b/Tactility/Private/Tactility/service/ServiceInstancePaths.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/service/ServiceInstancePaths.h
rename to Tactility/Private/Tactility/service/ServiceInstancePaths.h
diff --git a/TactilityHeadless/Private/Tactility/service/espnow/EspNowService.h b/Tactility/Private/Tactility/service/espnow/EspNowService.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/service/espnow/EspNowService.h
rename to Tactility/Private/Tactility/service/espnow/EspNowService.h
diff --git a/TactilityHeadless/Private/Tactility/service/espnow/EspNowWifi.h b/Tactility/Private/Tactility/service/espnow/EspNowWifi.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/service/espnow/EspNowWifi.h
rename to Tactility/Private/Tactility/service/espnow/EspNowWifi.h
diff --git a/TactilityHeadless/Private/Tactility/time/TimePrivate.h b/Tactility/Private/Tactility/time/TimePrivate.h
similarity index 100%
rename from TactilityHeadless/Private/Tactility/time/TimePrivate.h
rename to Tactility/Private/Tactility/time/TimePrivate.h
diff --git a/TactilityHeadless/Source/PartitionsEsp.cpp b/Tactility/Source/PartitionsEsp.cpp
similarity index 100%
rename from TactilityHeadless/Source/PartitionsEsp.cpp
rename to Tactility/Source/PartitionsEsp.cpp
diff --git a/TactilityHeadless/Source/PreferencesEsp.cpp b/Tactility/Source/PreferencesEsp.cpp
similarity index 100%
rename from TactilityHeadless/Source/PreferencesEsp.cpp
rename to Tactility/Source/PreferencesEsp.cpp
diff --git a/TactilityHeadless/Source/PreferencesMock.cpp b/Tactility/Source/PreferencesMock.cpp
similarity index 100%
rename from TactilityHeadless/Source/PreferencesMock.cpp
rename to Tactility/Source/PreferencesMock.cpp
diff --git a/TactilityHeadless/Source/TactilityHeadless.cpp b/Tactility/Source/TactilityHeadless.cpp
similarity index 100%
rename from TactilityHeadless/Source/TactilityHeadless.cpp
rename to Tactility/Source/TactilityHeadless.cpp
diff --git a/TactilityHeadless/Source/TactilityHeadlessEsp.cpp b/Tactility/Source/TactilityHeadlessEsp.cpp
similarity index 100%
rename from TactilityHeadless/Source/TactilityHeadlessEsp.cpp
rename to Tactility/Source/TactilityHeadlessEsp.cpp
diff --git a/TactilityHeadless/Source/hal/Device.cpp b/Tactility/Source/hal/Device.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/Device.cpp
rename to Tactility/Source/hal/Device.cpp
diff --git a/TactilityHeadless/Source/hal/Hal.cpp b/Tactility/Source/hal/Hal.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/Hal.cpp
rename to Tactility/Source/hal/Hal.cpp
diff --git a/TactilityHeadless/Source/hal/gps/GpsConfiguration.cpp b/Tactility/Source/hal/gps/GpsConfiguration.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/gps/GpsConfiguration.cpp
rename to Tactility/Source/hal/gps/GpsConfiguration.cpp
diff --git a/TactilityHeadless/Source/hal/gps/GpsDevice.cpp b/Tactility/Source/hal/gps/GpsDevice.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/gps/GpsDevice.cpp
rename to Tactility/Source/hal/gps/GpsDevice.cpp
diff --git a/TactilityHeadless/Source/hal/gps/GpsInit.cpp b/Tactility/Source/hal/gps/GpsInit.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/gps/GpsInit.cpp
rename to Tactility/Source/hal/gps/GpsInit.cpp
diff --git a/TactilityHeadless/Source/hal/gps/Probe.cpp b/Tactility/Source/hal/gps/Probe.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/gps/Probe.cpp
rename to Tactility/Source/hal/gps/Probe.cpp
diff --git a/TactilityHeadless/Source/hal/gps/Satellites.cpp b/Tactility/Source/hal/gps/Satellites.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/gps/Satellites.cpp
rename to Tactility/Source/hal/gps/Satellites.cpp
diff --git a/TactilityHeadless/Source/hal/gps/Ublox.cpp b/Tactility/Source/hal/gps/Ublox.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/gps/Ublox.cpp
rename to Tactility/Source/hal/gps/Ublox.cpp
diff --git a/TactilityHeadless/Source/hal/i2c/I2c.cpp b/Tactility/Source/hal/i2c/I2c.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/i2c/I2c.cpp
rename to Tactility/Source/hal/i2c/I2c.cpp
diff --git a/TactilityHeadless/Source/hal/i2c/I2cDevice.cpp b/Tactility/Source/hal/i2c/I2cDevice.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/i2c/I2cDevice.cpp
rename to Tactility/Source/hal/i2c/I2cDevice.cpp
diff --git a/TactilityHeadless/Source/hal/sdcard/SdCard.cpp b/Tactility/Source/hal/sdcard/SdCard.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/sdcard/SdCard.cpp
rename to Tactility/Source/hal/sdcard/SdCard.cpp
diff --git a/TactilityHeadless/Source/hal/sdcard/SpiSdCardDevice.cpp b/Tactility/Source/hal/sdcard/SpiSdCardDevice.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/sdcard/SpiSdCardDevice.cpp
rename to Tactility/Source/hal/sdcard/SpiSdCardDevice.cpp
diff --git a/TactilityHeadless/Source/hal/spi/Spi.cpp b/Tactility/Source/hal/spi/Spi.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/spi/Spi.cpp
rename to Tactility/Source/hal/spi/Spi.cpp
diff --git a/TactilityHeadless/Source/hal/uart/Uart.cpp b/Tactility/Source/hal/uart/Uart.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/uart/Uart.cpp
rename to Tactility/Source/hal/uart/Uart.cpp
diff --git a/TactilityHeadless/Source/hal/uart/UartEsp.cpp b/Tactility/Source/hal/uart/UartEsp.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/uart/UartEsp.cpp
rename to Tactility/Source/hal/uart/UartEsp.cpp
diff --git a/TactilityHeadless/Source/hal/uart/UartPosix.cpp b/Tactility/Source/hal/uart/UartPosix.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/uart/UartPosix.cpp
rename to Tactility/Source/hal/uart/UartPosix.cpp
diff --git a/TactilityHeadless/Source/hal/usb/Usb.cpp b/Tactility/Source/hal/usb/Usb.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/usb/Usb.cpp
rename to Tactility/Source/hal/usb/Usb.cpp
diff --git a/TactilityHeadless/Source/hal/usb/UsbMock.cpp b/Tactility/Source/hal/usb/UsbMock.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/usb/UsbMock.cpp
rename to Tactility/Source/hal/usb/UsbMock.cpp
diff --git a/TactilityHeadless/Source/hal/usb/UsbTusb.cpp b/Tactility/Source/hal/usb/UsbTusb.cpp
similarity index 100%
rename from TactilityHeadless/Source/hal/usb/UsbTusb.cpp
rename to Tactility/Source/hal/usb/UsbTusb.cpp
diff --git a/TactilityHeadless/Source/kernel/SystemEvents.cpp b/Tactility/Source/kernel/SystemEvents.cpp
similarity index 100%
rename from TactilityHeadless/Source/kernel/SystemEvents.cpp
rename to Tactility/Source/kernel/SystemEvents.cpp
diff --git a/TactilityHeadless/Source/network/Ntp.cpp b/Tactility/Source/network/Ntp.cpp
similarity index 100%
rename from TactilityHeadless/Source/network/Ntp.cpp
rename to Tactility/Source/network/Ntp.cpp
diff --git a/TactilityHeadless/Source/service/ServiceInstance.cpp b/Tactility/Source/service/ServiceInstance.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/ServiceInstance.cpp
rename to Tactility/Source/service/ServiceInstance.cpp
diff --git a/TactilityHeadless/Source/service/ServiceInstancePaths.cpp b/Tactility/Source/service/ServiceInstancePaths.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/ServiceInstancePaths.cpp
rename to Tactility/Source/service/ServiceInstancePaths.cpp
diff --git a/TactilityHeadless/Source/service/ServiceRegistry.cpp b/Tactility/Source/service/ServiceRegistry.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/ServiceRegistry.cpp
rename to Tactility/Source/service/ServiceRegistry.cpp
diff --git a/TactilityHeadless/Source/service/espnow/EspNow.cpp b/Tactility/Source/service/espnow/EspNow.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/espnow/EspNow.cpp
rename to Tactility/Source/service/espnow/EspNow.cpp
diff --git a/TactilityHeadless/Source/service/espnow/EspNowService.cpp b/Tactility/Source/service/espnow/EspNowService.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/espnow/EspNowService.cpp
rename to Tactility/Source/service/espnow/EspNowService.cpp
diff --git a/TactilityHeadless/Source/service/espnow/EspNowWifi.cpp b/Tactility/Source/service/espnow/EspNowWifi.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/espnow/EspNowWifi.cpp
rename to Tactility/Source/service/espnow/EspNowWifi.cpp
diff --git a/TactilityHeadless/Source/service/gps/GpsConfiguration.cpp b/Tactility/Source/service/gps/GpsConfiguration.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/gps/GpsConfiguration.cpp
rename to Tactility/Source/service/gps/GpsConfiguration.cpp
diff --git a/TactilityHeadless/Source/service/gps/GpsService.cpp b/Tactility/Source/service/gps/GpsService.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/gps/GpsService.cpp
rename to Tactility/Source/service/gps/GpsService.cpp
diff --git a/TactilityHeadless/Source/service/sdcard/Sdcard.cpp b/Tactility/Source/service/sdcard/Sdcard.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/sdcard/Sdcard.cpp
rename to Tactility/Source/service/sdcard/Sdcard.cpp
diff --git a/TactilityHeadless/Source/service/wifi/Wifi.cpp b/Tactility/Source/service/wifi/Wifi.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/wifi/Wifi.cpp
rename to Tactility/Source/service/wifi/Wifi.cpp
diff --git a/TactilityHeadless/Source/service/wifi/WifiEsp.cpp b/Tactility/Source/service/wifi/WifiEsp.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/wifi/WifiEsp.cpp
rename to Tactility/Source/service/wifi/WifiEsp.cpp
diff --git a/TactilityHeadless/Source/service/wifi/WifiMock.cpp b/Tactility/Source/service/wifi/WifiMock.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/wifi/WifiMock.cpp
rename to Tactility/Source/service/wifi/WifiMock.cpp
diff --git a/TactilityHeadless/Source/service/wifi/WifiSettings.cpp b/Tactility/Source/service/wifi/WifiSettings.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/wifi/WifiSettings.cpp
rename to Tactility/Source/service/wifi/WifiSettings.cpp
diff --git a/TactilityHeadless/Source/service/wifi/WifiSettingsEsp.cpp b/Tactility/Source/service/wifi/WifiSettingsEsp.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/wifi/WifiSettingsEsp.cpp
rename to Tactility/Source/service/wifi/WifiSettingsEsp.cpp
diff --git a/TactilityHeadless/Source/service/wifi/WifiSettingsMock.cpp b/Tactility/Source/service/wifi/WifiSettingsMock.cpp
similarity index 100%
rename from TactilityHeadless/Source/service/wifi/WifiSettingsMock.cpp
rename to Tactility/Source/service/wifi/WifiSettingsMock.cpp
diff --git a/TactilityHeadless/Source/time/Time.cpp b/Tactility/Source/time/Time.cpp
similarity index 100%
rename from TactilityHeadless/Source/time/Time.cpp
rename to Tactility/Source/time/Time.cpp
diff --git a/TactilityC/CMakeLists.txt b/TactilityC/CMakeLists.txt
index 75648ae3..c3d239b3 100644
--- a/TactilityC/CMakeLists.txt
+++ b/TactilityC/CMakeLists.txt
@@ -10,7 +10,7 @@ if (DEFINED ENV{ESP_IDF_VERSION})
         SRCS ${SOURCE_FILES}
         INCLUDE_DIRS "Include/"
         REQUIRES lvgl
-        PRIV_REQUIRES Tactility TactilityCore TactilityHeadless elf_loader
+        PRIV_REQUIRES Tactility TactilityCore elf_loader
     )
 
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -34,7 +34,6 @@ else()
     target_link_libraries(TactilityC
         PRIVATE Tactility
         PRIVATE TactilityCore
-        PRIVATE TactilityHeadless
         PUBLIC lvgl
     )
 endif()
diff --git a/TactilityHeadless/CMakeLists.txt b/TactilityHeadless/CMakeLists.txt
deleted file mode 100644
index 372baf27..00000000
--- a/TactilityHeadless/CMakeLists.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-cmake_minimum_required(VERSION 3.20)
-
-set(CMAKE_CXX_STANDARD 23)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-if (DEFINED ENV{ESP_IDF_VERSION})
-    file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
-
-    list(APPEND REQUIRES_LIST TactilityCore minmea esp_wifi nvs_flash driver spiffs vfs fatfs lwip)
-    if("${IDF_TARGET}" STREQUAL "esp32s3")
-        list(APPEND REQUIRES_LIST esp_tinyusb)
-    endif()
-
-    idf_component_register(
-        SRCS ${SOURCE_FILES}
-        INCLUDE_DIRS "Include/"
-        PRIV_INCLUDE_DIRS "Private/"
-        REQUIRES ${REQUIRES_LIST}
-    )
-
-    if (NOT DEFINED TACTILITY_SKIP_SPIFFS)
-        # Read-only
-        fatfs_create_rawflash_image(system "${CMAKE_CURRENT_SOURCE_DIR}/../Data/system" FLASH_IN_PROJECT PRESERVE_TIME)
-        # Read-write
-        fatfs_create_spiflash_image(data "${CMAKE_CURRENT_SOURCE_DIR}/../Data/data" FLASH_IN_PROJECT PRESERVE_TIME)
-    endif()
-
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-unused-variable)
-    endif()
-else()
-    file(GLOB_RECURSE SOURCES "Source/*.c*")
-
-    add_library(TactilityHeadless OBJECT)
-    target_sources(TactilityHeadless
-        PRIVATE ${SOURCES}
-    )
-
-    include_directories(
-        Private/
-        Include/
-    )
-
-    target_include_directories(TactilityHeadless
-        PUBLIC Include/
-    )
-
-    add_definitions(-D_Nullable=)
-    add_definitions(-D_Nonnull=)
-
-    target_link_libraries(TactilityHeadless
-        PUBLIC TactilityCore
-        PUBLIC freertos_kernel
-        PUBLIC minmea
-    )
-endif()
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index db15e22e..d6120d46 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -4,8 +4,8 @@ set(DOCTESTINC ${PROJECT_SOURCE_DIR}/Include)
 
 enable_testing()
 add_subdirectory(TactilityCore)
-add_subdirectory(TactilityHeadless)
+add_subdirectory(Tactility)
 
 add_custom_target(build-tests)
 add_dependencies(build-tests TactilityCoreTests)
-add_dependencies(build-tests TactilityHeadlessTests)
+add_dependencies(build-tests TactilityTests)
diff --git a/Tests/TactilityHeadless/CMakeLists.txt b/Tests/Tactility/CMakeLists.txt
similarity index 53%
rename from Tests/TactilityHeadless/CMakeLists.txt
rename to Tests/Tactility/CMakeLists.txt
index 5116706a..2e0fcddd 100644
--- a/Tests/TactilityHeadless/CMakeLists.txt
+++ b/Tests/Tactility/CMakeLists.txt
@@ -5,23 +5,23 @@ enable_language(C CXX ASM)
 set(CMAKE_CXX_COMPILER g++)
 
 file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/*.cpp)
-add_executable(TactilityHeadlessTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
+add_executable(TactilityTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
 
 add_definitions(-D_Nullable=)
 add_definitions(-D_Nonnull=)
 
-target_include_directories(TactilityHeadlessTests PRIVATE
+target_include_directories(TactilityTests PRIVATE
     ${DOCTESTINC}
 )
 
-add_test(NAME TactilityHeadlessTests
-    COMMAND TactilityHeadlessTests
+add_test(NAME TactilityTests
+    COMMAND TactilityTests
 )
 
-target_link_libraries(TactilityHeadlessTests PRIVATE
+target_link_libraries(TactilityTests PRIVATE
     Tactility
     TactilityCore
-    TactilityHeadless
+    Tactility
     Simulator
     SDL2::SDL2-static SDL2-static
 )
diff --git a/Tests/TactilityHeadless/HalDeviceTest.cpp b/Tests/Tactility/HalDeviceTest.cpp
similarity index 100%
rename from Tests/TactilityHeadless/HalDeviceTest.cpp
rename to Tests/Tactility/HalDeviceTest.cpp
diff --git a/Tests/TactilityHeadless/Main.cpp b/Tests/Tactility/Main.cpp
similarity index 100%
rename from Tests/TactilityHeadless/Main.cpp
rename to Tests/Tactility/Main.cpp