diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19d0106..b04f2e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,8 @@ target_include_directories(app PRIVATE
     src/command
     src/command/handlers
     src/ble
+    src/power
+    src/dfu
     src/drivers/battery
     src/drivers/echo_adc
     src/drivers/led
@@ -22,13 +24,15 @@ target_sources(app PRIVATE
     src/main.c
     src/app_nvs.c
     src/command/parser.c
+    src/command/ble_cmd_queue.c
     src/command/cmd_common.c
     src/command/cmd_table.c
     src/command/handlers/cmd_device.c
     src/command/handlers/cmd_info.c
     src/command/handlers/cmd_piezo.c
     src/command/handlers/cmd_sensor.c
-    src/power_control.c
+    src/power/power_control.c
+    src/dfu/dfu_manager.c
     src/measurement/piezo_measure.c
     src/ble/ble_service.c
     src/ble/ble_tx_power.c