diff --git a/BoilerControlUnit.emProject b/BoilerControlUnit.emProject
index 2b8a687..ad14b8e 100644
--- a/BoilerControlUnit.emProject
+++ b/BoilerControlUnit.emProject
@@ -93,8 +93,8 @@
       arm_target_interface_type="SWD"
       arm_v8M_has_cmse="Yes"
       c_preprocessor_definitions="CHIP_CRYPTO_PLATFORM=1;NVM3_DEFAULT_MAX_OBJECT_SIZE=4092;NVM3_DEFAULT_NVM_SIZE=40960;_WANT_REENT_SMALL=1;CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>;CHIP_HAVE_CONFIG_H=1;RADIO_CONFIG_DMP_SUPPORT=1;CHIP_DNSSD_DEFAULT_PLATFORM=1;CHIP_CRYPTO_KEYSTORE_PSA=1;CURRENT_TIME_NOT_IMPLEMENTED=1;SL_MATTER_GN_BUILD=0;MBEDTLS_USER_CONFIG_FILE=<sli_psa_builtin_config.h>;OPENTHREAD_CONFIG_DETERMINISTIC_ECDSA_ENABLE=0;OPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS=0;ENABLE_WSTK_LEDS=1;SILABS_LOG_OUT_UART=1;NON_SPEC_COMPLIANT_OTA_ACTION_DELAY_FLOOR=-1;SILABS_OTA_ENABLED=1;RTT_USE_ASM=0;ENABLE_CHIP_SHELL=1;OPENTHREAD_CONFIG_CLI_TRANSPORT=OT_CLI_TRANSPORT_CONSOLE;SL_MATTER_CLI_ARG_PARSER=1;CHIP_DEVICE_CONFIG_THREAD_ENABLE_CLI=1;CONFIG_ENABLE_EUART=1;EFR32MG24=1;EFR32MG24B310F1536IM48=1;SL_CODE_COMPONENT_SYSTEM=system;SL_APP_PROPERTIES=1;HARDWARE_BOARD_DEFAULT_RF_BAND_2400=1;HARDWARE_BOARD_SUPPORTS_1_RF_BAND=1;HARDWARE_BOARD_SUPPORTS_RF_BAND_2400=1;HFXO_FREQ=39000000;SL_BOARD_NAME="BRD2601B";SL_BOARD_REV="A01";SL_CODE_COMPONENT_CLOCK_MANAGER=clock_manager;configNUM_SDK_THREAD_LOCAL_STORAGE_POINTERS=2;SL_COMPONENT_CATALOG_PRESENT=1;SL_CODE_COMPONENT_DEVICE_PERIPHERAL=device_peripheral;SL_CODE_COMPONENT_DMADRV=dmadrv;SL_CODE_COMPONENT_FREERTOS_KERNEL=freertos_kernel;SL_CODE_COMPONENT_HAL_COMMON=hal_common;SL_CODE_COMPONENT_HAL_GPIO=hal_gpio;SL_CODE_COMPONENT_HAL_SYSRTC=hal_sysrtc;CMSIS_NVIC_VIRTUAL=1;CMSIS_NVIC_VIRTUAL_HEADER_FILE="cmsis_nvic_virtual.h";MBEDTLS_CONFIG_FILE=<sl_mbedtls_config.h>;OPENTHREAD_CORE_CONFIG_PLATFORM_CHECK_FILE="openthread-core-efr32-config-check.h";OPENTHREAD_PROJECT_CORE_CONFIG_FILE="openthread-core-efr32-config.h";SL_CODE_COMPONENT_OT_PLATFORM_ABSTRACTION=ot_platform_abstraction;OPENTHREAD_CONFIG_FILE="sl_openthread_generic_config.h";OPENTHREAD_FTD=1;SL_OPENTHREAD_STACK_FEATURES_CONFIG_FILE="sl_openthread_features_config.h";SL_CODE_COMPONENT_POWER_MANAGER=power_manager;MBEDTLS_PSA_CRYPTO_CONFIG_FILE=<psa_crypto_config.h>;SL_RAIL_LIB_MULTIPROTOCOL_SUPPORT=1;SL_RAIL_UTIL_PA_CONFIG_HEADER=<sl_rail_util_pa_config.h>;SL_CODE_COMPONENT_SE_MANAGER=se_manager;CIRCULAR_QUEUE_USE_LOCAL_CONFIG_HEADER=1;SL_CODE_COMPONENT_CORE=core;SL_OPENTHREAD_CUSTOM_CLI_ENABLE=1;SL_CODE_COMPONENT_SLEEPTIMER=sleeptimer;SL_CODE_COMPONENT_SLI_CRYPTO=sli_crypto;SLI_RADIOAES_REQUIRES_MASKING=1;SL_CODE_COMPONENT_SLI_PROTOCOL_CRYPTO=sli_protocol_crypto;SL_CODE_COMPONENT_PSEC_OSAL=psec_osal;SL_CODE_COMPONENT_UARTDRV=uartdrv"
