diff --git a/.clang-format b/firmware/.clang-format
similarity index 100%
rename from .clang-format
rename to firmware/.clang-format
diff --git a/.devcontainer/Dockerfile b/firmware/.devcontainer/Dockerfile
similarity index 100%
rename from .devcontainer/Dockerfile
rename to firmware/.devcontainer/Dockerfile
diff --git a/.devcontainer/devcontainer.json b/firmware/.devcontainer/devcontainer.json
similarity index 100%
rename from .devcontainer/devcontainer.json
rename to firmware/.devcontainer/devcontainer.json
diff --git a/.gitignore b/firmware/.gitignore
similarity index 100%
rename from .gitignore
rename to firmware/.gitignore
diff --git a/.vscode/launch.json b/firmware/.vscode/launch.json
similarity index 100%
rename from .vscode/launch.json
rename to firmware/.vscode/launch.json
diff --git a/CMakeLists.txt b/firmware/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to firmware/CMakeLists.txt
diff --git a/LICENSE b/firmware/LICENSE
similarity index 100%
rename from LICENSE
rename to firmware/LICENSE
diff --git a/README.md b/firmware/README.md
similarity index 100%
rename from README.md
rename to firmware/README.md
diff --git a/assets/Helvetica-Bold.otf b/firmware/assets/Helvetica-Bold.otf
similarity index 100%
rename from assets/Helvetica-Bold.otf
rename to firmware/assets/Helvetica-Bold.otf
diff --git a/assets/button_normal.png b/firmware/assets/button_normal.png
similarity index 100%
rename from assets/button_normal.png
rename to firmware/assets/button_normal.png
diff --git a/assets/button_pressed_overlay.png b/firmware/assets/button_pressed_overlay.png
similarity index 100%
rename from assets/button_pressed_overlay.png
rename to firmware/assets/button_pressed_overlay.png
diff --git a/assets/d-pad_normal.png b/firmware/assets/d-pad_normal.png
similarity index 100%
rename from assets/d-pad_normal.png
rename to firmware/assets/d-pad_normal.png
diff --git a/assets/haxrcorp-4089.otf b/firmware/assets/haxrcorp-4089.otf
similarity index 100%
rename from assets/haxrcorp-4089.otf
rename to firmware/assets/haxrcorp-4089.otf
diff --git a/bootloader_components/main/CMakeLists.txt b/firmware/bootloader_components/main/CMakeLists.txt
similarity index 100%
rename from bootloader_components/main/CMakeLists.txt
rename to firmware/bootloader_components/main/CMakeLists.txt
diff --git a/bootloader_components/main/bootloader.c b/firmware/bootloader_components/main/bootloader.c
similarity index 100%
rename from bootloader_components/main/bootloader.c
rename to firmware/bootloader_components/main/bootloader.c
diff --git a/components/CMakeLists.txt b/firmware/components/CMakeLists.txt
similarity index 100%
rename from components/CMakeLists.txt
rename to firmware/components/CMakeLists.txt
diff --git a/components/imgui/CMakeLists.txt b/firmware/components/imgui/CMakeLists.txt
similarity index 100%
rename from components/imgui/CMakeLists.txt
rename to firmware/components/imgui/CMakeLists.txt
diff --git a/components/imgui/imgui.cpp b/firmware/components/imgui/imgui.cpp
similarity index 100%
rename from components/imgui/imgui.cpp
rename to firmware/components/imgui/imgui.cpp
diff --git a/components/imgui/imgui_demo.cpp b/firmware/components/imgui/imgui_demo.cpp
similarity index 100%
rename from components/imgui/imgui_demo.cpp
rename to firmware/components/imgui/imgui_demo.cpp
diff --git a/components/imgui/imgui_draw.cpp b/firmware/components/imgui/imgui_draw.cpp
similarity index 100%
rename from components/imgui/imgui_draw.cpp
rename to firmware/components/imgui/imgui_draw.cpp
diff --git a/components/imgui/imgui_impl_sdl3.cpp b/firmware/components/imgui/imgui_impl_sdl3.cpp
similarity index 100%
rename from components/imgui/imgui_impl_sdl3.cpp
rename to firmware/components/imgui/imgui_impl_sdl3.cpp
diff --git a/components/imgui/imgui_impl_sdlrenderer3.cpp b/firmware/components/imgui/imgui_impl_sdlrenderer3.cpp
similarity index 100%
rename from components/imgui/imgui_impl_sdlrenderer3.cpp
rename to firmware/components/imgui/imgui_impl_sdlrenderer3.cpp
diff --git a/components/imgui/imgui_tables.cpp b/firmware/components/imgui/imgui_tables.cpp
similarity index 100%
rename from components/imgui/imgui_tables.cpp
rename to firmware/components/imgui/imgui_tables.cpp
diff --git a/components/imgui/imgui_widgets.cpp b/firmware/components/imgui/imgui_widgets.cpp
similarity index 100%
rename from components/imgui/imgui_widgets.cpp
rename to firmware/components/imgui/imgui_widgets.cpp
diff --git a/components/imgui/include/imconfig.h b/firmware/components/imgui/include/imconfig.h
similarity index 100%
rename from components/imgui/include/imconfig.h
rename to firmware/components/imgui/include/imconfig.h
diff --git a/components/imgui/include/imgui.h b/firmware/components/imgui/include/imgui.h
similarity index 100%
rename from components/imgui/include/imgui.h
rename to firmware/components/imgui/include/imgui.h
diff --git a/components/imgui/include/imgui_impl_sdl3.h b/firmware/components/imgui/include/imgui_impl_sdl3.h
similarity index 100%
rename from components/imgui/include/imgui_impl_sdl3.h
rename to firmware/components/imgui/include/imgui_impl_sdl3.h
diff --git a/components/imgui/include/imgui_impl_sdlrenderer3.h b/firmware/components/imgui/include/imgui_impl_sdlrenderer3.h
similarity index 100%
rename from components/imgui/include/imgui_impl_sdlrenderer3.h
rename to firmware/components/imgui/include/imgui_impl_sdlrenderer3.h
diff --git a/components/imgui/include/imgui_internal.h b/firmware/components/imgui/include/imgui_internal.h
similarity index 100%
rename from components/imgui/include/imgui_internal.h
rename to firmware/components/imgui/include/imgui_internal.h
diff --git a/components/imgui/include/imstb_rectpack.h b/firmware/components/imgui/include/imstb_rectpack.h
similarity index 100%
rename from components/imgui/include/imstb_rectpack.h
rename to firmware/components/imgui/include/imstb_rectpack.h
diff --git a/components/imgui/include/imstb_textedit.h b/firmware/components/imgui/include/imstb_textedit.h
similarity index 100%
rename from components/imgui/include/imstb_textedit.h
rename to firmware/components/imgui/include/imstb_textedit.h
diff --git a/components/imgui/include/imstb_truetype.h b/firmware/components/imgui/include/imstb_truetype.h
similarity index 100%
rename from components/imgui/include/imstb_truetype.h
rename to firmware/components/imgui/include/imstb_truetype.h
diff --git a/components/insa/CMakeLists.txt b/firmware/components/insa/CMakeLists.txt
similarity index 100%
rename from components/insa/CMakeLists.txt
rename to firmware/components/insa/CMakeLists.txt
diff --git a/components/insa/include/MenuOptions.h b/firmware/components/insa/include/MenuOptions.h
similarity index 100%
rename from components/insa/include/MenuOptions.h
rename to firmware/components/insa/include/MenuOptions.h
diff --git a/components/insa/include/common/Common.h b/firmware/components/insa/include/common/Common.h
similarity index 100%
rename from components/insa/include/common/Common.h
rename to firmware/components/insa/include/common/Common.h
diff --git a/components/insa/include/common/InactivityTracker.h b/firmware/components/insa/include/common/InactivityTracker.h
similarity index 100%
rename from components/insa/include/common/InactivityTracker.h
rename to firmware/components/insa/include/common/InactivityTracker.h
diff --git a/components/insa/include/common/Menu.h b/firmware/components/insa/include/common/Menu.h
similarity index 100%
rename from components/insa/include/common/Menu.h
rename to firmware/components/insa/include/common/Menu.h
diff --git a/components/insa/include/common/ScrollBar.h b/firmware/components/insa/include/common/ScrollBar.h
similarity index 100%
rename from components/insa/include/common/ScrollBar.h
rename to firmware/components/insa/include/common/ScrollBar.h
diff --git a/components/insa/include/common/Widget.h b/firmware/components/insa/include/common/Widget.h
similarity index 100%
rename from components/insa/include/common/Widget.h
rename to firmware/components/insa/include/common/Widget.h
diff --git a/components/insa/include/data/MenuItem.h b/firmware/components/insa/include/data/MenuItem.h
similarity index 100%
rename from components/insa/include/data/MenuItem.h
rename to firmware/components/insa/include/data/MenuItem.h
diff --git a/components/insa/include/data/roads.h b/firmware/components/insa/include/data/roads.h
similarity index 100%
rename from components/insa/include/data/roads.h
rename to firmware/components/insa/include/data/roads.h
diff --git a/components/insa/include/data/vehicles.h b/firmware/components/insa/include/data/vehicles.h
similarity index 100%
rename from components/insa/include/data/vehicles.h
rename to firmware/components/insa/include/data/vehicles.h
diff --git a/components/insa/include/ui/LightMenu.h b/firmware/components/insa/include/ui/LightMenu.h
similarity index 100%
rename from components/insa/include/ui/LightMenu.h
rename to firmware/components/insa/include/ui/LightMenu.h
diff --git a/components/insa/include/ui/LightSettingsMenu.h b/firmware/components/insa/include/ui/LightSettingsMenu.h
similarity index 100%
rename from components/insa/include/ui/LightSettingsMenu.h
rename to firmware/components/insa/include/ui/LightSettingsMenu.h
diff --git a/components/insa/include/ui/MainMenu.h b/firmware/components/insa/include/ui/MainMenu.h
similarity index 100%
rename from components/insa/include/ui/MainMenu.h
rename to firmware/components/insa/include/ui/MainMenu.h
diff --git a/components/insa/include/ui/ScreenSaver.h b/firmware/components/insa/include/ui/ScreenSaver.h
similarity index 100%
rename from components/insa/include/ui/ScreenSaver.h
rename to firmware/components/insa/include/ui/ScreenSaver.h
diff --git a/components/insa/include/ui/SettingsMenu.h b/firmware/components/insa/include/ui/SettingsMenu.h
similarity index 100%
rename from components/insa/include/ui/SettingsMenu.h
rename to firmware/components/insa/include/ui/SettingsMenu.h
diff --git a/components/insa/include/ui/SplashScreen.h b/firmware/components/insa/include/ui/SplashScreen.h
similarity index 100%
rename from components/insa/include/ui/SplashScreen.h
rename to firmware/components/insa/include/ui/SplashScreen.h
diff --git a/components/insa/src/common/InactivityTracker.cpp b/firmware/components/insa/src/common/InactivityTracker.cpp
similarity index 100%
rename from components/insa/src/common/InactivityTracker.cpp
rename to firmware/components/insa/src/common/InactivityTracker.cpp
diff --git a/components/insa/src/common/Menu.cpp b/firmware/components/insa/src/common/Menu.cpp
similarity index 100%
rename from components/insa/src/common/Menu.cpp
rename to firmware/components/insa/src/common/Menu.cpp
diff --git a/components/insa/src/common/ScrollBar.cpp b/firmware/components/insa/src/common/ScrollBar.cpp
similarity index 100%
rename from components/insa/src/common/ScrollBar.cpp
rename to firmware/components/insa/src/common/ScrollBar.cpp
diff --git a/components/insa/src/common/Widget.cpp b/firmware/components/insa/src/common/Widget.cpp
similarity index 100%
rename from components/insa/src/common/Widget.cpp
rename to firmware/components/insa/src/common/Widget.cpp
diff --git a/components/insa/src/data/MenuItem.cpp b/firmware/components/insa/src/data/MenuItem.cpp
similarity index 100%
rename from components/insa/src/data/MenuItem.cpp
rename to firmware/components/insa/src/data/MenuItem.cpp
diff --git a/components/insa/src/ui/LightMenu.cpp b/firmware/components/insa/src/ui/LightMenu.cpp
similarity index 100%
rename from components/insa/src/ui/LightMenu.cpp
rename to firmware/components/insa/src/ui/LightMenu.cpp
diff --git a/components/insa/src/ui/LightSettingsMenu.cpp b/firmware/components/insa/src/ui/LightSettingsMenu.cpp
similarity index 100%
rename from components/insa/src/ui/LightSettingsMenu.cpp
rename to firmware/components/insa/src/ui/LightSettingsMenu.cpp
diff --git a/components/insa/src/ui/MainMenu.cpp b/firmware/components/insa/src/ui/MainMenu.cpp
similarity index 100%
rename from components/insa/src/ui/MainMenu.cpp
rename to firmware/components/insa/src/ui/MainMenu.cpp
diff --git a/components/insa/src/ui/ScreenSaver.cpp b/firmware/components/insa/src/ui/ScreenSaver.cpp
similarity index 100%
rename from components/insa/src/ui/ScreenSaver.cpp
rename to firmware/components/insa/src/ui/ScreenSaver.cpp
diff --git a/components/insa/src/ui/SettingsMenu.cpp b/firmware/components/insa/src/ui/SettingsMenu.cpp
similarity index 100%
rename from components/insa/src/ui/SettingsMenu.cpp
rename to firmware/components/insa/src/ui/SettingsMenu.cpp
diff --git a/components/insa/src/ui/SplashScreen.cpp b/firmware/components/insa/src/ui/SplashScreen.cpp
similarity index 100%
rename from components/insa/src/ui/SplashScreen.cpp
rename to firmware/components/insa/src/ui/SplashScreen.cpp
diff --git a/components/led-manager/CMakeLists.txt b/firmware/components/led-manager/CMakeLists.txt
similarity index 100%
rename from components/led-manager/CMakeLists.txt
rename to firmware/components/led-manager/CMakeLists.txt
diff --git a/components/led-manager/idf_component.yml b/firmware/components/led-manager/idf_component.yml
similarity index 100%
rename from components/led-manager/idf_component.yml
rename to firmware/components/led-manager/idf_component.yml
diff --git a/components/led-manager/include/Matrix.h b/firmware/components/led-manager/include/Matrix.h
similarity index 100%
rename from components/led-manager/include/Matrix.h
rename to firmware/components/led-manager/include/Matrix.h
diff --git a/components/led-manager/include/led_manager.h b/firmware/components/led-manager/include/led_manager.h
similarity index 100%
rename from components/led-manager/include/led_manager.h
rename to firmware/components/led-manager/include/led_manager.h
diff --git a/components/led-manager/src/hal_esp32/led_manager.cpp b/firmware/components/led-manager/src/hal_esp32/led_manager.cpp
similarity index 100%
rename from components/led-manager/src/hal_esp32/led_manager.cpp
rename to firmware/components/led-manager/src/hal_esp32/led_manager.cpp
diff --git a/components/led-manager/src/hal_native/Matrix.cpp b/firmware/components/led-manager/src/hal_native/Matrix.cpp
similarity index 100%
rename from components/led-manager/src/hal_native/Matrix.cpp
rename to firmware/components/led-manager/src/hal_native/Matrix.cpp
diff --git a/components/led-manager/src/hal_native/led_manager.cpp b/firmware/components/led-manager/src/hal_native/led_manager.cpp
similarity index 100%
rename from components/led-manager/src/hal_native/led_manager.cpp
rename to firmware/components/led-manager/src/hal_native/led_manager.cpp
diff --git a/components/persistence-manager/CMakeLists.txt b/firmware/components/persistence-manager/CMakeLists.txt
similarity index 100%
rename from components/persistence-manager/CMakeLists.txt
rename to firmware/components/persistence-manager/CMakeLists.txt
diff --git a/components/persistence-manager/include/IPersistenceManager.h b/firmware/components/persistence-manager/include/IPersistenceManager.h
similarity index 100%
rename from components/persistence-manager/include/IPersistenceManager.h
rename to firmware/components/persistence-manager/include/IPersistenceManager.h
diff --git a/components/persistence-manager/include/hal_esp32/PersistenceManager.h b/firmware/components/persistence-manager/include/hal_esp32/PersistenceManager.h
similarity index 100%
rename from components/persistence-manager/include/hal_esp32/PersistenceManager.h
rename to firmware/components/persistence-manager/include/hal_esp32/PersistenceManager.h
diff --git a/components/persistence-manager/include/hal_native/PersistenceManager.h b/firmware/components/persistence-manager/include/hal_native/PersistenceManager.h
similarity index 100%
rename from components/persistence-manager/include/hal_native/PersistenceManager.h
rename to firmware/components/persistence-manager/include/hal_native/PersistenceManager.h
diff --git a/components/persistence-manager/src/hal_esp32/PersistenceManager.cpp b/firmware/components/persistence-manager/src/hal_esp32/PersistenceManager.cpp
similarity index 100%
rename from components/persistence-manager/src/hal_esp32/PersistenceManager.cpp
rename to firmware/components/persistence-manager/src/hal_esp32/PersistenceManager.cpp
diff --git a/components/persistence-manager/src/hal_native/PersistenceManager.cpp b/firmware/components/persistence-manager/src/hal_native/PersistenceManager.cpp
similarity index 100%
rename from components/persistence-manager/src/hal_native/PersistenceManager.cpp
rename to firmware/components/persistence-manager/src/hal_native/PersistenceManager.cpp
diff --git a/config.dat b/firmware/config.dat
similarity index 100%
rename from config.dat
rename to firmware/config.dat
diff --git a/main/CMakeLists.txt b/firmware/main/CMakeLists.txt
similarity index 100%
rename from main/CMakeLists.txt
rename to firmware/main/CMakeLists.txt
diff --git a/main/Kconfig.projbuild b/firmware/main/Kconfig.projbuild
similarity index 100%
rename from main/Kconfig.projbuild
rename to firmware/main/Kconfig.projbuild
diff --git a/main/app_task.cpp b/firmware/main/app_task.cpp
similarity index 100%
rename from main/app_task.cpp
rename to firmware/main/app_task.cpp
diff --git a/main/app_task.h b/firmware/main/app_task.h
similarity index 100%
rename from main/app_task.h
rename to firmware/main/app_task.h
diff --git a/main/button_handling.c b/firmware/main/button_handling.c
similarity index 100%
rename from main/button_handling.c
rename to firmware/main/button_handling.c
diff --git a/main/button_handling.h b/firmware/main/button_handling.h
similarity index 100%
rename from main/button_handling.h
rename to firmware/main/button_handling.h
diff --git a/main/common.h b/firmware/main/common.h
similarity index 100%
rename from main/common.h
rename to firmware/main/common.h
diff --git a/main/hal/u8g2_esp32_hal.c b/firmware/main/hal/u8g2_esp32_hal.c
similarity index 100%
rename from main/hal/u8g2_esp32_hal.c
rename to firmware/main/hal/u8g2_esp32_hal.c
diff --git a/main/hal/u8g2_esp32_hal.h b/firmware/main/hal/u8g2_esp32_hal.h
similarity index 100%
rename from main/hal/u8g2_esp32_hal.h
rename to firmware/main/hal/u8g2_esp32_hal.h
diff --git a/main/idf_component.yml b/firmware/main/idf_component.yml
similarity index 100%
rename from main/idf_component.yml
rename to firmware/main/idf_component.yml
diff --git a/main/main.cpp b/firmware/main/main.cpp
similarity index 100%
rename from main/main.cpp
rename to firmware/main/main.cpp
diff --git a/main/setup.c b/firmware/main/setup.c
similarity index 100%
rename from main/setup.c
rename to firmware/main/setup.c
diff --git a/main/setup.h b/firmware/main/setup.h
similarity index 100%
rename from main/setup.h
rename to firmware/main/setup.h
diff --git a/partitions.csv b/firmware/partitions.csv
similarity index 100%
rename from partitions.csv
rename to firmware/partitions.csv
diff --git a/sdkconfig.defaults b/firmware/sdkconfig.defaults
similarity index 100%
rename from sdkconfig.defaults
rename to firmware/sdkconfig.defaults
diff --git a/sdkconfig.defaults.esp32c3 b/firmware/sdkconfig.defaults.esp32c3
similarity index 100%
rename from sdkconfig.defaults.esp32c3
rename to firmware/sdkconfig.defaults.esp32c3
diff --git a/sdkconfig.defaults.esp32h2 b/firmware/sdkconfig.defaults.esp32h2
similarity index 100%
rename from sdkconfig.defaults.esp32h2
rename to firmware/sdkconfig.defaults.esp32h2
diff --git a/sdkconfig.defaults.esp32p4 b/firmware/sdkconfig.defaults.esp32p4
similarity index 100%
rename from sdkconfig.defaults.esp32p4
rename to firmware/sdkconfig.defaults.esp32p4
diff --git a/sdkconfig.defaults.esp32s3 b/firmware/sdkconfig.defaults.esp32s3
similarity index 100%
rename from sdkconfig.defaults.esp32s3
rename to firmware/sdkconfig.defaults.esp32s3
diff --git a/sdkconfig.release b/firmware/sdkconfig.release
similarity index 100%
rename from sdkconfig.release
rename to firmware/sdkconfig.release
diff --git a/src/Common.cpp b/firmware/src/Common.cpp
similarity index 100%
rename from src/Common.cpp
rename to firmware/src/Common.cpp
diff --git a/src/Common.h b/firmware/src/Common.h
similarity index 100%
rename from src/Common.h
rename to firmware/src/Common.h
diff --git a/src/Version.h b/firmware/src/Version.h
similarity index 100%
rename from src/Version.h
rename to firmware/src/Version.h
diff --git a/src/Version.h.in b/firmware/src/Version.h.in
similarity index 100%
rename from src/Version.h.in
rename to firmware/src/Version.h.in
diff --git a/src/debug/debug_overlay.cpp b/firmware/src/debug/debug_overlay.cpp
similarity index 100%
rename from src/debug/debug_overlay.cpp
rename to firmware/src/debug/debug_overlay.cpp
diff --git a/src/debug/debug_overlay.h b/firmware/src/debug/debug_overlay.h
similarity index 100%
rename from src/debug/debug_overlay.h
rename to firmware/src/debug/debug_overlay.h
diff --git a/src/hal/u8g2_hal_sdl.h b/firmware/src/hal/u8g2_hal_sdl.h
similarity index 100%
rename from src/hal/u8g2_hal_sdl.h
rename to firmware/src/hal/u8g2_hal_sdl.h
diff --git a/src/hal/u8x8_hal_sdl.cpp b/firmware/src/hal/u8x8_hal_sdl.cpp
similarity index 100%
rename from src/hal/u8x8_hal_sdl.cpp
rename to firmware/src/hal/u8x8_hal_sdl.cpp
diff --git a/src/main.cpp b/firmware/src/main.cpp
similarity index 100%
rename from src/main.cpp
rename to firmware/src/main.cpp
diff --git a/src/manager/ResourceManager.cpp b/firmware/src/manager/ResourceManager.cpp
similarity index 100%
rename from src/manager/ResourceManager.cpp
rename to firmware/src/manager/ResourceManager.cpp
diff --git a/src/manager/ResourceManager.h b/firmware/src/manager/ResourceManager.h
similarity index 100%
rename from src/manager/ResourceManager.h
rename to firmware/src/manager/ResourceManager.h
diff --git a/src/model/AppContext.cpp b/firmware/src/model/AppContext.cpp
similarity index 100%
rename from src/model/AppContext.cpp
rename to firmware/src/model/AppContext.cpp
diff --git a/src/model/AppContext.h b/firmware/src/model/AppContext.h
similarity index 100%
rename from src/model/AppContext.h
rename to firmware/src/model/AppContext.h
diff --git a/src/model/Window.cpp b/firmware/src/model/Window.cpp
similarity index 100%
rename from src/model/Window.cpp
rename to firmware/src/model/Window.cpp
diff --git a/src/model/Window.h b/firmware/src/model/Window.h
similarity index 100%
rename from src/model/Window.h
rename to firmware/src/model/Window.h
diff --git a/src/ui/Device.cpp b/firmware/src/ui/Device.cpp
similarity index 100%
rename from src/ui/Device.cpp
rename to firmware/src/ui/Device.cpp
diff --git a/src/ui/Device.h b/firmware/src/ui/Device.h
similarity index 100%
rename from src/ui/Device.h
rename to firmware/src/ui/Device.h
diff --git a/src/ui/UIWidget.cpp b/firmware/src/ui/UIWidget.cpp
similarity index 100%
rename from src/ui/UIWidget.cpp
rename to firmware/src/ui/UIWidget.cpp
diff --git a/src/ui/UIWidget.h b/firmware/src/ui/UIWidget.h
similarity index 100%
rename from src/ui/UIWidget.h
rename to firmware/src/ui/UIWidget.h
diff --git a/src/ui/widgets/Button.cpp b/firmware/src/ui/widgets/Button.cpp
similarity index 100%
rename from src/ui/widgets/Button.cpp
rename to firmware/src/ui/widgets/Button.cpp
diff --git a/src/ui/widgets/Button.h b/firmware/src/ui/widgets/Button.h
similarity index 100%
rename from src/ui/widgets/Button.h
rename to firmware/src/ui/widgets/Button.h
diff --git a/src/ui/widgets/D_Pad.cpp b/firmware/src/ui/widgets/D_Pad.cpp
similarity index 100%
rename from src/ui/widgets/D_Pad.cpp
rename to firmware/src/ui/widgets/D_Pad.cpp
diff --git a/src/ui/widgets/D_Pad.h b/firmware/src/ui/widgets/D_Pad.h
similarity index 100%
rename from src/ui/widgets/D_Pad.h
rename to firmware/src/ui/widgets/D_Pad.h
diff --git a/version.txt b/firmware/version.txt
similarity index 100%
rename from version.txt
rename to firmware/version.txt