TactilityProject · KenVanHoeylandt · Jul 5, 2026 · Jul 5, 2026 · Jul 5, 2026
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,11 +19,9 @@ jobs:
         run: cmake -S ./ -B build
       - name: "Build Tests"
         run: cmake --build build --target build-tests
-      - name: "Run TactilityCore Tests"
-        run: build/Tests/TactilityCore/TactilityCoreTests
       - name: "Run TactilityFreeRtos Tests"
         run: build/Tests/TactilityFreeRtos/TactilityFreeRtosTests
-      - name: "Run TactilityHeadless Tests"
+      - name: "Run Tactility Tests"
         run: build/Tests/Tactility/TactilityTests
       - name: "Run TactilityKernel Tests"
         run: build/Tests/TactilityKernel/TactilityKernelTests

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,7 +43,6 @@ if (DEFINED ENV{ESP_IDF_VERSION})
         "TactilityKernel"
         "Tactility"
         "TactilityC"
-        "TactilityCore"
         "TactilityFreeRtos"
         "Libraries/elf_loader"
         "Libraries/lv_screenshot"
@@ -84,7 +83,6 @@ project(Tactility)
 # Defined as regular project for PC and component for ESP
 if (NOT DEFINED ENV{ESP_IDF_VERSION})
     add_subdirectory(Tactility)
-    add_subdirectory(TactilityCore)
     add_subdirectory(TactilityFreeRtos)
     add_subdirectory(TactilityKernel)
     add_subdirectory(Platforms/platform-posix)

diff --git a/Devices/m5stack-papers3/CMakeLists.txt b/Devices/m5stack-papers3/CMakeLists.txt
@@ -2,5 +2,5 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
 
 idf_component_register(SRCS ${SOURCE_FILES}
     INCLUDE_DIRS "Source"
-    REQUIRES EPDiyDisplay GT911 TactilityCore driver EstimatedPower
+    REQUIRES EPDiyDisplay GT911 Tactility driver EstimatedPower
 )
diff --git a/Devices/simulator/CMakeLists.txt b/Devices/simulator/CMakeLists.txt
@@ -14,7 +14,6 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
 
     target_link_libraries(simulator
         PRIVATE Tactility
-        PRIVATE TactilityCore
         PRIVATE lvgl
         PRIVATE SDL2-static
     )

diff --git a/Documentation/README.md b/Documentation/README.md
@@ -1,6 +1,4 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+# README
 
 ## Project Overview
 
@@ -41,21 +39,20 @@ Tests use Doctest and run on simulator (POSIX) target only:
 cmake -B buildsim -G Ninja
 ninja -C buildsim build-tests
 cd buildsim && ctest            # run all tests
-./buildsim/Tests/TactilityCore/TactilityCoreTests    # run a single test suite
 ./buildsim/Tests/TactilityKernel/TactilityKernelTests
 ./buildsim/Tests/Tactility/TactilityTests
 ./buildsim/Tests/TactilityFreeRtos/TactilityFreeRtosTests
