diff --git a/.cproject b/.cproject
index eda91e4..3a3ba57 100644
--- a/.cproject
+++ b/.cproject
@@ -48,8 +48,8 @@
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32F4xx/Include"/>
 									<listOptionValue builtIn="false" value="../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../Middlewares/Third_Party/FatFs/src"/>
-									<listOptionValue builtIn="false" value="../app"/>
-									<listOptionValue builtIn="false" value="../lib"/>
+									<listOptionValue builtIn="false" value="../App"/>
+									<listOptionValue builtIn="false" value="../Lib"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includefiles.1400203807" name="Include files (-include)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includefiles" useByScannerDiscovery="false" valueType="includeFiles"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.95218066" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
@@ -64,8 +64,8 @@
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32F4xx/Include"/>
 									<listOptionValue builtIn="false" value="../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../Middlewares/Third_Party/FatFs/src"/>
-									<listOptionValue builtIn="false" value="../app"/>
-									<listOptionValue builtIn="false" value="../lib"/>
+									<listOptionValue builtIn="false" value="../App"/>
+									<listOptionValue builtIn="false" value="../Lib"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols.1626664664" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@@ -105,49 +105,15 @@
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1329542300" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1652594594.1247500854" name="/" resourcePath="lib">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1812794617" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug" unusedChildren="">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1720703955.1442910858" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.1720703955"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1653632439.233447390" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1653632439"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.164195990.1327170825" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.164195990"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.462500701.1570450885" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.462500701"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1858367229.776118283" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1858367229"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.1132685722.1820700268" name="Floating-point unit" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.1132685722"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.639645368.384578516" name="Floating-point ABI" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.639645368"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1695232558.1988807242" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1695232558"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.157688335.27949746" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.157688335"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.484913048" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.954167919">
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1628565487" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.2107310410" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.954718294">
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1463287937" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1901392458" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.804537744">
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.1340373791" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.493910625" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1191853047"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.750349295" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1392953512"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.797488102" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1516391739"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.313643706" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1647384466"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1458644855" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.119190458"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1642393104" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1617192131"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1768695283" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.967047829"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1715930893" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1020173589"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.2078403802" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.934357504"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.201215599" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1329542300"/>
-						</toolChain>
-					</folderInfo>
-					<fileInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1652594594.961313506" name="stm32f4xx_it.c" rcbsApplicability="disable" resourcePath="Src/stm32f4xx_it.c" toolsToInvoke="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.954718294.1178785425">
-						<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.954718294.1178785425" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.954718294"/>
-					</fileInfo>
 					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="App"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Lib"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
 						<entry excluding="stm32f4xx_it.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Src"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Startup"/>
-						<entry excluding="application.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="app"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="lib"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="components/f4ll/src"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="components/f4ll_c/src"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -200,8 +166,8 @@
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32F4xx/Include"/>
 									<listOptionValue builtIn="false" value="../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../Middlewares/Third_Party/FatFs/src"/>
-									<listOptionValue builtIn="false" value="../app"/>
-									<listOptionValue builtIn="false" value="../lib"/>
+									<listOptionValue builtIn="false" value="../App"/>
+									<listOptionValue builtIn="false" value="../Lib"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includefiles.775946804" name="Include files (-include)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includefiles" useByScannerDiscovery="false" valueType="includeFiles"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1381323629" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
@@ -216,8 +182,8 @@
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32F4xx/Include"/>
 									<listOptionValue builtIn="false" value="../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../Middlewares/Third_Party/FatFs/src"/>
-									<listOptionValue builtIn="false" value="../app"/>
-									<listOptionValue builtIn="false" value="../lib"/>
+									<listOptionValue builtIn="false" value="../App"/>
+									<listOptionValue builtIn="false" value="../Lib"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols.575681641" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@@ -253,49 +219,15 @@
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1720505789" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
 						</toolChain>
 					</folderInfo>
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.699478562.1737969490" name="/" resourcePath="lib">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.484762388" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release" unusedChildren="">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.634907744.822930776" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.634907744"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.394857276.1986815254" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.394857276"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1898315828.1176402623" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1898315828"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.448979747.1398198771" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.448979747"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.359195529.1901500157" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.359195529"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.2001595934.1304844108" name="Floating-point unit" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.2001595934"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.1755954044.1881977068" name="Floating-point ABI" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.1755954044"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.934614524.105997912" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.934614524"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1749251537.1921640988" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1749251537"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1370790830" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1295431234">
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.526844294" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.218513171" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1361867544">
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1688493550" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1816730600" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1987753758">
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.126920113" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.2102505454" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.675439128"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.111593935" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.561909065"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.274883471" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1113742726"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.853798860" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.972523146"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.434820437" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.650352437"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.965193966" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1597297180"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1036136073" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1108248273"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1956032197" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1341369312"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.606617484" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.2085481086"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1462449351" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1720505789"/>
-						</toolChain>
-					</folderInfo>
-					<fileInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.699478562.767195492" name="stm32f4xx_it.c" rcbsApplicability="disable" resourcePath="Src/stm32f4xx_it.c" toolsToInvoke="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1361867544.1134416128">
-						<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1361867544.1134416128" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1361867544"/>
-					</fileInfo>
 					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="App"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Lib"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
 						<entry excluding="stm32f4xx_it.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Src"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Startup"/>
