Index: trunk/firmware/project.emProject
===================================================================
--- trunk/firmware/project.emProject	(revision 26)
+++ trunk/firmware/project.emProject	(revision 44)
@@ -173,4 +173,61 @@
       linker_supply_memory_segments="Yes"
       post_build_command="$(Encrypt)\FileEncrypt.bat $(ProjectDir)/$(OutDir)/$(ProjectName).hex "$(JLinkDir)/JFlash.exe"" />
+    <folder Name="Core">
+      <folder Name="Inc">
+        <file file_name="Inc/ads1260.h" />
+        <file file_name="Inc/ah_counter.h" />
+        <file file_name="Inc/battery_voltage.h" />
+        <file file_name="Inc/chip_temperature.h" />
+        <file file_name="Inc/dma.h" />
+        <file file_name="Inc/doku.h" />
+        <file file_name="Inc/eeprom.h" />
+        <file file_name="Inc/efficiency.h" />
+        <file file_name="Inc/esr.h" />
+        <file file_name="Inc/fast_current.h" />
+        <file file_name="Inc/gpio.h" />
+        <file file_name="Inc/main.h" />
+        <file file_name="Inc/outputs.h" />
+        <file file_name="Inc/ref_voltage.h" />
+        <file file_name="Inc/rtc.h" />
+        <file file_name="Inc/self_discharge.h" />
+        <file file_name="Inc/shunt_temperature.h" />
+        <file file_name="Inc/shunt_voltage.h" />
+        <file file_name="Inc/spi.h" />
+        <file file_name="Inc/stm32g0xx_hal_conf.h" />
+        <file file_name="Inc/stm32g0xx_it.h" />
+        <file file_name="Inc/sysdata.h" />
+        <file file_name="Inc/template.h" />
+        <file file_name="Inc/usart.h" />
+        <file file_name="Inc/wh_counter.h" />
+      </folder>
+      <folder Name="Src">
+        <file file_name="Src/adc.c" />
+        <file file_name="Src/ads1260.c" />
+        <file file_name="Src/ah_counter.c" />
+        <file file_name="Src/battery_voltage.c" />
+        <file file_name="Src/chip_temperature.c" />
+        <file file_name="Src/dma.c" />
+        <file file_name="Src/eeprom.c" />
+        <file file_name="Src/efficiency.c" />
+        <file file_name="Src/esr.c" />
+        <file file_name="Src/fast_current.c" />
+        <file file_name="Src/gpio.c" />
+        <file file_name="Src/main.c" />
+        <file file_name="Src/outputs.c" />
+        <file file_name="Src/ref_voltage.c" />
+        <file file_name="Src/rtc.c" />
+        <file file_name="Src/self_discharge.c" />
+        <file file_name="Src/shunt_temperature.c" />
+        <file file_name="Src/shunt_voltage.c" />
+        <file file_name="Src/spi.c" />
+        <file file_name="Src/stm32g0xx_hal_msp.c" />
+        <file file_name="Src/stm32g0xx_it.c" />
+        <file file_name="Src/sysdata.c" />
+        <file file_name="Src/system_stm32g0xx.c" />
+        <file file_name="Src/template.c" />
+        <file file_name="Src/usart.c" />
+        <file file_name="Src/wh_counter.c" />
+      </folder>
+    </folder>
     <folder Name="Drivers">
       <folder Name="CMSIS">
@@ -363,31 +420,4 @@
       </folder>
     </folder>
-    <folder Name="Inc">
-      <file file_name="Inc/ads1260.h" />
-      <file file_name="Inc/ah_counter.h" />
-      <file file_name="Inc/battery_voltage.h" />
-      <file file_name="Inc/chip_temperature.h" />
-      <file file_name="Inc/dma.h" />
-      <file file_name="Inc/doku.h" />
-      <file file_name="Inc/eeprom.h" />
-      <file file_name="Inc/efficiency.h" />
-      <file file_name="Inc/esr.h" />
-      <file file_name="Inc/fast_current.h" />
-      <file file_name="Inc/gpio.h" />
-      <file file_name="Inc/main.h" />
-      <file file_name="Inc/outputs.h" />
-      <file file_name="Inc/ref_voltage.h" />
-      <file file_name="Inc/rtc.h" />
-      <file file_name="Inc/self_discharge.h" />
-      <file file_name="Inc/shunt_temperature.h" />
-      <file file_name="Inc/shunt_voltage.h" />
-      <file file_name="Inc/spi.h" />
-      <file file_name="Inc/stm32g0xx_hal_conf.h" />
-      <file file_name="Inc/stm32g0xx_it.h" />
-      <file file_name="Inc/sysdata.h" />
-      <file file_name="Inc/template.h" />
-      <file file_name="Inc/usart.h" />
-      <file file_name="Inc/wh_counter.h" />
-    </folder>
     <folder Name="Internal Files">
       <file file_name="Cortex_M_Startup.s">
@@ -407,32 +437,4 @@
       <file file_name="STM32G07x_Vectors.s" />
     </folder>
-    <folder Name="Src">
-      <file file_name="Src/adc.c" />
-      <file file_name="Src/ads1260.c" />
-      <file file_name="Src/ah_counter.c" />
-      <file file_name="Src/battery_voltage.c" />
-      <file file_name="Src/chip_temperature.c" />
-      <file file_name="Src/dma.c" />
-      <file file_name="Src/eeprom.c" />
-      <file file_name="Src/efficiency.c" />
-      <file file_name="Src/esr.c" />
-      <file file_name="Src/fast_current.c" />
-      <file file_name="Src/gpio.c" />
-      <file file_name="Src/main.c" />
-      <file file_name="Src/outputs.c" />
-      <file file_name="Src/ref_voltage.c" />
-      <file file_name="Src/rtc.c" />
-      <file file_name="Src/self_discharge.c" />
-      <file file_name="Src/shunt_temperature.c" />
-      <file file_name="Src/shunt_voltage.c" />
-      <file file_name="Src/spi.c" />
-      <file file_name="Src/stm32g0xx_hal_msp.c" />
-      <file file_name="Src/stm32g0xx_it.c" />
-      <file file_name="Src/sysdata.c" />
-      <file file_name="Src/system_stm32g0xx.c" />
-      <file file_name="Src/template.c" />
-      <file file_name="Src/usart.c" />
-      <file file_name="Src/wh_counter.c" />
-    </folder>
     <folder Name="startup" />
     <file file_name="STM32G070KBTx_MemoryMap.xml" />