+./buildsim/Tests/crypt-module/CryptModuleTests
 ```
 
 ## Architecture
 
 ### Layer Stack (bottom to top)
 
 - **TactilityKernel** — C API kernel: device/driver/module lifecycle, concurrency primitives (thread, mutex, timer, dispatcher), filesystem, logging. Header convention: `<tactility/*.h>` (lowercase snake_case).
-- **TactilityCore** — Former kernel subproject. Deprecated, replaced by TactilityKernel. Contains C++ utilities: Bundle (key-value data), string helpers, file I/O, crypto. Header convention: `<Tactility/*.h>` (UpperCamelCase).
 - **TactilityFreeRtos** — Thin C++ wrappers around FreeRTOS primitives.
 - **Tactility** — Main OS layer: app framework, service framework, HAL (deprecated, replaced by TactilityKernel), LVGL integration, networking and services (Wi-Fi, BLE, NTP, ESP-NOW), settings, i18n.
-- **TactilityC** — C bindings (`tt_*.h`) for TactilityCore and Tactility subprojects, used by side-loaded ELF apps on ESP32. Deprecated, replaced by TactilityKernel.
+- **TactilityC** — C bindings (`tt_*.h`) for Tactility, used by side-loaded ELF apps on ESP32. Deprecated, replaced by TactilityKernel.
 - **Firmware** — Entry point (`app_main`).
 
 ### Device/Driver/Module System (kernel layer, C API)
@@ -135,7 +132,7 @@ User interfaces should scale well for everything between very large (e.g. 1280x7
 Two conventions coexist; which one to use depends on the project layer:
 
 - **C code** (TactilityKernel, drivers): `lower_snake_case` for files, functions, variables. `UpperCamelCase` for types. Files in `source/`, `include/`, `private/` directories.
-- **C++ code** (TactilityCore, Tactility, apps, services): `UpperCamelCase` for files and types. `lowerCamelCase` for functions. Files in `Source/`, `Include/`, `Private/` directories.
+- **C++ code** (Tactility, apps, services): `UpperCamelCase` for files and types. `lowerCamelCase` for functions. Files in `Source/`, `Include/`, `Private/` directories.
 
 Formatting is enforced by `.clang-format` (LLVM-based, 4-space indent, no column limit).
 Never throw exceptions — use return types for error handling. Use `enum class` over plain `enum`.

diff --git a/Drivers/PwmBacklight/CMakeLists.txt b/Drivers/PwmBacklight/CMakeLists.txt
@@ -1,5 +1,5 @@
 idf_component_register(
     SRC_DIRS "Source"
     INCLUDE_DIRS "Source"
-    REQUIRES TactilityCore driver
+    REQUIRES Tactility driver
 )
diff --git a/Firmware/CMakeLists.txt b/Firmware/CMakeLists.txt
@@ -86,7 +86,7 @@ if (DEFINED ENV{ESP_IDF_VERSION})
     )
 else ()
     list(APPEND REQUIRES_LIST
-        TactilityCore
+        Tactility
         TactilityFreeRtos
         hal-device-module
         lvgl-module

diff --git a/Modules/hal-device-module/CMakeLists.txt b/Modules/hal-device-module/CMakeLists.txt
@@ -6,7 +6,6 @@ file(GLOB_RECURSE SOURCE_FILES "source/*.c*")
 
 list(APPEND REQUIRES_LIST
     TactilityKernel
-    TactilityCore
     TactilityFreeRtos
 )
 

diff --git a/Tactility/CMakeLists.txt b/Tactility/CMakeLists.txt
@@ -6,7 +6,6 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
 
 list(APPEND REQUIRES_LIST
     TactilityKernel
-    TactilityCore
     TactilityFreeRtos
     hal-device-module
     lvgl-module

diff --git a/TactilityCore/Include/Tactility/Bundle.h → Tactility/Include/Tactility/Bundle.h b/TactilityCore/Include/Tactility/Bundle.h → Tactility/Include/Tactility/Bundle.h
diff --git a/...ilityCore/Include/Tactility/CoreDefines.h → Tactility/Include/Tactility/CoreDefines.h b/...ilityCore/Include/Tactility/CoreDefines.h → Tactility/Include/Tactility/CoreDefines.h
diff --git a/...ilityCore/Include/Tactility/CpuAffinity.h → Tactility/Include/Tactility/CpuAffinity.h b/...ilityCore/Include/Tactility/CpuAffinity.h → Tactility/Include/Tactility/CpuAffinity.h
diff --git a/...ilityCore/Include/Tactility/StringUtils.h → Tactility/Include/Tactility/StringUtils.h b/...ilityCore/Include/Tactility/StringUtils.h → Tactility/Include/Tactility/StringUtils.h
diff --git a/...ityCore/Include/Tactility/TactilityCore.h → Tactility/Include/Tactility/TactilityCore.h b/...ityCore/Include/Tactility/TactilityCore.h → Tactility/Include/Tactility/TactilityCore.h
diff --git a/TactilityCore/Include/Tactility/file/File.h → Tactility/Include/Tactility/file/File.h b/TactilityCore/Include/Tactility/file/File.h → Tactility/Include/Tactility/file/File.h
diff --git a/...e/Include/Tactility/kernel/PanicHandler.h → ...y/Include/Tactility/kernel/PanicHandler.h b/...e/Include/Tactility/kernel/PanicHandler.h → ...y/Include/Tactility/kernel/PanicHandler.h
diff --git a/...yCore/Include/Tactility/kernel/Platform.h → ...ility/Include/Tactility/kernel/Platform.h b/...yCore/Include/Tactility/kernel/Platform.h → ...ility/Include/Tactility/kernel/Platform.h
diff --git a/.../Include/Tactility/kernel/SpiDeviceLock.h → .../Include/Tactility/kernel/SpiDeviceLock.h b/.../Include/Tactility/kernel/SpiDeviceLock.h → .../Include/Tactility/kernel/SpiDeviceLock.h
diff --git a/...lude/Tactility/kernel/critical/Critical.h → ...vate/Tactility/kernel/critical/Critical.h b/...lude/Tactility/kernel/critical/Critical.h → ...vate/Tactility/kernel/critical/Critical.h
diff --git a/TactilityCore/Source/Bundle.cpp → Tactility/Source/Bundle.cpp b/TactilityCore/Source/Bundle.cpp → Tactility/Source/Bundle.cpp
diff --git a/TactilityCore/Source/CpuAffinity.cpp → Tactility/Source/CpuAffinity.cpp b/TactilityCore/Source/CpuAffinity.cpp → Tactility/Source/CpuAffinity.cpp
diff --git a/TactilityCore/Source/StringUtils.cpp → Tactility/Source/StringUtils.cpp b/TactilityCore/Source/StringUtils.cpp → Tactility/Source/StringUtils.cpp
diff --git a/TactilityCore/Source/file/File.cpp → Tactility/Source/file/File.cpp b/TactilityCore/Source/file/File.cpp → Tactility/Source/file/File.cpp
diff --git a/TactilityCore/Source/kernel/PanicHandler.cpp → Tactility/Source/kernel/PanicHandler.cpp b/TactilityCore/Source/kernel/PanicHandler.cpp → Tactility/Source/kernel/PanicHandler.cpp
diff --git a/TactilityCore/Source/kernel/Platform.cpp → Tactility/Source/kernel/Platform.cpp b/TactilityCore/Source/kernel/Platform.cpp → Tactility/Source/kernel/Platform.cpp
diff --git a/...yCore/Source/kernel/critical/Critical.cpp → ...ility/Source/kernel/critical/Critical.cpp b/...yCore/Source/kernel/critical/Critical.cpp → ...ility/Source/kernel/critical/Critical.cpp
diff --git a/TactilityC/CMakeLists.txt b/TactilityC/CMakeLists.txt
@@ -8,7 +8,6 @@ list(APPEND REQUIRES_LIST
 
 list(APPEND PRIV_REQUIRES_LIST
     Tactility
-    TactilityCore
     TactilityKernel
     mbedtls
 )

diff --git a/TactilityCore/CMakeLists.txt b/TactilityCore/CMakeLists.txt