start moving include files into subdirs

14 files changed, 45 insertions, 45 deletions

diff --git a/src/tangara/input/device_factory.cpp b/src/tangara/input/device_factory.cpp
index 65f4d785..8e1c5155 100644
--- a/src/tangara/input/device_factory.cpp
+++ b/src/tangara/input/device_factory.cpp
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "device_factory.hpp"
+#include "input/device_factory.hpp"
 
 #include <memory>
 
-#include "feedback_haptics.hpp"
-#include "input_device.hpp"
-#include "input_nav_buttons.hpp"
-#include "input_touch_dpad.hpp"
-#include "input_touch_wheel.hpp"
-#include "input_volume_buttons.hpp"
+#include "input/feedback_haptics.hpp"
+#include "input/input_device.hpp"
+#include "input/input_nav_buttons.hpp"
+#include "input/input_touch_dpad.hpp"
+#include "input/input_touch_wheel.hpp"
+#include "input/input_volume_buttons.hpp"
 
 namespace input {
 
diff --git a/src/tangara/input/device_factory.hpp b/src/tangara/input/device_factory.hpp
index dd9c7133..862c8728 100644
--- a/src/tangara/input/device_factory.hpp
+++ b/src/tangara/input/device_factory.hpp
@@ -9,11 +9,11 @@
 #include <cstdint>
 #include <memory>
 
-#include "feedback_device.hpp"
-#include "input_device.hpp"
-#include "input_touch_wheel.hpp"
+#include "input/feedback_device.hpp"
+#include "input/input_device.hpp"
+#include "input/input_touch_wheel.hpp"
 #include "nvs.hpp"
-#include "service_locator.hpp"
+#include "system_fsm/service_locator.hpp"
 
 namespace input {
 
diff --git a/src/tangara/input/feedback_haptics.hpp b/src/tangara/input/feedback_haptics.hpp
index a307a429..5727c0f3 100644
--- a/src/tangara/input/feedback_haptics.hpp
+++ b/src/tangara/input/feedback_haptics.hpp
@@ -8,8 +8,8 @@
 
 #include <cstdint>
 
-#include "feedback_device.hpp"
 #include "haptics.hpp"
+#include "input/feedback_device.hpp"
 
 namespace input {
 
diff --git a/src/tangara/input/input_device.hpp b/src/tangara/input/input_device.hpp
index d944c3bf..e3d17c6c 100644
--- a/src/tangara/input/input_device.hpp
+++ b/src/tangara/input/input_device.hpp
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include "hal/lv_hal_indev.h"
-#include "input_hook.hpp"
-#include "property.hpp"
+#include "input/input_hook.hpp"
+#include "lua/property.hpp"
 
 namespace input {
 
diff --git a/src/tangara/input/input_hook.hpp b/src/tangara/input/input_hook.hpp
index a8705210..3dc8a2c8 100644
--- a/src/tangara/input/input_hook.hpp
+++ b/src/tangara/input/input_hook.hpp
@@ -13,7 +13,7 @@
 #include "hal/lv_hal_indev.h"
 #include "lua.hpp"
 
-#include "input_trigger.hpp"
+#include "input/input_trigger.hpp"
 
 namespace input {
 
diff --git a/src/tangara/input/input_hook_actions.hpp b/src/tangara/input/input_hook_actions.hpp
index 105bd10d..71a560bc 100644
--- a/src/tangara/input/input_hook_actions.hpp
+++ b/src/tangara/input/input_hook_actions.hpp
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "hal/lv_hal_indev.h"
-#include "input_hook.hpp"
+#include "input/input_hook.hpp"
 
 namespace input {
 namespace actions {
diff --git a/src/tangara/input/input_nav_buttons.cpp b/src/tangara/input/input_nav_buttons.cpp
index 61d80075..28711e4e 100644
--- a/src/tangara/input/input_nav_buttons.cpp
+++ b/src/tangara/input/input_nav_buttons.cpp
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "input_nav_buttons.hpp"
+#include "input/input_nav_buttons.hpp"
 
-#include "event_queue.hpp"
+#include "events/event_queue.hpp"
 #include "gpios.hpp"
 #include "hal/lv_hal_indev.h"
-#include "input_hook_actions.hpp"
+#include "input/input_hook_actions.hpp"
 
 namespace input {
 
diff --git a/src/tangara/input/input_nav_buttons.hpp b/src/tangara/input/input_nav_buttons.hpp
index 9feeb375..1349ff72 100644
--- a/src/tangara/input/input_nav_buttons.hpp
+++ b/src/tangara/input/input_nav_buttons.hpp
@@ -12,9 +12,9 @@
 #include "hal/lv_hal_indev.h"
 
 #include "haptics.hpp"
-#include "input_device.hpp"
-#include "input_hook.hpp"
-#include "input_trigger.hpp"
+#include "input/input_device.hpp"
+#include "input/input_hook.hpp"
+#include "input/input_trigger.hpp"
 #include "touchwheel.hpp"
 
 namespace input {
diff --git a/src/tangara/input/input_touch_dpad.hpp b/src/tangara/input/input_touch_dpad.hpp
index 0c45b2d9..a0406e2b 100644
--- a/src/tangara/input/input_touch_dpad.hpp
+++ b/src/tangara/input/input_touch_dpad.hpp
@@ -11,9 +11,9 @@
 #include "hal/lv_hal_indev.h"
 
 #include "haptics.hpp"
-#include "input_device.hpp"
-#include "input_hook.hpp"
-#include "input_trigger.hpp"
+#include "input/input_device.hpp"
+#include "input/input_hook.hpp"
+#include "input/input_trigger.hpp"
 #include "touchwheel.hpp"
 
 namespace input {
diff --git a/src/tangara/input/input_touch_wheel.cpp b/src/tangara/input/input_touch_wheel.cpp
index e6a3b880..a496e882 100644
--- a/src/tangara/input/input_touch_wheel.cpp
+++ b/src/tangara/input/input_touch_wheel.cpp
@@ -13,13 +13,13 @@
 
 #include "events/event_queue.hpp"
 #include "haptics.hpp"
-#include "input_device.hpp"
-#include "input_hook_actions.hpp"
-#include "input_trigger.hpp"
+#include "input/input_device.hpp"
+#include "input/input_hook_actions.hpp"
+#include "input/input_trigger.hpp"
+#include "lua/property.hpp"
 #include "nvs.hpp"
-#include "property.hpp"
 #include "touchwheel.hpp"
-#include "ui_events.hpp"
+#include "ui/ui_events.hpp"
 
 namespace input {
 
diff --git a/src/tangara/input/input_touch_wheel.hpp b/src/tangara/input/input_touch_wheel.hpp
index 764cc68d..b45ba361 100644
--- a/src/tangara/input/input_touch_wheel.hpp
+++ b/src/tangara/input/input_touch_wheel.hpp
@@ -12,11 +12,11 @@
 #include "hal/lv_hal_indev.h"
 
 #include "haptics.hpp"
-#include "input_device.hpp"
-#include "input_hook.hpp"
-#include "input_trigger.hpp"
+#include "input/input_device.hpp"
+#include "input/input_hook.hpp"
+#include "input/input_trigger.hpp"
+#include "lua/property.hpp"
 #include "nvs.hpp"
-#include "property.hpp"
 #include "touchwheel.hpp"
 
 namespace input {
diff --git a/src/tangara/input/input_volume_buttons.cpp b/src/tangara/input/input_volume_buttons.cpp
index 37cf90e5..16267ef6 100644
--- a/src/tangara/input/input_volume_buttons.cpp
+++ b/src/tangara/input/input_volume_buttons.cpp
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "input_volume_buttons.hpp"
-#include "event_queue.hpp"
+#include "input/input_volume_buttons.hpp"
+#include "events/event_queue.hpp"
 #include "gpios.hpp"
-#include "input_hook_actions.hpp"
+#include "input/input_hook_actions.hpp"
 
 namespace input {
 
diff --git a/src/tangara/input/input_volume_buttons.hpp b/src/tangara/input/input_volume_buttons.hpp
index e3246df4..8a0ed18d 100644
--- a/src/tangara/input/input_volume_buttons.hpp
+++ b/src/tangara/input/input_volume_buttons.hpp
@@ -12,8 +12,8 @@
 #include "hal/lv_hal_indev.h"
 
 #include "haptics.hpp"
-#include "input_device.hpp"
-#include "input_hook.hpp"
+#include "input/input_device.hpp"
+#include "input/input_hook.hpp"
 #include "touchwheel.hpp"
 
 namespace input {
diff --git a/src/tangara/input/lvgl_input_driver.hpp b/src/tangara/input/lvgl_input_driver.hpp
index 9adaf143..6be24f7f 100644
--- a/src/tangara/input/lvgl_input_driver.hpp
+++ b/src/tangara/input/lvgl_input_driver.hpp
@@ -12,16 +12,16 @@
 #include <set>
 
 #include "core/lv_group.h"
-#include "device_factory.hpp"
-#include "feedback_device.hpp"
 #include "gpios.hpp"
 #include "hal/lv_hal_indev.h"
+#include "input/device_factory.hpp"
+#include "input/feedback_device.hpp"
 
-#include "input_device.hpp"
-#include "input_hook.hpp"
-#include "lua_thread.hpp"
+#include "input/input_device.hpp"
+#include "input/input_hook.hpp"
+#include "lua/lua_thread.hpp"
+#include "lua/property.hpp"
 #include "nvs.hpp"
-#include "property.hpp"
 #include "touchwheel.hpp"
 
 namespace input {