-						<entry excluding="application.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="app"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="lib"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="components/f4ll/src"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="components/f4ll_c/src"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -331,11 +263,12 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="0.1999792219.1199955544.808863076" name="stm32f4xx_it.c" rcbsApplicability="disable" resourcePath="Src/stm32f4xx_it.c" toolsToInvoke="org.eclipse.cdt.build.core.settings.holder.771704016.422534878">
-						<tool id="org.eclipse.cdt.build.core.settings.holder.771704016.422534878" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder.771704016"/>
-					</fileInfo>
 					<sourceEntries>
-						<entry excluding="Src/stm32f4xx_it.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="build/src|src|components|f4ll|App|Lib|Src/stm32f4xx_it.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="App"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Lib"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="components/f4ll/src"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="components/f4ll_c/src"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/app/ll_testbed.cpp b/App/application.cpp
similarity index 94%
rename from app/ll_testbed.cpp
rename to App/application.cpp
index 2676216..1509b8e 100644
--- a/app/ll_testbed.cpp
+++ b/App/application.cpp
@@ -6,14 +6,14 @@
  */
 #include <string.h>
 #include <stdlib.h>
-#include "ll_hsusart.h"
-#include "ll_crchandler.h"
-#include "ll_memcpydma.h"
-#include "ll_consolehandler.h"
+#include "f4ll/ll_hsusart.h"
+#include "f4ll/ll_crchandler.h"
+#include "f4ll/ll_memcpydma.h"
+#include "f4ll/ll_consolehandler.h"
 extern "C" {
 	#include "main.h"
 	#include "globals.h"
-	#include "strutil.h"
+	#include "f4ll_c/strutil.h"
 	#include "config.h"
 }
 #include "globals_cpp.h"
diff --git a/app/application.h b/App/application.h
similarity index 64%
rename from app/application.h
rename to App/application.h
index fd15a99..73ea661 100644
--- a/app/application.h
+++ b/App/application.h
@@ -11,6 +11,13 @@
 #include <inttypes.h>
 #include "main.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void MainLoop();
 
+#ifdef __cplusplus
+}	//	extern "C" {
+#endif	//	__cplusplus
 #endif /* APP_H_ */
diff --git a/app/config.h b/App/config.h
similarity index 100%
rename from app/config.h
rename to App/config.h
diff --git a/app/diag.c b/App/diag.c
similarity index 100%
rename from app/diag.c
rename to App/diag.c
diff --git a/app/diag.h b/App/diag.h
similarity index 100%
rename from app/diag.h
rename to App/diag.h
diff --git a/app/globals.c b/App/globals.c
similarity index 100%
rename from app/globals.c
rename to App/globals.c
diff --git a/app/globals.h b/App/globals.h
similarity index 77%
rename from app/globals.h
rename to App/globals.h
index 439f19c..b6b1f29 100644
--- a/app/globals.h
+++ b/App/globals.h
@@ -10,9 +10,9 @@
 
 #include <inttypes.h>
 #include "config.h"
-#include "usart_handler.h"
-#include "dma_helper.h"
-#include "crc_handler.h"
+#include "f4ll_c/usart_handler.h"
+#include "f4ll_c/dma_helper.h"
+#include "f4ll_c/crc_handler.h"
 
 extern USARTSTATUS g_uartStatuses[USARTCOUNT];
 
diff --git a/app/globals_cpp.cpp b/App/globals_cpp.cpp
similarity index 69%
rename from app/globals_cpp.cpp
rename to App/globals_cpp.cpp
index 81e55f9..34f6e20 100644
--- a/app/globals_cpp.cpp
+++ b/App/globals_cpp.cpp
@@ -6,8 +6,8 @@
  */
 #include "globals.h"
 
-#include "ll_hsusart.h"
-#include "ll_memcpydma.h"
+#include <f4ll/ll_hsusart.h>
+#include <f4ll/ll_memcpydma.h>
 
 f4ll::LL_HsUsart *g_usarts[4];
 
diff --git a/app/globals_cpp.h b/App/globals_cpp.h
similarity index 88%
rename from app/globals_cpp.h
rename to App/globals_cpp.h
index 517c2df..2cc6a50 100644
--- a/app/globals_cpp.h
+++ b/App/globals_cpp.h
@@ -9,7 +9,7 @@
 #define GLOBALS_CPP_H_
 
 #ifdef __cplusplus
-#include "ll_hsusart.h"
+#include "f4ll/ll_hsusart.h"
 
 extern f4ll::LL_HsUsart *g_usarts[4];
 
