diff --git a/Tactility/Include/Tactility/Paths.h b/Tactility/Include/Tactility/DeprecatedPaths.h
similarity index 88%
rename from Tactility/Include/Tactility/Paths.h
rename to Tactility/Include/Tactility/DeprecatedPaths.h
index 2d0093272..06532f69d 100644
--- a/Tactility/Include/Tactility/Paths.h
+++ b/Tactility/Include/Tactility/DeprecatedPaths.h
@@ -1,10 +1,12 @@
+/**
+ * DEPRECATED: Use TactilityKernels' tactility/paths.h
+ */
 #pragma once
 
 #include <string>
 
 #include <tactility/filesystem/file_system.h>
 
-
 namespace tt {
 
 bool findFirstMountedSdCardPath(std::string& path);
diff --git a/Tactility/Source/Paths.cpp b/Tactility/Source/DeprecatedPaths.cpp
similarity index 98%
rename from Tactility/Source/Paths.cpp
rename to Tactility/Source/DeprecatedPaths.cpp
index 1d9d06635..68d2782d3 100644
--- a/Tactility/Source/Paths.cpp
+++ b/Tactility/Source/DeprecatedPaths.cpp
@@ -1,4 +1,4 @@
-#include <Tactility/Paths.h>
+#include <Tactility/DeprecatedPaths.h>
 
 #include "../../Modules/app-module/private/app/private/app_metadata_parsing_internal.h"
 
diff --git a/Tactility/Source/Tactility.cpp b/Tactility/Source/Tactility.cpp
index 1b77a4ef3..024487da6 100644
--- a/Tactility/Source/Tactility.cpp
+++ b/Tactility/Source/Tactility.cpp
@@ -18,9 +18,9 @@
 #include <Tactility/Tactility.h>
 
 #include <Tactility/CpuAffinity.h>
+#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/LogMessages.h>
 #include <Tactility/MountPoints.h>
-#include <Tactility/Paths.h>
 #include <Tactility/TactilityConfig.h>
 #include <Tactility/bluetooth/Bluetooth.h>
 #include <Tactility/file/File.h>
diff --git a/Tactility/Source/app/apphub/AppHubApp.cpp b/Tactility/Source/app/apphub/AppHubApp.cpp
index 8521636f1..724c831cf 100644
--- a/Tactility/Source/app/apphub/AppHubApp.cpp
+++ b/Tactility/Source/app/apphub/AppHubApp.cpp
@@ -1,5 +1,5 @@
+#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/Mutex.h>
-#include <Tactility/Paths.h>
 #include <Tactility/app/apphub/AppHub.h>
 #include <Tactility/app/apphub/AppHubEntry.h>
 #include <Tactility/app/apphubdetails/AppHubDetailsApp.h>
diff --git a/Tactility/Source/app/apphubdetails/AppHubDetailsApp.cpp b/Tactility/Source/app/apphubdetails/AppHubDetailsApp.cpp
index 9ea2b50ed..e6dbc4528 100644
--- a/Tactility/Source/app/apphubdetails/AppHubDetailsApp.cpp
+++ b/Tactility/Source/app/apphubdetails/AppHubDetailsApp.cpp
@@ -2,7 +2,7 @@
 #include "app/metadata.h"
 
 
-#include <Tactility/Paths.h>
+#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/StringUtils.h>
 #include <Tactility/app/alertdialog/AlertDialog.h>
 #include <Tactility/app/apphub/AppHub.h>
diff --git a/Tactility/Source/app/boot/Boot.cpp b/Tactility/Source/app/boot/Boot.cpp
index d3b681581..f80e23541 100644
--- a/Tactility/Source/app/boot/Boot.cpp
+++ b/Tactility/Source/app/boot/Boot.cpp
@@ -12,8 +12,8 @@
 
 #include <lvgl_window_manager/window_manager.h>
 
+#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/MountPoints.h>
-#include <Tactility/Paths.h>
 #include <Tactility/TactilityPrivate.h>
 #include <Tactility/hal/usb/Usb.h>
 #include <Tactility/lvgl/Lvgl.h>
diff --git a/Tactility/Source/app/chat/ChatSettings.cpp b/Tactility/Source/app/chat/ChatSettings.cpp
index 729e6bb15..4cfe01a0f 100644
--- a/Tactility/Source/app/chat/ChatSettings.cpp
+++ b/Tactility/Source/app/chat/ChatSettings.cpp
@@ -7,9 +7,9 @@
 #include <Tactility/app/chat/ChatSettings.h>
 #include <Tactility/app/chat/ChatProtocol.h>
 
+#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
-#include <Tactility/Paths.h>
 
 #include <crypt/crypt.h>
 
diff --git a/Tactility/Source/app/systeminfo/SystemInfo.cpp b/Tactility/Source/app/systeminfo/SystemInfo.cpp
index a582e8e05..e63cf9105 100644
--- a/Tactility/Source/app/systeminfo/SystemInfo.cpp
+++ b/Tactility/Source/app/systeminfo/SystemInfo.cpp
@@ -1,6 +1,6 @@
 #include "tactility/time.h"
 
-#include <Tactility/Paths.h>
+#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/Tactility.h>
 #include <Tactility/TactilityConfig.h>
 #include <Tactility/Timer.h>
diff --git a/Tactility/Source/bluetooth/BluetoothPairedDevice.cpp b/Tactility/Source/bluetooth/BluetoothPairedDevice.cpp
index c425b48aa..fccc67022 100644
--- a/Tactility/Source/bluetooth/BluetoothPairedDevice.cpp
+++ b/Tactility/Source/bluetooth/BluetoothPairedDevice.cpp
@@ -1,6 +1,6 @@
 #include <Tactility/bluetooth/BluetoothPairedDevice.h>
 
-#include "Tactility/Paths.h"
+#include "Tactility/DeprecatedPaths.h"
 
 #include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
diff --git a/Tactility/Source/bluetooth/BluetoothSettings.cpp b/Tactility/Source/bluetooth/BluetoothSettings.cpp
index 6bcb70a06..d2640a16d 100644
--- a/Tactility/Source/bluetooth/BluetoothSettings.cpp
+++ b/Tactility/Source/bluetooth/BluetoothSettings.cpp
@@ -1,9 +1,9 @@
 #include <Tactility/bluetooth/BluetoothSettings.h>
 
+#include <Tactility/DeprecatedPaths.h>
+#include <Tactility/Mutex.h>
 #include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
-#include <Tactility/Mutex.h>
-#include <Tactility/Paths.h>
 #include <tactility/log.h>
 
 namespace tt::bluetooth::settings {
diff --git a/Tactility/Source/service/development/DevelopmentService.cpp b/Tactility/Source/service/development/DevelopmentService.cpp
index 55cc1f091..530deb029 100644
--- a/Tactility/Source/service/development/DevelopmentService.cpp
+++ b/Tactility/Source/service/development/DevelopmentService.cpp
@@ -5,14 +5,14 @@
 
 #include <tactility/log.h>
 
-#include <Tactility/Paths.h>
+#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/StringUtils.h>
 #include <Tactility/file/File.h>
 #include <Tactility/network/HttpdReq.h>
 #include <Tactility/network/Url.h>
 #include <Tactility/service/ServiceRegistration.h>
-#include <Tactility/service/development/DevelopmentSettings.h>
 #include <Tactility/service/development/DevelopmentService.h>
+#include <Tactility/service/development/DevelopmentSettings.h>
 
 #include <ranges>
 #include <sstream>
diff --git a/Tactility/Source/service/development/DevelopmentSettings.cpp b/Tactility/Source/service/development/DevelopmentSettings.cpp
index 5913fad2b..676545130 100644
--- a/Tactility/Source/service/development/DevelopmentSettings.cpp
+++ b/Tactility/Source/service/development/DevelopmentSettings.cpp
@@ -1,7 +1,7 @@
 #ifdef ESP_PLATFORM
+#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
-#include <Tactility/Paths.h>
 #include <Tactility/service/development/DevelopmentSettings.h>
 #include <map>
 #include <string>
diff --git a/Tactility/Source/service/webserver/WebServerService.cpp b/Tactility/Source/service/webserver/WebServerService.cpp
index 9c21792bc..97a551249 100644
--- a/Tactility/Source/service/webserver/WebServerService.cpp
+++ b/Tactility/Source/service/webserver/WebServerService.cpp
@@ -8,13 +8,13 @@
 #include <Tactility/lvgl/Statusbar.h>
 #include <Tactility/Mutex.h>
 
+#include <Tactility/DeprecatedPaths.h>
+#include <Tactility/StringUtils.h>
 #include <Tactility/TactilityConfig.h>
-#include <Tactility/service/wifi/Wifi.h>
+#include <Tactility/lvgl/Lvgl.h>
 #include <Tactility/network/HttpdReq.h>
 #include <Tactility/network/Url.h>
-#include <Tactility/Paths.h>
-#include <Tactility/lvgl/Lvgl.h>
-#include <Tactility/StringUtils.h>
+#include <Tactility/service/wifi/Wifi.h>
 
 #include <tactility/check.h>
 #include <tactility/filesystem/file_system.h>
diff --git a/Tactility/Source/service/wifi/WifiBootSplashInit.cpp b/Tactility/Source/service/wifi/WifiBootSplashInit.cpp
index de9b94e7d..36e2f8e00 100644
--- a/Tactility/Source/service/wifi/WifiBootSplashInit.cpp
+++ b/Tactility/Source/service/wifi/WifiBootSplashInit.cpp
@@ -9,7 +9,7 @@
 #include <Tactility/file/File.h>
 #include <Tactility/service/wifi/WifiApSettings.h>
 
-#include <Tactility/Paths.h>
+#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/Tactility.h>
 
 #include <tactility/log.h>
diff --git a/Tactility/Source/settings/AudioSettings.cpp b/Tactility/Source/settings/AudioSettings.cpp
index c2bc30ab8..89277b1b3 100644
--- a/Tactility/Source/settings/AudioSettings.cpp
+++ b/Tactility/Source/settings/AudioSettings.cpp
@@ -1,8 +1,8 @@
 #include <Tactility/settings/AudioSettings.h>
 
+#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/file/File.h>
 #include <Tactility/file/PropertiesFile.h>
-#include <Tactility/Paths.h>
 
 #include <algorithm>
 #include <cstdio>
diff --git a/Tactility/Source/settings/BootSettings.cpp b/Tactility/Source/settings/BootSettings.cpp
index 1933afd93..d6f5549b3 100644
--- a/Tactility/Source/settings/BootSettings.cpp
+++ b/Tactility/Source/settings/BootSettings.cpp
@@ -3,7 +3,7 @@
 #include <Tactility/file/PropertiesFile.h>
 #include <Tactility/settings/BootSettings.h>
 
-#include <Tactility/Paths.h>
+#include <Tactility/DeprecatedPaths.h>
 #include <format>
 #include <string>
 
diff --git a/Tactility/Source/settings/SystemSettings.cpp b/Tactility/Source/settings/SystemSettings.cpp
index e8763af99..ca797322a 100644
--- a/Tactility/Source/settings/SystemSettings.cpp
+++ b/Tactility/Source/settings/SystemSettings.cpp
@@ -5,7 +5,7 @@
 #include <Tactility/settings/Language.h>
 #include <Tactility/settings/SystemSettings.h>
 
-#include "Tactility/Paths.h"
+#include "Tactility/DeprecatedPaths.h"
 
 #include <tactility/log.h>
 
diff --git a/Tactility/Source/settings/WebServerSettings.cpp b/Tactility/Source/settings/WebServerSettings.cpp
index 99cc17d15..3a3817a28 100644
--- a/Tactility/Source/settings/WebServerSettings.cpp
+++ b/Tactility/Source/settings/WebServerSettings.cpp
@@ -1,7 +1,7 @@
-#include <Tactility/settings/WebServerSettings.h>
-#include <Tactility/file/PropertiesFile.h>
+#include <Tactility/DeprecatedPaths.h>
 #include <Tactility/file/File.h>
-#include <Tactility/Paths.h>
+#include <Tactility/file/PropertiesFile.h>
+#include <Tactility/settings/WebServerSettings.h>
 
 #include <tactility/log.h>