-      c_system_include_directories="$(StudioIncDir:$(StudioDir)/include);$(ProjectDir)/CMSIS_5/CMSIS/Core/Include/;$(ProjectDir)/EFR32MG24/Device/Include/;$(ProjectDir)/EFR32MG24/Device/Include;$(ProjectDir)/Libs/FreeRTOS/cmsis/Include/;$(ProjectDir)/Libs/FreeRTOS/kernel/Include/;$(ProjectDir)/Libs/FreeRTOS/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/;$(ProjectDir)/Libs/CMSIS/Core/Include/;$(ProjectDir)/Libs/CMSIS/RTOS2/Include/;$(ProjectDir)/config/;$(ProjectDir)/autogen/;$(ProjectDir)/Libs/platform/common/inc/;$(ProjectDir)/Libs/platform/common/toolchain/inc/;$(ProjectDir)/Libs/platform/service/clock_manager/inc/;$(ProjectDir)/Libs/platform/service/device_init/inc/;$(ProjectDir)/Libs/platform/service/device_manager/inc/;$(ProjectDir)/Libs/platform/service/hfxo_manager/inc/;$(ProjectDir)/Libs/platform/service/interrupt_manager/inc/;$(ProjectDir)/Libs/platform/service/interrupt_manager/inc/arm/;$(ProjectDir)/Libs/platform/service/iostream/inc/;$(ProjectDir)/Libs/platform/service/memory_manager/inc/;$(ProjectDir)/Libs/platform/service/memory_manager/profiler/inc/;$(ProjectDir)/Libs/platform/service/mpu/inc/;$(ProjectDir)/Libs/platform/service/power_manager/inc/;$(ProjectDir)/Libs/platform/service/sleeptimer/inc/;$(ProjectDir)/Libs/platform/service/system/inc/;$(ProjectDir)/Libs/platform/service/udelay/inc/;$(ProjectDir)/Libs/platform/emlib/inc/;$(ProjectDir)/Libs/platform/peripheral/inc/;$(ProjectDir)/Libs/platform/driver/button/inc/;$(ProjectDir)/Libs/platform/driver/gpio/inc/;$(ProjectDir)/Libs/platform/driver/leddrv/inc/"
-      c_user_include_directories="$(ProjectDir)/CMSIS_5/CMSIS/Core/Include/;$(ProjectDir)/EFR32MG24/Device/Include/;$(ProjectDir)/EFR32MG24/Device/Include/;$(ProjectDir)/Libs/FreeRTOS/cmsis/Include/;$(ProjectDir)/Libs/FreeRTOS/kernel/Include/;$(ProjectDir)/Libs/FreeRTOS/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/;$(ProjectDir)/Libs/CMSIS/Core/Include/;$(ProjectDir)/Libs/CMSIS/RTOS2/Include/;$(ProjectDir)/config/;$(ProjectDir)/autogen/;$(ProjectDir)/Libs/platform/common/inc/;$(ProjectDir)/Libs/platform/common/toolchain/inc/;$(ProjectDir)/Libs/platform/common/inc/;$(ProjectDir)/Libs/platform/common/toolchain/inc/;$(ProjectDir)/Libs/platform/service/clock_manager/inc/;$(ProjectDir)/Libs/platform/service/device_init/inc/;$(ProjectDir)/Libs/platform/service/device_manager/inc/;$(ProjectDir)/Libs/platform/service/hfxo_manager/inc/;$(ProjectDir)/Libs/platform/service/interrupt_manager/inc/;$(ProjectDir)/Libs/platform/service/interrupt_manager/inc/arm/;$(ProjectDir)/Libs/platform/service/iostream/inc/;$(ProjectDir)/Libs/platform/service/memory_manager/inc/;$(ProjectDir)/Libs/platform/service/memory_manager/profiler/inc/;$(ProjectDir)/Libs/platform/service/mpu/inc/;$(ProjectDir)/Libs/platform/service/power_manager/inc/;$(ProjectDir)/Libs/platform/service/sleeptimer/inc/;$(ProjectDir)/Libs/platform/service/system/inc/;$(ProjectDir)/Libs/platform/service/udelay/inc/;$(ProjectDir)/Libs/platform/emlib/inc/"
+      c_system_include_directories="$(StudioIncDir:$(StudioDir)/include)"
+      c_user_include_directories="$(ProjectDir)/src;$(ProjectDir)/inc;$(ProjectDir)/CMSIS_5/CMSIS/Core/Include/;$(ProjectDir)/EFR32MG24/Device/Include/;$(ProjectDir)/EFR32MG24/Device/Include/;$(ProjectDir)/Libs/FreeRTOS/cmsis/Include/;$(ProjectDir)/Libs/FreeRTOS/kernel/Include/;$(ProjectDir)/Libs/FreeRTOS/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/;$(ProjectDir)/Libs/CMSIS/Core/Include/;$(ProjectDir)/Libs/CMSIS/RTOS2/Include/;$(ProjectDir)/config/;$(ProjectDir)/autogen/;$(ProjectDir)/autogen/zap-generated/;$(ProjectDir)/Libs/platform/common/inc/;$(ProjectDir)/Libs/platform/driver/gpio/inc/;$(ProjectDir)/Libs/platform/driver/button/inc/;$(ProjectDir)/Libs/platform/driver/leddrv/inc/;$(ProjectDir)/Libs/platform/emdrv/common/inc/;$(ProjectDir)/Libs/platform/emdrv/dmadrv/inc/;$(ProjectDir)/Libs/platform/emdrv/dmadrv/inc/s2_signals/;$(ProjectDir)/Libs/platform/emdrv/gpiointerrupt/inc/;$(ProjectDir)/Libs/platform/emdrv/nvm3/inc/;$(ProjectDir)/Libs/platform/emdrv/nvm3/config/;$(ProjectDir)/Libs/platform/emdrv/uartdrv/inc/;$(ProjectDir)/Libs/platform/common/toolchain/inc/;$(ProjectDir)/Libs/platform/common/inc/;$(ProjectDir)/Libs/platform/common/toolchain/inc/;$(ProjectDir)/Libs/platform/service/clock_manager/inc/;$(ProjectDir)/Libs/platform/service/device_init/inc/;$(ProjectDir)/Libs/platform/service/device_manager/inc/;$(ProjectDir)/Libs/platform/service/hfxo_manager/inc/;$(ProjectDir)/Libs/platform/service/interrupt_manager/inc/;$(ProjectDir)/Libs/platform/service/interrupt_manager/inc/arm/;$(ProjectDir)/Libs/platform/service/iostream/inc/;$(ProjectDir)/Libs/platform/service/memory_manager/inc/;$(ProjectDir)/Libs/platform/service/memory_manager/profiler/inc/;$(ProjectDir)/Libs/platform/service/mpu/inc/;$(ProjectDir)/Libs/platform/service/power_manager/inc/;$(ProjectDir)/Libs/platform/service/sleeptimer/inc/;$(ProjectDir)/Libs/platform/service/system/inc/;$(ProjectDir)/Libs/platform/service/udelay/inc/;$(ProjectDir)/Libs/platform/emlib/inc/;$(ProjectDir)/Libs/platform/security/sl_component/sl_mbedtls_support/config/;$(ProjectDir)/Libs/platform/security/sl_component/sl_mbedtls_support/config/preset/;$(ProjectDir)/Libs/platform/security/sl_component/sl_mbedtls_support/inc/;$(ProjectDir)/Libs/platform/security/sl_component/sl_psa_driver/inc/;$(ProjectDir)/Libs/platform/security/sl_component/se_manager/inc/;$(ProjectDir)/Libs/platform/security/sl_component/sli_crypto/inc/;$(ProjectDir)/Libs/platform/security/sl_component/sl_protocol_crypto/src/;$(ProjectDir)/Libs/platform/security/sl_component/sli_psec_osal/inc/;$(ProjectDir)/Libs/platform/hardware/board/inc;$(ProjectDir)/Libs/platform/hardware/driver/mx25_flash_shutdown/inc/sl_mx25_flash_shutdown_eusart/;$(ProjectDir)/Libs/platform/radio/rail_lib/common/;$(ProjectDir)/Libs/platform/radio/rail_lib/protocol/ble/;$(ProjectDir)/Libs/platform/radio/rail_lib/protocol/ieee802154/;$(ProjectDir)/Libs/platform/radio/rail_lib/protocol/wmbus/;$(ProjectDir)/Libs/platform/radio/rail_lib/protocol/zwave/;$(ProjectDir)/Libs/platform/radio/rail_lib/chip/efr32/efr32xg2x/;$(ProjectDir)/Libs/platform/radio/rail_lib/protocol/sidewalk/;$(ProjectDir)/Libs/platform/radio/rail_lib/plugin/rail_util_built_in_phys/efr32xg24/;$(ProjectDir)/Libs/platform/radio/rail_lib/plugin/pa-conversions/;$(ProjectDir)/Libs/platform/radio/rail_lib/plugin/pa-conversions/efr32xg24/;$(ProjectDir)/Libs/platform/radio/rail_lib/plugin/rail_util_power_manager_init/;$(ProjectDir)/Libs/platform/radio/rail_lib/plugin/rail_util_pti/;$(ProjectDir)/Libs/platform/radio/rail_lib/plugin/rail_util_rssi/;$(ProjectDir)/Libs/platform/bootloader/;$(ProjectDir)/Libs/platform/bootloader/api/;$(ProjectDir)/Libs/platform/bootloader/core/flash/;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/examples/platform/silabs;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/include;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/lib;$(ProjectDir)/Libs/Matter/third_party/nlassert/include;$(ProjectDir)/Libs/Matter/third_party/nlio/include;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/lib/address_resolve;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/reporting;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/ember_coupling;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/data-model-provider;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/codegen-data-model-provider;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/lib/dnssd;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/examples/platform/silabs/efr32;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/platform/silabs/efr32;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/include/platform;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/include/platform/internal;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/platform/logging;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/include/platform/internal/testing;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/lib/dnssd/platform;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/common;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/lwip/silabs;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/platform/silabs;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/platform/silabs/platformAbstraction;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/platform;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/platform/OpenThread;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/platform/FreeRTOS;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/lib/core;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/access;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/access/examples;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/lib/asn1;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/protocols/bdx;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/ble;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/server;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/crypto;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/protocols/user_directed_commissioning;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/protocols;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/protocols/secure_channel;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/protocols/echo;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/credentials/examples;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/credentials/attestation_verifier;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/credentials;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/credentials/tests;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/inet;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/protocols/interaction_model;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/examples/providers;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/messaging;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/transport/raw;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/setup_payload;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/lib/support/logging;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/lib/support;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/lib/support/verhoeff;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/system;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/transport;$(ProjectDir)/Libs/Matter/third_party/matter_sdk;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/icd/server;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/access-control-server;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/basic-information;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/bindings;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/cluster-building-blocks;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/descriptor;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/diagnostic-logs-server;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/general-commissioning-server;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/general-diagnostics-server;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/groups-server;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/identify-server;$(ProjectDir)/Libs/Matter/slc/inc;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/level-control;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/network-commissioning;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/on-off-server;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/controller;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/ota-requestor;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/platform/silabs/provision;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/scenes-server;$(ProjectDir)/Libs/Matter/slc/component/sdk-content/simplicity-sdk/util/third_party/segger/systemview/SEGGER;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/lib/shell;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/lib/shell/commands;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/examples/shell/shell_common/include;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/software-diagnostics-server;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/switch-server;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/clusters/thread-network-diagnostics-server;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/tracing;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/platform/silabs/tracing;$(ProjectDir)/Libs/Matter/third_party/matter_sdk/src/app/MessageDef;$(ProjectDir)/Libs/protocol/openthread/platform-abstraction/efr32/;$(ProjectDir)/Libs/protocol/openthread/platform-abstraction/rtos/;$(ProjectDir)/Libs/protocol/openthread/platform-abstraction/include/;$(ProjectDir)/Libs/protocol/openthread/include/;$(ProjectDir)/Libs/protocol/bluetooth/bgcommon/inc/;$(ProjectDir)/Libs/protocol/bluetooth/inc/;$(ProjectDir)/Libs/protocol/bluetooth/bgstack/ll/inc/;$(ProjectDir)/Libs/util/third_party/mbedtls/include/;$(ProjectDir)/Libs/util/third_party/mbedtls/library/;$(ProjectDir)/Libs/util/third_party/openthread/src/;$(ProjectDir)/Libs/util/third_party/openthread/src/cli/;$(ProjectDir)/Libs/util/third_party/openthread/include/;$(ProjectDir)/Libs/util/third_party/openthread/include/openthread/;$(ProjectDir)/Libs/util/third_party/openthread/src/core/;$(ProjectDir)/Libs/util/third_party/openthread/src/lib/;$(ProjectDir)/Libs/util/third_party/openthread/examples/platforms/;$(ProjectDir)/Libs/util/third_party/openthread/third_party/tcplp/;$(ProjectDir)/Libs/util/plugin/security_manager/;$(ProjectDir)/Libs/util/silicon_labs/silabs_core/queue/"
       debug_register_definition_file="$(ProjectDir)/EFR32MG24B310F1536IM48_Registers.xml"
       debug_stack_pointer_start="__stack_end__"
       debug_start_from_entry_point_symbol="Yes"