diff --git a/app/platform/crc_ll.h b/App/platform/crc_ll.h
similarity index 100%
rename from app/platform/crc_ll.h
rename to App/platform/crc_ll.h
diff --git a/app/platform/dma_ll.h b/App/platform/dma_ll.h
similarity index 100%
rename from app/platform/dma_ll.h
rename to App/platform/dma_ll.h
diff --git a/app/platform/usart_ll.h b/App/platform/usart_ll.h
similarity index 100%
rename from app/platform/usart_ll.h
rename to App/platform/usart_ll.h
diff --git a/Inc/f4ll b/Inc/f4ll
new file mode 120000
index 0000000..f6794f6
--- /dev/null
+++ b/Inc/f4ll
@@ -0,0 +1 @@
+../components/f4ll/inc/
\ No newline at end of file
diff --git a/Inc/f4ll_c b/Inc/f4ll_c
new file mode 120000
index 0000000..d3596d4
--- /dev/null
+++ b/Inc/f4ll_c
@@ -0,0 +1 @@
+../components/f4ll_c/inc
\ No newline at end of file
diff --git a/lib/fault.c b/Lib/fault.c
similarity index 99%
rename from lib/fault.c
rename to Lib/fault.c
index 25952ab..024cd81 100644
--- a/lib/fault.c
+++ b/Lib/fault.c
@@ -8,7 +8,7 @@
 #include <inttypes.h>
 //#include <core_cm4.h>
 #include "stm32f4xx.h"
-#include "strutil.h"
+#include "f4ll_c/strutil.h"
 #include "fault.h"
 
 typedef struct {
diff --git a/lib/fault.h b/Lib/fault.h
similarity index 100%
rename from lib/fault.h
rename to Lib/fault.h
diff --git a/lib/fault_asm.s b/Lib/fault_asm.s
similarity index 100%
rename from lib/fault_asm.s
rename to Lib/fault_asm.s
diff --git a/lib/singleton.h b/Lib/singleton.h
similarity index 100%
rename from lib/singleton.h
rename to Lib/singleton.h
diff --git a/Makefile b/Makefile
index 852b748..e9af8f2 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,8 @@ CXXSTD = -std=c++14
 #######################################
 # Build path
 BUILD_DIR = build
+COMPONENTS = components
+CONFIG_OVERRIDES = config-overrides
 
 ######################################
 # source
@@ -49,8 +51,8 @@ Src/usart.c \
 Src/usb_otg.c \
 Src/stm32f4xx_it.c \
 Src/stm32f4xx_hal_msp.c \
-$(wildcard app/*.c) \
-$(wildcard lib/*.c) \
+$(wildcard App/*.c) \
+$(wildcard Lib/*.c) \
 Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_gpio.c \
 Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_crc.c \
 Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_dma.c \
@@ -93,8 +95,15 @@ ASM_SOURCES =  \
 startup_stm32f407xx.s
 
 CXX_SOURCES = \
-$(wildcard app/*.cpp) \
-$(wildcard lib/*.cpp)
+$(wildcard App/*.cpp) \
+$(wildcard Lib/*.cpp)
+
+
+#######################################
+# components
+#######################################
+include $(sort $(wildcard $(COMPONENTS)/*/component.mk))
+
 
 #######################################
 # binaries
@@ -104,14 +113,16 @@ PREFIX = arm-none-eabi-
 # either it can be added to the PATH environment variable.
 ifdef GCC_PATH
 CC = $(GCC_PATH)/$(PREFIX)gcc
-CXXC = $(GCC_PATH)/$(PREFIX)gcc -x c++
+CXXC = $(GCC_PATH)/$(PREFIX)g++
+LD =  $(GCC_PATH)/$(PREFIX)g++
 AS = $(GCC_PATH)/$(PREFIX)gcc -x assembler-with-cpp
 CP = $(GCC_PATH)/$(PREFIX)objcopy
 SZ = $(GCC_PATH)/$(PREFIX)size
 else
 CC = $(PREFIX)gcc
-CXXC = $(PREFIX)gcc -x c++
+CXXC = $(PREFIX)g++
 AS = $(PREFIX)gcc -x assembler-with-cpp
+LD =  $(PREFIX)g++
 CP = $(PREFIX)objcopy
 SZ = $(PREFIX)size
 endif
@@ -161,8 +172,8 @@ COMMON_INCLUDES =  \
 -IMiddlewares/Third_Party/FatFs/src \
 -IDrivers/CMSIS/Device/ST/STM32F4xx/Include \
 -IDrivers/CMSIS/Include \
--Ilib \
--Iapp
+-IApp \
+-ILib
 
 C_INCLUDES = \
 
@@ -194,7 +205,22 @@ LDSCRIPT = STM32F407VETx_FLASH.ld
 # libraries
 LIBS = -lc -lm -lnosys 
 LIBDIR = 
