diff --git a/.gitignore b/.gitignore
index c051533..0a8313a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
 *.map
 /Debug/
 /Release/
+/firmware/Debug/
+/firmware/Release/
diff --git a/.cproject b/firmware/.cproject
similarity index 100%
rename from .cproject
rename to firmware/.cproject
diff --git a/.cproject_org b/firmware/.cproject_org
similarity index 100%
rename from .cproject_org
rename to firmware/.cproject_org
diff --git a/.mxproject b/firmware/.mxproject
similarity index 100%
rename from .mxproject
rename to firmware/.mxproject
diff --git a/.project b/firmware/.project
similarity index 100%
rename from .project
rename to firmware/.project
diff --git a/.project_org b/firmware/.project_org
similarity index 100%
rename from .project_org
rename to firmware/.project_org
diff --git a/.settings/desktop.ini b/firmware/.settings/desktop.ini
similarity index 100%
rename from .settings/desktop.ini
rename to firmware/.settings/desktop.ini
diff --git a/.settings/language.settings.xml b/firmware/.settings/language.settings.xml
similarity index 69%
rename from .settings/language.settings.xml
rename to firmware/.settings/language.settings.xml
index 3666ee4..60642f1 100644
--- a/.settings/language.settings.xml
+++ b/firmware/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="892067782257261287" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1730349911864528736" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="892067782257261287" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1730349911864528736" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/.settings/org.eclipse.cdt.codan.core.prefs b/firmware/.settings/org.eclipse.cdt.codan.core.prefs
similarity index 100%
rename from .settings/org.eclipse.cdt.codan.core.prefs
rename to firmware/.settings/org.eclipse.cdt.codan.core.prefs
diff --git a/.settings/org.eclipse.cdt.core.prefs b/firmware/.settings/org.eclipse.cdt.core.prefs
similarity index 100%
rename from .settings/org.eclipse.cdt.core.prefs
rename to firmware/.settings/org.eclipse.cdt.core.prefs
diff --git a/BMS_v2 Run.cfg b/firmware/BMS_v2 Run.cfg
similarity index 100%
rename from BMS_v2 Run.cfg
rename to firmware/BMS_v2 Run.cfg
diff --git a/firmware/BMS_v3 Debug.cfg b/firmware/BMS_v3 Debug.cfg
new file mode 100644
index 0000000..b7b4d27
--- /dev/null
+++ b/firmware/BMS_v3 Debug.cfg	
@@ -0,0 +1,42 @@
+# This is an genericBoard board with a single STM32F107VCTx chip
+#
+# Generated by STM32CubeIDE
+# Take care that such file, as generated, may be overridden without any early notice. Please have a look to debug launch configuration setup(s)
+
+source [find interface/stlink-dap.cfg]
+
+
+set WORKAREASIZE 0x8000
+
+transport select "dapdirect_swd"
+
+set CHIPNAME STM32F107VCTx
+set BOARDNAME genericBoard
+
+# Enable debug when in low power modes
+set ENABLE_LOW_POWER 1
+
+# Stop Watchdog counters when halt
+set STOP_WATCHDOG 1
+
+# STlink Debug clock frequency
+set CLOCK_FREQ 8000
+
+# Reset configuration
+# use hardware reset, connect under reset
+# connect_assert_srst needed if low power mode application running (WFI...)
+reset_config srst_only srst_nogate connect_assert_srst
+set CONNECT_UNDER_RESET 1
+set CORE_RESET 0
+
+# ACCESS PORT NUMBER
+set AP_NUM 0
+# GDB PORT
+set GDB_PORT 3333
+
+
+
+# BCTM CPU variables
+
+source [find target/stm32f1x.cfg]
+
diff --git a/BMS_v3 Debug.launch b/firmware/BMS_v3 Debug.launch
similarity index 100%
rename from BMS_v3 Debug.launch
rename to firmware/BMS_v3 Debug.launch
diff --git a/BMS_v3.ioc b/firmware/BMS_v3.ioc
similarity index 100%
rename from BMS_v3.ioc
rename to firmware/BMS_v3.ioc
diff --git a/Core.7z b/firmware/Core.7z
similarity index 100%
rename from Core.7z
rename to firmware/Core.7z
diff --git a/Core/Inc/DPC_Timeout.h b/firmware/Core/Inc/DPC_Timeout.h
similarity index 100%
rename from Core/Inc/DPC_Timeout.h
rename to firmware/Core/Inc/DPC_Timeout.h
diff --git a/Core/Inc/GSM.h b/firmware/Core/Inc/GSM.h
similarity index 100%
rename from Core/Inc/GSM.h
rename to firmware/Core/Inc/GSM.h
diff --git a/Core/Inc/SD_Card.h b/firmware/Core/Inc/SD_Card.h
similarity index 100%
rename from Core/Inc/SD_Card.h
rename to firmware/Core/Inc/SD_Card.h
diff --git a/Core/Inc/can.h b/firmware/Core/Inc/can.h
similarity index 100%
rename from Core/Inc/can.h
rename to firmware/Core/Inc/can.h
diff --git a/Core/Inc/dataHelper.h b/firmware/Core/Inc/dataHelper.h
similarity index 100%
rename from Core/Inc/dataHelper.h
rename to firmware/Core/Inc/dataHelper.h
diff --git a/Core/Inc/desktop.ini b/firmware/Core/Inc/desktop.ini
similarity index 100%
rename from Core/Inc/desktop.ini
rename to firmware/Core/Inc/desktop.ini
diff --git a/Core/Inc/driverHWEEPROM.h b/firmware/Core/Inc/driverHWEEPROM.h
similarity index 100%
rename from Core/Inc/driverHWEEPROM.h
rename to firmware/Core/Inc/driverHWEEPROM.h
diff --git a/Core/Inc/driverHWPowerState.h b/firmware/Core/Inc/driverHWPowerState.h
similarity index 100%
rename from Core/Inc/driverHWPowerState.h
rename to firmware/Core/Inc/driverHWPowerState.h
diff --git a/Core/Inc/driverHWSPI1.h b/firmware/Core/Inc/driverHWSPI1.h
similarity index 100%
rename from Core/Inc/driverHWSPI1.h
rename to firmware/Core/Inc/driverHWSPI1.h
diff --git a/Core/Inc/driverHWSwitches.h b/firmware/Core/Inc/driverHWSwitches.h
similarity index 100%
rename from Core/Inc/driverHWSwitches.h
rename to firmware/Core/Inc/driverHWSwitches.h
diff --git a/Core/Inc/driverHWUART2.h b/firmware/Core/Inc/driverHWUART2.h
similarity index 100%
rename from Core/Inc/driverHWUART2.h
rename to firmware/Core/Inc/driverHWUART2.h
diff --git a/Core/Inc/driverSWLTC6804.h b/firmware/Core/Inc/driverSWLTC6804.h
similarity index 100%
rename from Core/Inc/driverSWLTC6804.h
rename to firmware/Core/Inc/driverSWLTC6804.h
diff --git a/Core/Inc/driverSWStorageManager.h b/firmware/Core/Inc/driverSWStorageManager.h
similarity index 100%
rename from Core/Inc/driverSWStorageManager.h
rename to firmware/Core/Inc/driverSWStorageManager.h
diff --git a/Core/Inc/driverSWUART2.h b/firmware/Core/Inc/driverSWUART2.h
similarity index 100%
rename from Core/Inc/driverSWUART2.h
rename to firmware/Core/Inc/driverSWUART2.h
diff --git a/Core/Inc/fatfs.h b/firmware/Core/Inc/fatfs.h
similarity index 100%
rename from Core/Inc/fatfs.h
rename to firmware/Core/Inc/fatfs.h
diff --git a/Core/Inc/ffconf.h b/firmware/Core/Inc/ffconf.h
similarity index 100%
rename from Core/Inc/ffconf.h
rename to firmware/Core/Inc/ffconf.h
diff --git a/Core/Inc/generalDefines.h b/firmware/Core/Inc/generalDefines.h
similarity index 100%
rename from Core/Inc/generalDefines.h
rename to firmware/Core/Inc/generalDefines.h
diff --git a/Core/Inc/libBuffer.h b/firmware/Core/Inc/libBuffer.h
similarity index 100%
rename from Core/Inc/libBuffer.h
rename to firmware/Core/Inc/libBuffer.h
diff --git a/Core/Inc/libCRC.h b/firmware/Core/Inc/libCRC.h
similarity index 100%
rename from Core/Inc/libCRC.h
rename to firmware/Core/Inc/libCRC.h
diff --git a/Core/Inc/libPacket.h b/firmware/Core/Inc/libPacket.h
similarity index 100%
rename from Core/Inc/libPacket.h
rename to firmware/Core/Inc/libPacket.h
diff --git a/Core/Inc/libRingbuffer.h b/firmware/Core/Inc/libRingbuffer.h
similarity index 100%
rename from Core/Inc/libRingbuffer.h
rename to firmware/Core/Inc/libRingbuffer.h
diff --git a/Core/Inc/main.h b/firmware/Core/Inc/main.h
similarity index 100%
rename from Core/Inc/main.h
rename to firmware/Core/Inc/main.h
diff --git a/Core/Inc/mainDataTypes.h b/firmware/Core/Inc/mainDataTypes.h
similarity index 100%
rename from Core/Inc/mainDataTypes.h
rename to firmware/Core/Inc/mainDataTypes.h
diff --git a/Core/Inc/modCommands.h b/firmware/Core/Inc/modCommands.h
similarity index 100%
rename from Core/Inc/modCommands.h
rename to firmware/Core/Inc/modCommands.h
diff --git a/Core/Inc/modConfig.h b/firmware/Core/Inc/modConfig.h
similarity index 100%
rename from Core/Inc/modConfig.h
rename to firmware/Core/Inc/modConfig.h
diff --git a/Core/Inc/modDelay.h b/firmware/Core/Inc/modDelay.h
similarity index 100%
rename from Core/Inc/modDelay.h
rename to firmware/Core/Inc/modDelay.h
diff --git a/Core/Inc/modFlash.h b/firmware/Core/Inc/modFlash.h
similarity index 100%
rename from Core/Inc/modFlash.h
rename to firmware/Core/Inc/modFlash.h
diff --git a/Core/Inc/modOperationalState.h b/firmware/Core/Inc/modOperationalState.h
similarity index 100%
rename from Core/Inc/modOperationalState.h
rename to firmware/Core/Inc/modOperationalState.h
diff --git a/Core/Inc/modPowerElectronics.h b/firmware/Core/Inc/modPowerElectronics.h
similarity index 100%
rename from Core/Inc/modPowerElectronics.h
rename to firmware/Core/Inc/modPowerElectronics.h
diff --git a/Core/Inc/modPowerState.h b/firmware/Core/Inc/modPowerState.h
similarity index 100%
rename from Core/Inc/modPowerState.h
rename to firmware/Core/Inc/modPowerState.h
diff --git a/Core/Inc/modStateOfCharge.h b/firmware/Core/Inc/modStateOfCharge.h
similarity index 100%
rename from Core/Inc/modStateOfCharge.h
rename to firmware/Core/Inc/modStateOfCharge.h
diff --git a/Core/Inc/modTerminal.h b/firmware/Core/Inc/modTerminal.h
similarity index 100%
rename from Core/Inc/modTerminal.h
rename to firmware/Core/Inc/modTerminal.h
diff --git a/Core/Inc/modUART.h b/firmware/Core/Inc/modUART.h
similarity index 100%
rename from Core/Inc/modUART.h
rename to firmware/Core/Inc/modUART.h
diff --git a/Core/Inc/rtc.h b/firmware/Core/Inc/rtc.h
similarity index 100%
rename from Core/Inc/rtc.h
rename to firmware/Core/Inc/rtc.h
diff --git a/Core/Inc/stm32f1xx_hal_conf.h b/firmware/Core/Inc/stm32f1xx_hal_conf.h
similarity index 100%
rename from Core/Inc/stm32f1xx_hal_conf.h
rename to firmware/Core/Inc/stm32f1xx_hal_conf.h
diff --git a/Core/Inc/stm32f1xx_it.h b/firmware/Core/Inc/stm32f1xx_it.h
similarity index 100%
rename from Core/Inc/stm32f1xx_it.h
rename to firmware/Core/Inc/stm32f1xx_it.h
diff --git a/Core/Src/DPC_Timeout.c b/firmware/Core/Src/DPC_Timeout.c
similarity index 100%
rename from Core/Src/DPC_Timeout.c
rename to firmware/Core/Src/DPC_Timeout.c
diff --git a/Core/Src/GSM.c b/firmware/Core/Src/GSM.c
similarity index 100%
rename from Core/Src/GSM.c
rename to firmware/Core/Src/GSM.c
diff --git a/Core/Src/SD_Card.c b/firmware/Core/Src/SD_Card.c
similarity index 100%
rename from Core/Src/SD_Card.c
rename to firmware/Core/Src/SD_Card.c
diff --git a/Core/Src/can.c b/firmware/Core/Src/can.c
similarity index 100%
rename from Core/Src/can.c
rename to firmware/Core/Src/can.c
diff --git a/Core/Src/desktop.ini b/firmware/Core/Src/desktop.ini
similarity index 100%
rename from Core/Src/desktop.ini
rename to firmware/Core/Src/desktop.ini
diff --git a/Core/Src/driverHWEEPROM.c b/firmware/Core/Src/driverHWEEPROM.c
similarity index 100%
rename from Core/Src/driverHWEEPROM.c
rename to firmware/Core/Src/driverHWEEPROM.c
diff --git a/Core/Src/driverHWPowerState.c b/firmware/Core/Src/driverHWPowerState.c
similarity index 100%
rename from Core/Src/driverHWPowerState.c
rename to firmware/Core/Src/driverHWPowerState.c
diff --git a/Core/Src/driverHWSPI1.c b/firmware/Core/Src/driverHWSPI1.c
similarity index 100%
rename from Core/Src/driverHWSPI1.c
rename to firmware/Core/Src/driverHWSPI1.c
diff --git a/Core/Src/driverHWSwitches.c b/firmware/Core/Src/driverHWSwitches.c
similarity index 100%
rename from Core/Src/driverHWSwitches.c
rename to firmware/Core/Src/driverHWSwitches.c
diff --git a/Core/Src/driverHWUART2.c b/firmware/Core/Src/driverHWUART2.c
similarity index 100%
rename from Core/Src/driverHWUART2.c
rename to firmware/Core/Src/driverHWUART2.c
diff --git a/Core/Src/driverSWLTC6804.c b/firmware/Core/Src/driverSWLTC6804.c
similarity index 100%
rename from Core/Src/driverSWLTC6804.c
rename to firmware/Core/Src/driverSWLTC6804.c
diff --git a/Core/Src/driverSWStorageManager.c b/firmware/Core/Src/driverSWStorageManager.c
similarity index 100%
rename from Core/Src/driverSWStorageManager.c
rename to firmware/Core/Src/driverSWStorageManager.c
diff --git a/Core/Src/driverSWUART2.c b/firmware/Core/Src/driverSWUART2.c
similarity index 100%
rename from Core/Src/driverSWUART2.c
rename to firmware/Core/Src/driverSWUART2.c
diff --git a/Core/Src/fatfs.c b/firmware/Core/Src/fatfs.c
similarity index 100%
rename from Core/Src/fatfs.c
rename to firmware/Core/Src/fatfs.c
diff --git a/Core/Src/libBuffer.c b/firmware/Core/Src/libBuffer.c
similarity index 100%
rename from Core/Src/libBuffer.c
rename to firmware/Core/Src/libBuffer.c
diff --git a/Core/Src/libCRC.c b/firmware/Core/Src/libCRC.c
similarity index 100%
rename from Core/Src/libCRC.c
rename to firmware/Core/Src/libCRC.c
diff --git a/Core/Src/libPacket.c b/firmware/Core/Src/libPacket.c
similarity index 100%
rename from Core/Src/libPacket.c
rename to firmware/Core/Src/libPacket.c
diff --git a/Core/Src/libRingbuffer.c b/firmware/Core/Src/libRingbuffer.c
similarity index 100%
rename from Core/Src/libRingbuffer.c
rename to firmware/Core/Src/libRingbuffer.c
diff --git a/Core/Src/main.c b/firmware/Core/Src/main.c
similarity index 100%
rename from Core/Src/main.c
rename to firmware/Core/Src/main.c
diff --git a/Core/Src/modCommands.c b/firmware/Core/Src/modCommands.c
similarity index 100%
rename from Core/Src/modCommands.c
rename to firmware/Core/Src/modCommands.c
diff --git a/Core/Src/modConfig.c b/firmware/Core/Src/modConfig.c
similarity index 100%
rename from Core/Src/modConfig.c
rename to firmware/Core/Src/modConfig.c
diff --git a/Core/Src/modDelay.c b/firmware/Core/Src/modDelay.c
similarity index 100%
rename from Core/Src/modDelay.c
rename to firmware/Core/Src/modDelay.c
diff --git a/Core/Src/modFlash.c b/firmware/Core/Src/modFlash.c
similarity index 100%
rename from Core/Src/modFlash.c
rename to firmware/Core/Src/modFlash.c
diff --git a/Core/Src/modOperationalState.c b/firmware/Core/Src/modOperationalState.c
similarity index 100%
rename from Core/Src/modOperationalState.c
rename to firmware/Core/Src/modOperationalState.c
diff --git a/Core/Src/modPowerElectronics.c b/firmware/Core/Src/modPowerElectronics.c
similarity index 100%
rename from Core/Src/modPowerElectronics.c
rename to firmware/Core/Src/modPowerElectronics.c
diff --git a/Core/Src/modPowerState.c b/firmware/Core/Src/modPowerState.c
similarity index 100%
rename from Core/Src/modPowerState.c
rename to firmware/Core/Src/modPowerState.c
diff --git a/Core/Src/modStateOfCharge.c b/firmware/Core/Src/modStateOfCharge.c
similarity index 100%
rename from Core/Src/modStateOfCharge.c
rename to firmware/Core/Src/modStateOfCharge.c
diff --git a/Core/Src/modTerminal.c b/firmware/Core/Src/modTerminal.c
similarity index 100%
rename from Core/Src/modTerminal.c
rename to firmware/Core/Src/modTerminal.c
diff --git a/Core/Src/modUART.c b/firmware/Core/Src/modUART.c
similarity index 100%
rename from Core/Src/modUART.c
rename to firmware/Core/Src/modUART.c
diff --git a/Core/Src/rtc.c b/firmware/Core/Src/rtc.c
similarity index 100%
rename from Core/Src/rtc.c
rename to firmware/Core/Src/rtc.c
diff --git a/Core/Src/stm32f1xx_hal_msp.c b/firmware/Core/Src/stm32f1xx_hal_msp.c
similarity index 100%
rename from Core/Src/stm32f1xx_hal_msp.c
rename to firmware/Core/Src/stm32f1xx_hal_msp.c
diff --git a/Core/Src/stm32f1xx_it.c b/firmware/Core/Src/stm32f1xx_it.c
similarity index 100%
rename from Core/Src/stm32f1xx_it.c
rename to firmware/Core/Src/stm32f1xx_it.c
diff --git a/Core/Src/syscalls.c b/firmware/Core/Src/syscalls.c
similarity index 100%
rename from Core/Src/syscalls.c
rename to firmware/Core/Src/syscalls.c
diff --git a/Core/Src/system_stm32f1xx.c b/firmware/Core/Src/system_stm32f1xx.c
similarity index 100%
rename from Core/Src/system_stm32f1xx.c
rename to firmware/Core/Src/system_stm32f1xx.c
diff --git a/Core/desktop.ini b/firmware/Core/desktop.ini
similarity index 100%
rename from Core/desktop.ini
rename to firmware/Core/desktop.ini
diff --git a/Drivers/CMSIS/Device/ST/STM32F1xx/Include/desktop.ini b/firmware/Drivers/CMSIS/Device/ST/STM32F1xx/Include/desktop.ini
similarity index 100%
rename from Drivers/CMSIS/Device/ST/STM32F1xx/Include/desktop.ini
rename to firmware/Drivers/CMSIS/Device/ST/STM32F1xx/Include/desktop.ini
diff --git a/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f107xc.h b/firmware/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f107xc.h
similarity index 100%
rename from Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f107xc.h
rename to firmware/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f107xc.h
diff --git a/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h b/firmware/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
similarity index 100%
rename from Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
rename to firmware/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h
diff --git a/Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h b/firmware/Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h
similarity index 100%
rename from Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h
rename to firmware/Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h
diff --git a/Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/desktop.ini b/firmware/Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/desktop.ini
similarity index 100%
rename from Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/desktop.ini
rename to firmware/Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/desktop.ini
diff --git a/Drivers/CMSIS/Device/ST/STM32F1xx/Source/desktop.ini b/firmware/Drivers/CMSIS/Device/ST/STM32F1xx/Source/desktop.ini
similarity index 100%
rename from Drivers/CMSIS/Device/ST/STM32F1xx/Source/desktop.ini
rename to firmware/Drivers/CMSIS/Device/ST/STM32F1xx/Source/desktop.ini
diff --git a/Drivers/CMSIS/Device/ST/STM32F1xx/desktop.ini b/firmware/Drivers/CMSIS/Device/ST/STM32F1xx/desktop.ini
similarity index 100%
rename from Drivers/CMSIS/Device/ST/STM32F1xx/desktop.ini
rename to firmware/Drivers/CMSIS/Device/ST/STM32F1xx/desktop.ini
diff --git a/Drivers/CMSIS/Device/ST/desktop.ini b/firmware/Drivers/CMSIS/Device/ST/desktop.ini
similarity index 100%
rename from Drivers/CMSIS/Device/ST/desktop.ini
rename to firmware/Drivers/CMSIS/Device/ST/desktop.ini
diff --git a/Drivers/CMSIS/Device/desktop.ini b/firmware/Drivers/CMSIS/Device/desktop.ini
similarity index 100%
rename from Drivers/CMSIS/Device/desktop.ini
rename to firmware/Drivers/CMSIS/Device/desktop.ini
diff --git a/Drivers/CMSIS/Include/cmsis_armcc.h b/firmware/Drivers/CMSIS/Include/cmsis_armcc.h
similarity index 100%
rename from Drivers/CMSIS/Include/cmsis_armcc.h
rename to firmware/Drivers/CMSIS/Include/cmsis_armcc.h
diff --git a/Drivers/CMSIS/Include/cmsis_armclang.h b/firmware/Drivers/CMSIS/Include/cmsis_armclang.h
similarity index 100%
rename from Drivers/CMSIS/Include/cmsis_armclang.h
rename to firmware/Drivers/CMSIS/Include/cmsis_armclang.h
diff --git a/Drivers/CMSIS/Include/cmsis_compiler.h b/firmware/Drivers/CMSIS/Include/cmsis_compiler.h
similarity index 100%
rename from Drivers/CMSIS/Include/cmsis_compiler.h
rename to firmware/Drivers/CMSIS/Include/cmsis_compiler.h
diff --git a/Drivers/CMSIS/Include/cmsis_gcc.h b/firmware/Drivers/CMSIS/Include/cmsis_gcc.h
similarity index 100%
rename from Drivers/CMSIS/Include/cmsis_gcc.h
rename to firmware/Drivers/CMSIS/Include/cmsis_gcc.h
diff --git a/Drivers/CMSIS/Include/cmsis_iccarm.h b/firmware/Drivers/CMSIS/Include/cmsis_iccarm.h
similarity index 100%
rename from Drivers/CMSIS/Include/cmsis_iccarm.h
rename to firmware/Drivers/CMSIS/Include/cmsis_iccarm.h
diff --git a/Drivers/CMSIS/Include/cmsis_version.h b/firmware/Drivers/CMSIS/Include/cmsis_version.h
similarity index 100%
rename from Drivers/CMSIS/Include/cmsis_version.h
rename to firmware/Drivers/CMSIS/Include/cmsis_version.h
diff --git a/Drivers/CMSIS/Include/core_armv8mbl.h b/firmware/Drivers/CMSIS/Include/core_armv8mbl.h
similarity index 100%
rename from Drivers/CMSIS/Include/core_armv8mbl.h
rename to firmware/Drivers/CMSIS/Include/core_armv8mbl.h
diff --git a/Drivers/CMSIS/Include/core_armv8mml.h b/firmware/Drivers/CMSIS/Include/core_armv8mml.h
similarity index 100%
rename from Drivers/CMSIS/Include/core_armv8mml.h
rename to firmware/Drivers/CMSIS/Include/core_armv8mml.h
diff --git a/Drivers/CMSIS/Include/core_cm0.h b/firmware/Drivers/CMSIS/Include/core_cm0.h
similarity index 100%
rename from Drivers/CMSIS/Include/core_cm0.h
rename to firmware/Drivers/CMSIS/Include/core_cm0.h
diff --git a/Drivers/CMSIS/Include/core_cm0plus.h b/firmware/Drivers/CMSIS/Include/core_cm0plus.h
similarity index 100%
rename from Drivers/CMSIS/Include/core_cm0plus.h
rename to firmware/Drivers/CMSIS/Include/core_cm0plus.h
diff --git a/Drivers/CMSIS/Include/core_cm1.h b/firmware/Drivers/CMSIS/Include/core_cm1.h
similarity index 100%
rename from Drivers/CMSIS/Include/core_cm1.h
rename to firmware/Drivers/CMSIS/Include/core_cm1.h
diff --git a/Drivers/CMSIS/Include/core_cm23.h b/firmware/Drivers/CMSIS/Include/core_cm23.h
similarity index 100%
rename from Drivers/CMSIS/Include/core_cm23.h
rename to firmware/Drivers/CMSIS/Include/core_cm23.h
diff --git a/Drivers/CMSIS/Include/core_cm3.h b/firmware/Drivers/CMSIS/Include/core_cm3.h
similarity index 100%
rename from Drivers/CMSIS/Include/core_cm3.h
rename to firmware/Drivers/CMSIS/Include/core_cm3.h
diff --git a/Drivers/CMSIS/Include/core_cm33.h b/firmware/Drivers/CMSIS/Include/core_cm33.h
similarity index 100%
rename from Drivers/CMSIS/Include/core_cm33.h
rename to firmware/Drivers/CMSIS/Include/core_cm33.h
diff --git a/Drivers/CMSIS/Include/core_cm4.h b/firmware/Drivers/CMSIS/Include/core_cm4.h
similarity index 100%
rename from Drivers/CMSIS/Include/core_cm4.h
rename to firmware/Drivers/CMSIS/Include/core_cm4.h
diff --git a/Drivers/CMSIS/Include/core_cm7.h b/firmware/Drivers/CMSIS/Include/core_cm7.h
similarity index 100%
rename from Drivers/CMSIS/Include/core_cm7.h
rename to firmware/Drivers/CMSIS/Include/core_cm7.h
diff --git a/Drivers/CMSIS/Include/core_sc000.h b/firmware/Drivers/CMSIS/Include/core_sc000.h
similarity index 100%
rename from Drivers/CMSIS/Include/core_sc000.h
rename to firmware/Drivers/CMSIS/Include/core_sc000.h
diff --git a/Drivers/CMSIS/Include/core_sc300.h b/firmware/Drivers/CMSIS/Include/core_sc300.h
similarity index 100%
rename from Drivers/CMSIS/Include/core_sc300.h
rename to firmware/Drivers/CMSIS/Include/core_sc300.h
diff --git a/Drivers/CMSIS/Include/desktop.ini b/firmware/Drivers/CMSIS/Include/desktop.ini
similarity index 100%
rename from Drivers/CMSIS/Include/desktop.ini
rename to firmware/Drivers/CMSIS/Include/desktop.ini
diff --git a/Drivers/CMSIS/Include/mpu_armv7.h b/firmware/Drivers/CMSIS/Include/mpu_armv7.h
similarity index 100%
rename from Drivers/CMSIS/Include/mpu_armv7.h
rename to firmware/Drivers/CMSIS/Include/mpu_armv7.h
diff --git a/Drivers/CMSIS/Include/mpu_armv8.h b/firmware/Drivers/CMSIS/Include/mpu_armv8.h
similarity index 100%
rename from Drivers/CMSIS/Include/mpu_armv8.h
rename to firmware/Drivers/CMSIS/Include/mpu_armv8.h
diff --git a/Drivers/CMSIS/Include/tz_context.h b/firmware/Drivers/CMSIS/Include/tz_context.h
similarity index 100%
rename from Drivers/CMSIS/Include/tz_context.h
rename to firmware/Drivers/CMSIS/Include/tz_context.h
diff --git a/Drivers/CMSIS/desktop.ini b/firmware/Drivers/CMSIS/desktop.ini
similarity index 100%
rename from Drivers/CMSIS/desktop.ini
rename to firmware/Drivers/CMSIS/desktop.ini
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/desktop.ini b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/desktop.ini
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/desktop.ini
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/desktop.ini
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/desktop.ini b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/desktop.ini
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/desktop.ini
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/desktop.ini
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_adc_ex.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_can.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_can.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_can.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_can.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac_ex.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac_ex.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac_ex.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dac_ex.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pcd_ex.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc_ex.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc_ex.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc_ex.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rtc_ex.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h b/firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usb.h
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/desktop.ini b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/desktop.ini
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/desktop.ini
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/desktop.ini
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac_ex.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac_ex.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac_ex.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac_ex.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c b/firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c
rename to firmware/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usb.c
diff --git a/Drivers/STM32F1xx_HAL_Driver/desktop.ini b/firmware/Drivers/STM32F1xx_HAL_Driver/desktop.ini
similarity index 100%
rename from Drivers/STM32F1xx_HAL_Driver/desktop.ini
rename to firmware/Drivers/STM32F1xx_HAL_Driver/desktop.ini
diff --git a/Drivers/desktop.ini b/firmware/Drivers/desktop.ini
similarity index 100%
rename from Drivers/desktop.ini
rename to firmware/Drivers/desktop.ini
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc/desktop.ini b/firmware/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc/desktop.ini
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc/desktop.ini
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc/desktop.ini
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc/usbd_cdc.h b/firmware/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc/usbd_cdc.h
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc/usbd_cdc.h
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc/usbd_cdc.h
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/desktop.ini b/firmware/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/desktop.ini
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/desktop.ini
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/desktop.ini
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c b/firmware/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/desktop.ini b/firmware/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/desktop.ini
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Class/CDC/desktop.ini
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Class/CDC/desktop.ini
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Class/desktop.ini b/firmware/Middlewares/ST/STM32_USB_Device_Library/Class/desktop.ini
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Class/desktop.ini
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Class/desktop.ini
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/desktop.ini b/firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/desktop.ini
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Core/Inc/desktop.ini
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/desktop.ini
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h b/firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h b/firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h b/firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h b/firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Core/Src/desktop.ini b/firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Src/desktop.ini
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Core/Src/desktop.ini
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Src/desktop.ini
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c b/firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c b/firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c b/firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Core/desktop.ini b/firmware/Middlewares/ST/STM32_USB_Device_Library/Core/desktop.ini
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/Core/desktop.ini
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/Core/desktop.ini
diff --git a/Middlewares/ST/STM32_USB_Device_Library/desktop.ini b/firmware/Middlewares/ST/STM32_USB_Device_Library/desktop.ini
similarity index 100%
rename from Middlewares/ST/STM32_USB_Device_Library/desktop.ini
rename to firmware/Middlewares/ST/STM32_USB_Device_Library/desktop.ini
diff --git a/Middlewares/ST/desktop.ini b/firmware/Middlewares/ST/desktop.ini
similarity index 100%
rename from Middlewares/ST/desktop.ini
rename to firmware/Middlewares/ST/desktop.ini
diff --git a/Middlewares/Third_Party/FatFs/desktop.ini b/firmware/Middlewares/Third_Party/FatFs/desktop.ini
similarity index 100%
rename from Middlewares/Third_Party/FatFs/desktop.ini
rename to firmware/Middlewares/Third_Party/FatFs/desktop.ini
diff --git a/Middlewares/Third_Party/FatFs/src/desktop.ini b/firmware/Middlewares/Third_Party/FatFs/src/desktop.ini
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/desktop.ini
rename to firmware/Middlewares/Third_Party/FatFs/src/desktop.ini
diff --git a/Middlewares/Third_Party/FatFs/src/diskio.c b/firmware/Middlewares/Third_Party/FatFs/src/diskio.c
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/diskio.c
rename to firmware/Middlewares/Third_Party/FatFs/src/diskio.c
diff --git a/Middlewares/Third_Party/FatFs/src/diskio.h b/firmware/Middlewares/Third_Party/FatFs/src/diskio.h
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/diskio.h
rename to firmware/Middlewares/Third_Party/FatFs/src/diskio.h
diff --git a/Middlewares/Third_Party/FatFs/src/ff.c b/firmware/Middlewares/Third_Party/FatFs/src/ff.c
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/ff.c
rename to firmware/Middlewares/Third_Party/FatFs/src/ff.c
diff --git a/Middlewares/Third_Party/FatFs/src/ff.h b/firmware/Middlewares/Third_Party/FatFs/src/ff.h
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/ff.h
rename to firmware/Middlewares/Third_Party/FatFs/src/ff.h
diff --git a/Middlewares/Third_Party/FatFs/src/ff_gen_drv.c b/firmware/Middlewares/Third_Party/FatFs/src/ff_gen_drv.c
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/ff_gen_drv.c
rename to firmware/Middlewares/Third_Party/FatFs/src/ff_gen_drv.c
diff --git a/Middlewares/Third_Party/FatFs/src/ff_gen_drv.h b/firmware/Middlewares/Third_Party/FatFs/src/ff_gen_drv.h
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/ff_gen_drv.h
rename to firmware/Middlewares/Third_Party/FatFs/src/ff_gen_drv.h
diff --git a/Middlewares/Third_Party/FatFs/src/integer.h b/firmware/Middlewares/Third_Party/FatFs/src/integer.h
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/integer.h
rename to firmware/Middlewares/Third_Party/FatFs/src/integer.h
diff --git a/Middlewares/Third_Party/FatFs/src/option/desktop.ini b/firmware/Middlewares/Third_Party/FatFs/src/option/desktop.ini
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/option/desktop.ini
rename to firmware/Middlewares/Third_Party/FatFs/src/option/desktop.ini
diff --git a/Middlewares/Third_Party/FatFs/src/option/syscall.c b/firmware/Middlewares/Third_Party/FatFs/src/option/syscall.c
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/option/syscall.c
rename to firmware/Middlewares/Third_Party/FatFs/src/option/syscall.c
diff --git a/Middlewares/Third_Party/FatFs/src/user_diskio.c b/firmware/Middlewares/Third_Party/FatFs/src/user_diskio.c
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/user_diskio.c
rename to firmware/Middlewares/Third_Party/FatFs/src/user_diskio.c
diff --git a/Middlewares/Third_Party/FatFs/src/user_diskio.h b/firmware/Middlewares/Third_Party/FatFs/src/user_diskio.h
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/user_diskio.h
rename to firmware/Middlewares/Third_Party/FatFs/src/user_diskio.h
diff --git a/Middlewares/Third_Party/FatFs/src/user_diskio_spi.c b/firmware/Middlewares/Third_Party/FatFs/src/user_diskio_spi.c
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/user_diskio_spi.c
rename to firmware/Middlewares/Third_Party/FatFs/src/user_diskio_spi.c
diff --git a/Middlewares/Third_Party/FatFs/src/user_diskio_spi.h b/firmware/Middlewares/Third_Party/FatFs/src/user_diskio_spi.h
similarity index 100%
rename from Middlewares/Third_Party/FatFs/src/user_diskio_spi.h
rename to firmware/Middlewares/Third_Party/FatFs/src/user_diskio_spi.h
diff --git a/Middlewares/Third_Party/desktop.ini b/firmware/Middlewares/Third_Party/desktop.ini
similarity index 100%
rename from Middlewares/Third_Party/desktop.ini
rename to firmware/Middlewares/Third_Party/desktop.ini
diff --git a/Middlewares/desktop.ini b/firmware/Middlewares/desktop.ini
similarity index 100%
rename from Middlewares/desktop.ini
rename to firmware/Middlewares/desktop.ini
diff --git a/STM32F107VCTx_FLASH.ld b/firmware/STM32F107VCTx_FLASH.ld
similarity index 100%
rename from STM32F107VCTx_FLASH.ld
rename to firmware/STM32F107VCTx_FLASH.ld
diff --git a/USB_DEVICE/App/desktop.ini b/firmware/USB_DEVICE/App/desktop.ini
similarity index 100%
rename from USB_DEVICE/App/desktop.ini
rename to firmware/USB_DEVICE/App/desktop.ini
diff --git a/USB_DEVICE/App/usb_device.c b/firmware/USB_DEVICE/App/usb_device.c
similarity index 100%
rename from USB_DEVICE/App/usb_device.c
rename to firmware/USB_DEVICE/App/usb_device.c
diff --git a/USB_DEVICE/App/usb_device.h b/firmware/USB_DEVICE/App/usb_device.h
similarity index 100%
rename from USB_DEVICE/App/usb_device.h
rename to firmware/USB_DEVICE/App/usb_device.h
diff --git a/USB_DEVICE/App/usbd_cdc_if.c b/firmware/USB_DEVICE/App/usbd_cdc_if.c
similarity index 100%
rename from USB_DEVICE/App/usbd_cdc_if.c
rename to firmware/USB_DEVICE/App/usbd_cdc_if.c
diff --git a/USB_DEVICE/App/usbd_cdc_if.h b/firmware/USB_DEVICE/App/usbd_cdc_if.h
similarity index 100%
rename from USB_DEVICE/App/usbd_cdc_if.h
rename to firmware/USB_DEVICE/App/usbd_cdc_if.h
diff --git a/USB_DEVICE/App/usbd_desc.c b/firmware/USB_DEVICE/App/usbd_desc.c
similarity index 100%
rename from USB_DEVICE/App/usbd_desc.c
rename to firmware/USB_DEVICE/App/usbd_desc.c
diff --git a/USB_DEVICE/App/usbd_desc.h b/firmware/USB_DEVICE/App/usbd_desc.h
similarity index 100%
rename from USB_DEVICE/App/usbd_desc.h
rename to firmware/USB_DEVICE/App/usbd_desc.h
diff --git a/USB_DEVICE/Target/desktop.ini b/firmware/USB_DEVICE/Target/desktop.ini
similarity index 100%
rename from USB_DEVICE/Target/desktop.ini
rename to firmware/USB_DEVICE/Target/desktop.ini
diff --git a/USB_DEVICE/Target/usbd_conf.c b/firmware/USB_DEVICE/Target/usbd_conf.c
similarity index 100%
rename from USB_DEVICE/Target/usbd_conf.c
rename to firmware/USB_DEVICE/Target/usbd_conf.c
diff --git a/USB_DEVICE/Target/usbd_conf.h b/firmware/USB_DEVICE/Target/usbd_conf.h
similarity index 100%
rename from USB_DEVICE/Target/usbd_conf.h
rename to firmware/USB_DEVICE/Target/usbd_conf.h
diff --git a/USB_DEVICE/desktop.ini b/firmware/USB_DEVICE/desktop.ini
similarity index 100%
rename from USB_DEVICE/desktop.ini
rename to firmware/USB_DEVICE/desktop.ini
diff --git a/USB_Device_Library/desktop.ini b/firmware/USB_Device_Library/desktop.ini
similarity index 100%
rename from USB_Device_Library/desktop.ini
rename to firmware/USB_Device_Library/desktop.ini
diff --git a/bms_s_cube Run.cfg b/firmware/bms_s_cube Run.cfg
similarity index 100%
rename from bms_s_cube Run.cfg
rename to firmware/bms_s_cube Run.cfg
diff --git a/bms_s_cube.xml b/firmware/bms_s_cube.xml
similarity index 100%
rename from bms_s_cube.xml
rename to firmware/bms_s_cube.xml
diff --git a/desktop.ini b/firmware/desktop.ini
similarity index 100%
rename from desktop.ini
rename to firmware/desktop.ini
diff --git a/startup/desktop.ini b/firmware/startup/desktop.ini
similarity index 100%
rename from startup/desktop.ini
rename to firmware/startup/desktop.ini
diff --git a/startup/startup_stm32f107xc.s b/firmware/startup/startup_stm32f107xc.s
similarity index 100%
rename from startup/startup_stm32f107xc.s
rename to firmware/startup/startup_stm32f107xc.s