@@ -108,10 +108,16 @@
       target_reset_script="Reset();" />
     <configuration
       Name="Debug"
+      build_intermediate_directory="Output/$(Configuration)/Obj/$(RelInputDir)"
       debug_additional_load_file="C:/code/BoilerControlUnit/Bootloader/Output/Debug/Exe/Bootloader.elf"
       debug_start_from_entry_point_symbol="No"
       external_build_file_name="$(ProjectDir)/Output/Debug/Exe/Firmware.elf"
+      gcc_cplusplus_language_standard="c++20"
       project_dependencies="Bootloader" />
+    <folder Name="Application">
+      <folder Name="Includes" exclude="" filter="" path="inc" recurse="Yes" />
+      <folder Name="source" exclude="" filter="" path="src" recurse="Yes" />
+    </folder>
     <folder Name="autogen" exclude="" filter="" path="autogen" recurse="No" />
     <folder Name="CMSIS Files">
       <file file_name="EFR32MG24/Device/Include/em_device.h" />
@@ -129,10 +135,6 @@
         <configuration Name="Common" file_type="Reset Script" />
       </file>
     </folder>
-    <folder Name="Source Files">
-      <configuration Name="Common" filter="c;cpp;cxx;cc;h;s;asm;inc" />
-      <file file_name="main.c" />
-    </folder>
     <folder Name="System Files">
       <file file_name="EFR32MG24/Source/EFR32MG24_Startup.s" />
       <file file_name="EFR32MG24/Source/efr32mg24_Vectors.s">
diff --git a/Firmware b/Firmware
index 264a346..9d06f98 160000
--- a/Firmware
+++ b/Firmware
@@ -1 +1 @@
-Subproject commit 264a3462e0b83b5b0616d52915b58f0d4c8af767
+Subproject commit 9d06f983afb83f200254a8efdb094b6c291fd4df