-LDFLAGS = $(MCU) -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections
+#LDFLAGS = $(MCU) --specs=nosys.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections -static --specs=nano.specs
+LDFLAGS = $(MCU) -TSTM32F407VETX_FLASH.ld --specs=nosys.specs -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections -static --specs=nano.specs \
+	-Wl,--start-group -lc -lm -lstdc++ -lsupc++ -Wl,--end-group
+
+ifeq ($(MKDBG), 1)
+	$(info >>--------------------------------------------)
+	$(info $$C_SOURCES is [${C_SOURCES}])
+	$(info .)
+	$(info $$CXX_SOURCES is [${CXX_SOURCES}])
+	$(info .)
+	$(info $$C_DEFS is [${C_DEFS}])
+	$(info .)
+	$(info $$C_INCLUDES is [${C_INCLUDES}])
+	$(info $$CFLAGS is [${CFLAGS}])
+	$(info <<--------------------------------------------)
+endif
 
 # default action: build all
 all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin
@@ -208,10 +234,10 @@ OBJECTS = $(addprefix $(BUILD_DIR)/,$(C_SOURCES:.c=.o))
 vpath %.c $(sort $(dir $(C_SOURCES)))
 
 # list of ASM program objects
-OBJECTS +=$(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
+OBJECTS +=$(addprefix $(BUILD_DIR)/,$(ASM_SOURCES:.s=.o))
 vpath %.s $(sort $(dir $(ASM_SOURCES)))
 
-OBJECTS +=$(addprefix $(BUILD_DIR)/,$(notdir $(CXX_SOURCES:.cpp=.o)))
+OBJECTS +=$(addprefix $(BUILD_DIR)/,$(CXX_SOURCES:.cpp=.o))
 vpath %.cpp $(sort $(dir $(CXX_SOURCES)))
 
 $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
@@ -227,7 +253,7 @@ $(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
 	$(AS) -c $(CFLAGS) $< -o $@
 
 $(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) Makefile
-	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
+	$(LD) $(OBJECTS) $(LDFLAGS) -o $@
 	$(SZ) $@
 
 $(BUILD_DIR)/%.hex: $(BUILD_DIR)/%.elf | $(BUILD_DIR)
diff --git a/Src/stm32f4xx_it.c b/Src/stm32f4xx_it.c
index 5e4b280..49a52d8 100644
--- a/Src/stm32f4xx_it.c
+++ b/Src/stm32f4xx_it.c
@@ -26,17 +26,17 @@ extern "C" {
 #include "stm32f4xx_it.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
-#include "usart_handler.h"
-#include "crc_handler.h"
-#include "console_handler.h"
-#include "memcpy_dma.h"
+#include "f4ll_c/usart_handler.h"
+#include "f4ll_c/crc_handler.h"
+#include "f4ll_c/console_handler.h"
+#include "f4ll_c/memcpy_dma.h"
 #include "globals.h"
 #include "diag.h"
 }
 
 #include "globals_cpp.h"
-#include "ll_memcpydma.h"
-#include "ll_consolehandler.h"
+#include "f4ll/ll_memcpydma.h"
+#include "f4ll/ll_consolehandler.h"
 
 extern "C" {
 
diff --git a/app/application.c b/app/application.c
deleted file mode 100644
index d3fa69e..0000000
--- a/app/application.c
+++ /dev/null
@@ -1,104 +0,0 @@
-#include <string.h>
-#include <stdlib.h>
-#include "application.h"
-#include "globals.h"
-#include "strutil.h"
-#include "diag.h"
-#include "usart_handler.h"
-#include "crc_handler.h"
-#include "console_handler.h"
-#include "memcpy_dma.h"
-
-#define PACKAGE_DELAY_MS 0
-#define STATS_DELAY_MS 1000
-
-//	USART	DMA	RX	TX
-//	1		2	2	7
-//	2		1	5	6
-//	3		1	1	3
-//	6		2	1	6
-// console USART
-//	4		1	2	4
-
-void MainLoop()
-{
-	uint8_t const text2Send[]  __attribute__((aligned(4))) =
-			"Megszentsegtelenithetetlensegeskedeseitekert\r\n"
-			"--------------------------------------------\r\n\0\0\0";
-
-	struct initdata_t {
-		USART_TypeDef* uart;
-		DMA_TypeDef* dma;
-		uint32_t stream_rx;
-		uint32_t stream_tx;
-	} static const initdata[] = {
-		{ USART1, DMA2, LL_DMA_STREAM_2, LL_DMA_STREAM_7 },
-		{ USART2, DMA1, LL_DMA_STREAM_5, LL_DMA_STREAM_6 },
-		{ USART3, DMA1, LL_DMA_STREAM_1, LL_DMA_STREAM_3 },
-		{ USART6, DMA2, LL_DMA_STREAM_1, LL_DMA_STREAM_6 },
-	};
-
-	uint32_t lastStatsTick = 0;
-	uint32_t prevSentTick = 0;
-	uint8_t	statId = 0;
-
-	uint32_t	tmp = sizeof(text2Send) - 1;
-	uint32_t	randmask = 0x80000000;
-	do
-		if(randmask & tmp)
-			break;
-	while((randmask = randmask >> 1));
-	randmask -= 1;
-
-	for(uint16_t idx = 0; idx < sizeof(g_uartStatuses) / sizeof(g_uartStatuses[0]); ++idx) {
-		struct initdata_t const *id = &initdata[idx];
-		InitUartStatus(&g_uartStatuses[idx], id->uart, id->dma, id->stream_rx, id->stream_tx,
-				&g_crcStatus, idx + USARTCOUNT, idx, NULL, NULL);
-		memcpy(GetTxBuffer(&g_uartStatuses[idx]), text2Send, sizeof(text2Send) -1);
-	}
-
-	InitCrcStatus(&g_crcStatus, DMA2, LL_DMA_STREAM_4);
-
-	InitDmaInfo(&g_ConsoleTxDmaInfo, CONSOLE_DMA_ENGINE, CONSOLE_TX_DMA_STREAM);
-	LL_DMA_EnableIT_TC(g_ConsoleTxDmaInfo.dma, g_ConsoleTxDmaInfo.stream);
-
-	InitMemcpyDma(MEMCPY_DMA_ENGINE, MEMCPY_DMA_STREAM);
-
-	lastStatsTick = HAL_GetTick();
-
-	for(uint16_t idx = 0; idx < sizeof(g_uartStatuses) / sizeof(g_uartStatuses[0]); ++idx)
-		SetupReceive(&g_uartStatuses[idx]);
-
-	for(;;) {
-		uint32_t tick = HAL_GetTick();
-		uint8_t	send = PACKAGE_DELAY_MS ? (tick - prevSentTick > PACKAGE_DELAY_MS) : 1;
-		if(send)
-			prevSentTick += PACKAGE_DELAY_MS;
-
-		for(uint16_t idx = 0; idx < sizeof(g_uartStatuses) / sizeof(g_uartStatuses[0]); ++idx) {
-			if(!g_uartStatuses[idx].txBuffer.busy && send) {
-				DIAG_ENTER_BUSY();
-				PostPacket(&g_uartStatuses[idx], text2Send, sizeof(text2Send) - 1 - (rand() & randmask), &g_crcStatus);
-				DIAG_EXIT_BUSY();
-			}
-			for(uint16_t rIdx = 0; rIdx < 2; ++rIdx)
-				if(g_uartStatuses[idx].rxBuffers[rIdx].busy || g_uartStatuses[idx].rxBuffers[rIdx].error) {
-					DIAG_ENTER_BUSY();
-					ConsumePacket(&g_uartStatuses[idx], rIdx, &g_crcStatus);
-					DIAG_EXIT_BUSY();
-				}
-		}
-		if(tick - lastStatsTick > STATS_DELAY_MS) {
-			PrintStats((char*)g_statsBuf, statId, &g_uartStatuses[statId].stats, UART4, &g_ConsoleTxDmaInfo);
-			lastStatsTick += STATS_DELAY_MS;
-			++statId;
-			if(statId >= USARTCOUNT)
-				statId = 0;
-		}
-		uint32_t ein = LL_GPIO_ReadInputPort(KEY1_GPIO_Port);
-		if(!(ein & KEY1_Pin)) {
-			void (*fptr)(void) = (void (*)(void))(void*)0xa0000000;
-			fptr();
-		}
-	}
-}
diff --git a/components/f4ll/component.mk b/components/f4ll/component.mk
new file mode 100644
index 0000000..28874d8
--- /dev/null
+++ b/components/f4ll/component.mk
@@ -0,0 +1,11 @@
+#encoder
+SELF_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+REL_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
+ifeq ($(MKDBG), 1)
+  $(info >>> $(REL_DIR)/component.mk)
+endif
+$(eval C_INCLUDES += -I$(REL_DIR)/inc)
+$(eval CXX_SOURCES += $(wildcard $(REL_DIR)/src/*.cpp))
+ifeq ($(MKDBG), 1)
+  $(info <<<)
+endif
diff --git a/components/f4ll/inc/f4ll b/components/f4ll/inc/f4ll
new file mode 120000
index 0000000..945c9b4
--- /dev/null
+++ b/components/f4ll/inc/f4ll
@@ -0,0 +1 @@
+.
\ No newline at end of file
diff --git a/lib/ll_consolehandler.h b/components/f4ll/inc/ll_consolehandler.h
similarity index 97%
rename from lib/ll_consolehandler.h
rename to components/f4ll/inc/ll_consolehandler.h
index 6ff3aa3..182f115 100644
--- a/lib/ll_consolehandler.h
+++ b/components/f4ll/inc/ll_consolehandler.h
@@ -8,7 +8,7 @@
 #ifndef LL_CONSOLEHANDLER_H_
 #define LL_CONSOLEHANDLER_H_
 
-#include "ll_hsusart.h"
+#include "f4ll/ll_hsusart.h"
 #include "singleton.h"
 
 
diff --git a/lib/ll_crchandler.h b/components/f4ll/inc/ll_crchandler.h
similarity index 98%
rename from lib/ll_crchandler.h
rename to components/f4ll/inc/ll_crchandler.h
index 51b9669..d8fd54f 100644
--- a/lib/ll_crchandler.h
+++ b/components/f4ll/inc/ll_crchandler.h
@@ -9,7 +9,7 @@
 #define LL_CRCHANDLER_H_
 #include <inttypes.h>
 #include <platform/dma_ll.h>
-#include "ll_dmahelper.h"
+#include "f4ll/ll_dmahelper.h"
 #include "singleton.h"
 
 extern "C" void _HandleCrcDmaIrq(void);
diff --git a/lib/ll_dmahelper.h b/components/f4ll/inc/ll_dmahelper.h
similarity index 100%
rename from lib/ll_dmahelper.h
rename to components/f4ll/inc/ll_dmahelper.h
diff --git a/lib/ll_hsusart.h b/components/f4ll/inc/ll_hsusart.h
similarity index 97%
rename from lib/ll_hsusart.h
rename to components/f4ll/inc/ll_hsusart.h
index 20f32e4..4af8b75 100644
--- a/lib/ll_hsusart.h
+++ b/components/f4ll/inc/ll_hsusart.h
@@ -8,8 +8,8 @@
 #ifndef LL_HSUSART_H_
 #define LL_HSUSART_H_
 #include <platform/usart_ll.h>
-#include <ll_usartcore.h>
-#include <ll_crchandler.h>
+#include "f4ll/ll_usartcore.h"
+#include "f4ll/ll_crchandler.h"
 
 namespace f4ll {
 
diff --git a/lib/ll_memcpydma.h b/components/f4ll/inc/ll_memcpydma.h
similarity index 94%
rename from lib/ll_memcpydma.h
rename to components/f4ll/inc/ll_memcpydma.h
index c00ee1d..05c725c 100644
--- a/lib/ll_memcpydma.h
+++ b/components/f4ll/inc/ll_memcpydma.h
@@ -7,7 +7,7 @@
 
 #ifndef LL_MEMCPY_DMA_H_
 #define LL_MEMCPY_DMA_H_
-#include "ll_dmahelper.h"
+#include "f4ll/ll_dmahelper.h"
 #include "singleton.h"
 
 namespace f4ll {
diff --git a/lib/ll_usartcore.h b/components/f4ll/inc/ll_usartcore.h
similarity index 97%
rename from lib/ll_usartcore.h
rename to components/f4ll/inc/ll_usartcore.h
index 7b3672c..86bf92d 100644
--- a/lib/ll_usartcore.h
+++ b/components/f4ll/inc/ll_usartcore.h
@@ -9,7 +9,7 @@
 #define LL_USARTCORE_H_
 #include <platform/usart_ll.h>
 
-#include "ll_dmahelper.h"
+#include "f4ll/ll_dmahelper.h"
 
 namespace f4ll {
 
diff --git a/lib/ll_consolehandler.cpp b/components/f4ll/src/ll_consolehandler.cpp
similarity index 96%
rename from lib/ll_consolehandler.cpp
rename to components/f4ll/src/ll_consolehandler.cpp
index d82c78f..2eee20a 100644
--- a/lib/ll_consolehandler.cpp
+++ b/components/f4ll/src/ll_consolehandler.cpp
@@ -5,8 +5,8 @@
  *      Author: abody
  */
 
-#include <ll_consolehandler.h>
-#include <strutil.h>
+#include "f4ll/ll_consolehandler.h"
+#include <f4ll_c/strutil.h>
 
 namespace f4ll {
 
diff --git a/lib/ll_crchandler.cpp b/components/f4ll/src/ll_crchandler.cpp
similarity index 99%
rename from lib/ll_crchandler.cpp
rename to components/f4ll/src/ll_crchandler.cpp
index 1042fdc..c0307ce 100644
--- a/lib/ll_crchandler.cpp
+++ b/components/f4ll/src/ll_crchandler.cpp
@@ -4,7 +4,7 @@
  *  Created on: Oct 26, 2019
  *      Author: compi
  */
-#include "ll_crchandler.h"
+#include "f4ll/ll_crchandler.h"
 
 namespace f4ll {
 
diff --git a/lib/ll_dmahelper.cpp b/components/f4ll/src/ll_dmahelper.cpp
similarity index 97%
rename from lib/ll_dmahelper.cpp
rename to components/f4ll/src/ll_dmahelper.cpp
index c6e24e5..6ee1a98 100644
--- a/lib/ll_dmahelper.cpp
+++ b/components/f4ll/src/ll_dmahelper.cpp
@@ -5,7 +5,7 @@ q * ll_dmahelper.cpp
  *      Author: abody
  */
 
-#include <ll_dmahelper.h>
+#include "f4ll/ll_dmahelper.h"
 
 namespace f4ll {
 
diff --git a/lib/ll_hsusart.cpp b/components/f4ll/src/ll_hsusart.cpp
similarity index 99%
rename from lib/ll_hsusart.cpp
rename to components/f4ll/src/ll_hsusart.cpp
index 64deee4..f96a965 100644
--- a/lib/ll_hsusart.cpp
+++ b/components/f4ll/src/ll_hsusart.cpp
@@ -5,7 +5,7 @@
  *      Author: abody
  */
 #include <string.h>
-#include "ll_hsusart.h"
+#include "f4ll/ll_hsusart.h"
 
 namespace f4ll {
 
diff --git a/lib/ll_memcpydma.cpp b/components/f4ll/src/ll_memcpydma.cpp
similarity index 96%
rename from lib/ll_memcpydma.cpp
rename to components/f4ll/src/ll_memcpydma.cpp
index 18fdeac..cbfcb16 100644
--- a/lib/ll_memcpydma.cpp
+++ b/components/f4ll/src/ll_memcpydma.cpp
@@ -5,7 +5,7 @@
  *      Author: abody
  */
 
-#include <ll_memcpydma.h>
+#include "f4ll/ll_memcpydma.h"
 
 namespace f4ll {
 
diff --git a/lib/ll_usartcore.cpp b/components/f4ll/src/ll_usartcore.cpp
similarity index 99%
rename from lib/ll_usartcore.cpp
rename to components/f4ll/src/ll_usartcore.cpp
index c8bce70..121c33c 100644
--- a/lib/ll_usartcore.cpp
+++ b/components/f4ll/src/ll_usartcore.cpp
@@ -5,7 +5,7 @@
  *      Author: abody
  */
 
-#include <ll_usartcore.h>
+#include "f4ll/ll_usartcore.h"
 
 namespace f4ll {
 
diff --git a/components/f4ll_c/component.mk b/components/f4ll_c/component.mk
new file mode 100644
index 0000000..06d8f09
--- /dev/null
+++ b/components/f4ll_c/component.mk
@@ -0,0 +1,11 @@
+#encoder
+SELF_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+REL_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
+ifeq ($(MKDBG), 1)
+  $(info >>> $(REL_DIR)/component.mk)
+endif
+$(eval C_INCLUDES += -I$(REL_DIR)/inc)
+$(eval C_SOURCES += $(wildcard $(REL_DIR)/src/*.c))
+ifeq ($(MKDBG), 1)
+  $(info <<<)
+endif
diff --git a/lib/console_handler.h b/components/f4ll_c/inc/console_handler.h
similarity index 93%
rename from lib/console_handler.h
rename to components/f4ll_c/inc/console_handler.h
index 3e17705..8302e77 100644
--- a/lib/console_handler.h
+++ b/components/f4ll_c/inc/console_handler.h
@@ -9,7 +9,7 @@
 #define INTERRUPT_HANDLERS_H_
 
 #include "usart.h"
-#include "dma_helper.h"
+#include "f4ll_c/dma_helper.h"
 
 void HandleConsoleUsartTxDmaIrq(DMAINFO *info, USART_TypeDef *usart);
 void HandleConsoleUsartIrq(USART_TypeDef *usart);
diff --git a/lib/crc_handler.h b/components/f4ll_c/inc/crc_handler.h
similarity index 97%
rename from lib/crc_handler.h
rename to components/f4ll_c/inc/crc_handler.h
index 7f88632..a980cce 100644
--- a/lib/crc_handler.h
+++ b/components/f4ll_c/inc/crc_handler.h
@@ -14,7 +14,7 @@
 #include "config.h"
 #endif	//	HAVE_CONFIG
 
-#include <dma_helper.h>
+#include "f4ll_c/dma_helper.h"
 
 #ifndef CRCTASKCOUNT
 #define CRCTASKCOUNT 2
diff --git a/lib/dma_helper.h b/components/f4ll_c/inc/dma_helper.h
similarity index 100%
rename from lib/dma_helper.h
rename to components/f4ll_c/inc/dma_helper.h
diff --git a/components/f4ll_c/inc/f4ll_c b/components/f4ll_c/inc/f4ll_c
new file mode 120000
index 0000000..945c9b4
--- /dev/null
+++ b/components/f4ll_c/inc/f4ll_c
@@ -0,0 +1 @@
+.
\ No newline at end of file
diff --git a/lib/memcpy_dma.h b/components/f4ll_c/inc/memcpy_dma.h
similarity index 100%
rename from lib/memcpy_dma.h
rename to components/f4ll_c/inc/memcpy_dma.h
diff --git a/lib/strutil.h b/components/f4ll_c/inc/strutil.h
similarity index 100%
rename from lib/strutil.h
rename to components/f4ll_c/inc/strutil.h
diff --git a/lib/usart_handler.h b/components/f4ll_c/inc/usart_handler.h
similarity index 98%
rename from lib/usart_handler.h
rename to components/f4ll_c/inc/usart_handler.h
index 80b777d..77b3021 100644
--- a/lib/usart_handler.h
+++ b/components/f4ll_c/inc/usart_handler.h
@@ -9,8 +9,8 @@
 #define USART_HANDLER_H_
 #include <inttypes.h>
 
-#include "dma_helper.h"
-#include "crc_handler.h"
+#include "f4ll_c/dma_helper.h"
+#include "f4ll_c/crc_handler.h"
 
 struct _usart_status;
 typedef struct _usart_status USARTSTATUS;
diff --git a/lib/console_handler.c b/components/f4ll_c/src/console_handler.c
similarity index 96%
rename from lib/console_handler.c
rename to components/f4ll_c/src/console_handler.c
index a3fa56a..c37eab8 100644
--- a/lib/console_handler.c
+++ b/components/f4ll_c/src/console_handler.c
@@ -6,8 +6,8 @@
  */
 #include "main.h"
 #include "globals.h"
-#include "usart_handler.h"
-#include "strutil.h"
+#include "f4ll_c/usart_handler.h"
+#include "f4ll_c/strutil.h"
 
 #ifndef DIAG_INTERRUPT_IN
 #	define DIAG_INTERRUPT_IN()
diff --git a/lib/crc_handler.c b/components/f4ll_c/src/crc_handler.c
similarity index 98%
rename from lib/crc_handler.c
rename to components/f4ll_c/src/crc_handler.c
index 0764702..e6bced4 100644
--- a/lib/crc_handler.c
+++ b/components/f4ll_c/src/crc_handler.c
@@ -6,9 +6,9 @@
  */
 #include <string.h>
 #include <platform/crc_ll.h>
-#include "dma_helper.h"
 #include "diag.h"
-#include "crc_handler.h"
+#include "f4ll_c/dma_helper.h"
+#include "f4ll_c/crc_handler.h"
 
 #ifndef DIAG_CRC_CALC_START
 #	define DIAG_CRC_CALC_START()
diff --git a/lib/dma_helper.c b/components/f4ll_c/src/dma_helper.c
similarity index 98%
rename from lib/dma_helper.c
rename to components/f4ll_c/src/dma_helper.c
index 25d91a3..0080e16 100644
--- a/lib/dma_helper.c
+++ b/components/f4ll_c/src/dma_helper.c
@@ -4,7 +4,7 @@
  *  Created on: Sep 18, 2019
  *      Author: abody
  */
-#include "dma_helper.h"
+#include "f4ll_c/dma_helper.h"
 
 
 volatile uint32_t* GetIsReg(DMA_TypeDef *dma, uint32_t stream)
diff --git a/lib/memcpy_dma.c b/components/f4ll_c/src/memcpy_dma.c
similarity index 94%
rename from lib/memcpy_dma.c
rename to components/f4ll_c/src/memcpy_dma.c
index 0c3a654..885357a 100644
--- a/lib/memcpy_dma.c
+++ b/components/f4ll_c/src/memcpy_dma.c
@@ -4,8 +4,8 @@
  *  Created on: Oct 1, 2019
  *      Author: abody
  */
-#include "memcpy_dma.h"
-#include "dma_helper.h"
+#include "f4ll_c/memcpy_dma.h"
+#include "f4ll_c/dma_helper.h"
 
 #ifndef DIAG_INTERRUPT_IN
 #	define DIAG_INTERRUPT_IN()
diff --git a/lib/strutil.c b/components/f4ll_c/src/strutil.c
similarity index 98%
rename from lib/strutil.c
rename to components/f4ll_c/src/strutil.c
index 12c5812..c41e16e 100644
--- a/lib/strutil.c
+++ b/components/f4ll_c/src/strutil.c
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include "strutil.h"
+#include "f4ll_c/strutil.h"
 
 //////////////////////////////////////////////////////////////////////////////
 size_t strcpy_ex(char *dst, char const *src)
diff --git a/lib/usart_handler.c b/components/f4ll_c/src/usart_handler.c
similarity index 98%
rename from lib/usart_handler.c
rename to components/f4ll_c/src/usart_handler.c
index fcf5dc0..2a0e04b 100644
--- a/lib/usart_handler.c
+++ b/components/f4ll_c/src/usart_handler.c
@@ -8,10 +8,10 @@
 #include <string.h>
 #include <platform/usart_ll.h>
 #include "diag.h"
-#include "usart_handler.h"
-#include "dma_helper.h"
-#include "crc_handler.h"
-#include "memcpy_dma.h"
+#include "f4ll_c/usart_handler.h"
+#include "f4ll_c/dma_helper.h"
+#include "f4ll_c/crc_handler.h"
+#include "f4ll_c/memcpy_dma.h"
 
 #ifndef DIAG_RX_BUFFER_SWITCH
 #	define DIAG_RX_BUFFER_SWITCH(x)
diff --git a/lib/StaticList.h b/lib/StaticList.h
deleted file mode 100644
index b0800cd..0000000
--- a/lib/StaticList.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * StaticList.h
- *
- *  Created on: Oct 29, 2019
- *      Author: abody
- */
-
-#ifndef STATICLIST_H_
-#define STATICLIST_H_
-
-
-
-
-
-#endif /* STATICLIST_H_ */