diff --git a/CMakeLists.txt b/firmware/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to firmware/CMakeLists.txt
diff --git a/components/alarms/CMakeLists.txt b/firmware/components/alarms/CMakeLists.txt
similarity index 100%
rename from components/alarms/CMakeLists.txt
rename to firmware/components/alarms/CMakeLists.txt
diff --git a/components/alarms/alarm_store.c b/firmware/components/alarms/alarm_store.c
similarity index 100%
rename from components/alarms/alarm_store.c
rename to firmware/components/alarms/alarm_store.c
diff --git a/components/alarms/alarm_store.h b/firmware/components/alarms/alarm_store.h
similarity index 100%
rename from components/alarms/alarm_store.h
rename to firmware/components/alarms/alarm_store.h
diff --git a/components/alarms/alarm_types.h b/firmware/components/alarms/alarm_types.h
similarity index 100%
rename from components/alarms/alarm_types.h
rename to firmware/components/alarms/alarm_types.h
diff --git a/components/alarms/alarms.c b/firmware/components/alarms/alarms.c
similarity index 100%
rename from components/alarms/alarms.c
rename to firmware/components/alarms/alarms.c
diff --git a/components/alarms/alarms.h b/firmware/components/alarms/alarms.h
similarity index 100%
rename from components/alarms/alarms.h
rename to firmware/components/alarms/alarms.h
diff --git a/components/buttons/CMakeLists.txt b/firmware/components/buttons/CMakeLists.txt
similarity index 100%
rename from components/buttons/CMakeLists.txt
rename to firmware/components/buttons/CMakeLists.txt
diff --git a/components/buttons/buttons.c b/firmware/components/buttons/buttons.c
similarity index 100%
rename from components/buttons/buttons.c
rename to firmware/components/buttons/buttons.c
diff --git a/components/buttons/buttons.h b/firmware/components/buttons/buttons.h
similarity index 100%
rename from components/buttons/buttons.h
rename to firmware/components/buttons/buttons.h
diff --git a/components/console_wrapper/CMakeLists.txt b/firmware/components/console_wrapper/CMakeLists.txt
similarity index 100%
rename from components/console_wrapper/CMakeLists.txt
rename to firmware/components/console_wrapper/CMakeLists.txt
diff --git a/components/console_wrapper/console.c b/firmware/components/console_wrapper/console.c
similarity index 100%
rename from components/console_wrapper/console.c
rename to firmware/components/console_wrapper/console.c
diff --git a/components/console_wrapper/console.h b/firmware/components/console_wrapper/console.h
similarity index 100%
rename from components/console_wrapper/console.h
rename to firmware/components/console_wrapper/console.h
diff --git a/components/display/CMakeLists.txt b/firmware/components/display/CMakeLists.txt
similarity index 100%
rename from components/display/CMakeLists.txt
rename to firmware/components/display/CMakeLists.txt
diff --git a/components/display/display.c b/firmware/components/display/display.c
similarity index 100%
rename from components/display/display.c
rename to firmware/components/display/display.c
diff --git a/components/display/display.h b/firmware/components/display/display.h
similarity index 100%
rename from components/display/display.h
rename to firmware/components/display/display.h
diff --git a/components/display/display_driver.c b/firmware/components/display/display_driver.c
similarity index 100%
rename from components/display/display_driver.c
rename to firmware/components/display/display_driver.c
diff --git a/components/display/display_driver.h b/firmware/components/display/display_driver.h
similarity index 100%
rename from components/display/display_driver.h
rename to firmware/components/display/display_driver.h
diff --git a/components/fatal/CMakeLists.txt b/firmware/components/fatal/CMakeLists.txt
similarity index 100%
rename from components/fatal/CMakeLists.txt
rename to firmware/components/fatal/CMakeLists.txt
diff --git a/components/fatal/fatal.c b/firmware/components/fatal/fatal.c
similarity index 100%
rename from components/fatal/fatal.c
rename to firmware/components/fatal/fatal.c
diff --git a/components/fatal/fatal.h b/firmware/components/fatal/fatal.h
similarity index 100%
rename from components/fatal/fatal.h
rename to firmware/components/fatal/fatal.h
diff --git a/components/settings/CMakeLists.txt b/firmware/components/settings/CMakeLists.txt
similarity index 100%
rename from components/settings/CMakeLists.txt
rename to firmware/components/settings/CMakeLists.txt
diff --git a/components/settings/settings.c b/firmware/components/settings/settings.c
similarity index 100%
rename from components/settings/settings.c
rename to firmware/components/settings/settings.c
diff --git a/components/settings/settings.h b/firmware/components/settings/settings.h
similarity index 100%
rename from components/settings/settings.h
rename to firmware/components/settings/settings.h
diff --git a/components/sound/CMakeLists.txt b/firmware/components/sound/CMakeLists.txt
similarity index 100%
rename from components/sound/CMakeLists.txt
rename to firmware/components/sound/CMakeLists.txt
diff --git a/components/sound/sound.c b/firmware/components/sound/sound.c
similarity index 100%
rename from components/sound/sound.c
rename to firmware/components/sound/sound.c
diff --git a/components/sound/sound.h b/firmware/components/sound/sound.h
similarity index 100%
rename from components/sound/sound.h
rename to firmware/components/sound/sound.h
diff --git a/components/system_utils/CMakeLists.txt b/firmware/components/system_utils/CMakeLists.txt
similarity index 100%
rename from components/system_utils/CMakeLists.txt
rename to firmware/components/system_utils/CMakeLists.txt
diff --git a/components/system_utils/system_utils.c b/firmware/components/system_utils/system_utils.c
similarity index 100%
rename from components/system_utils/system_utils.c
rename to firmware/components/system_utils/system_utils.c
diff --git a/components/system_utils/system_utils.h b/firmware/components/system_utils/system_utils.h
similarity index 100%
rename from components/system_utils/system_utils.h
rename to firmware/components/system_utils/system_utils.h
diff --git a/components/time/CMakeLists.txt b/firmware/components/time/CMakeLists.txt
similarity index 100%
rename from components/time/CMakeLists.txt
rename to firmware/components/time/CMakeLists.txt
diff --git a/components/time/time_manager.c b/firmware/components/time/time_manager.c
similarity index 100%
rename from components/time/time_manager.c
rename to firmware/components/time/time_manager.c
diff --git a/components/time/time_manager.h b/firmware/components/time/time_manager.h
similarity index 100%
rename from components/time/time_manager.h
rename to firmware/components/time/time_manager.h
diff --git a/components/time/time_sntp.c b/firmware/components/time/time_sntp.c
similarity index 100%
rename from components/time/time_sntp.c
rename to firmware/components/time/time_sntp.c
diff --git a/components/time/time_sntp.h b/firmware/components/time/time_sntp.h
similarity index 100%
rename from components/time/time_sntp.h
rename to firmware/components/time/time_sntp.h
diff --git a/components/time/time_storage.c b/firmware/components/time/time_storage.c
similarity index 100%
rename from components/time/time_storage.c
rename to firmware/components/time/time_storage.c
diff --git a/components/time/time_storage.h b/firmware/components/time/time_storage.h
similarity index 100%
rename from components/time/time_storage.h
rename to firmware/components/time/time_storage.h
diff --git a/components/time/time_types.h b/firmware/components/time/time_types.h
similarity index 100%
rename from components/time/time_types.h
rename to firmware/components/time/time_types.h
diff --git a/components/wifi/CMakeLists.txt b/firmware/components/wifi/CMakeLists.txt
similarity index 100%
rename from components/wifi/CMakeLists.txt
rename to firmware/components/wifi/CMakeLists.txt
diff --git a/components/wifi/wifi.c b/firmware/components/wifi/wifi.c
similarity index 100%
rename from components/wifi/wifi.c
rename to firmware/components/wifi/wifi.c
diff --git a/components/wifi/wifi.h b/firmware/components/wifi/wifi.h
similarity index 100%
rename from components/wifi/wifi.h
rename to firmware/components/wifi/wifi.h
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/main.c b/firmware/main/main.c
similarity index 100%
rename from main/main.c
rename to firmware/main/main.c
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