diff --git a/components/f4ll_c/component.mk b/components/f4ll_c/component.mk
index 5534909..677a34c 100644
--- a/components/f4ll_c/component.mk
+++ b/components/f4ll_c/component.mk
@@ -4,7 +4,8 @@ ifeq ($(MKDBG), 1)
 $(info >>> $(REL_DIR)/component.mk)
 endif
 
-$(eval C_SOURCES += $(wildcard $(REL_DIR)/*.c))
+$(eval C_SOURCES += $(wildcard $(REL_DIR)/src/*.c))
+$(eval COMMON_INCLUDES += -I$(REL_DIR)/inc)
 
 ifeq ($(MKDBG), 1)
 $(info <<<)
diff --git a/components/f4ll_c/f4ll_c b/components/f4ll_c/f4ll_c
deleted file mode 120000
index 945c9b4..0000000
--- a/components/f4ll_c/f4ll_c
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/components/f4ll_c/consolehandler.h b/components/f4ll_c/inc/f4ll_c/consolehandler.h
similarity index 100%
rename from components/f4ll_c/consolehandler.h
rename to components/f4ll_c/inc/f4ll_c/consolehandler.h
diff --git a/components/f4ll_c/crcscheduler.h b/components/f4ll_c/inc/f4ll_c/crcscheduler.h
similarity index 100%
rename from components/f4ll_c/crcscheduler.h
rename to components/f4ll_c/inc/f4ll_c/crcscheduler.h
diff --git a/components/f4ll_c/dmahelper.h b/components/f4ll_c/inc/f4ll_c/dmahelper.h
similarity index 100%
rename from components/f4ll_c/dmahelper.h
rename to components/f4ll_c/inc/f4ll_c/dmahelper.h
diff --git a/components/f4ll_c/memcpydma.h b/components/f4ll_c/inc/f4ll_c/memcpydma.h
similarity index 100%
rename from components/f4ll_c/memcpydma.h
rename to components/f4ll_c/inc/f4ll_c/memcpydma.h
diff --git a/components/f4ll_c/packetusart.h b/components/f4ll_c/inc/f4ll_c/packetusart.h
similarity index 100%
rename from components/f4ll_c/packetusart.h
rename to components/f4ll_c/inc/f4ll_c/packetusart.h
diff --git a/components/f4ll_c/strutil.h b/components/f4ll_c/inc/f4ll_c/strutil.h
similarity index 100%
rename from components/f4ll_c/strutil.h
rename to components/f4ll_c/inc/f4ll_c/strutil.h
diff --git a/components/f4ll_c/consolehandler.c b/components/f4ll_c/src/consolehandler.c
similarity index 100%
rename from components/f4ll_c/consolehandler.c
rename to components/f4ll_c/src/consolehandler.c
diff --git a/components/f4ll_c/crcscheduler.c b/components/f4ll_c/src/crcscheduler.c
similarity index 100%
rename from components/f4ll_c/crcscheduler.c
rename to components/f4ll_c/src/crcscheduler.c
diff --git a/components/f4ll_c/dmahelper.c b/components/f4ll_c/src/dmahelper.c
similarity index 100%
rename from components/f4ll_c/dmahelper.c
rename to components/f4ll_c/src/dmahelper.c
diff --git a/components/f4ll_c/memcpydma.c b/components/f4ll_c/src/memcpydma.c
similarity index 100%
rename from components/f4ll_c/memcpydma.c
rename to components/f4ll_c/src/memcpydma.c
diff --git a/components/f4ll_c/packetusart.c b/components/f4ll_c/src/packetusart.c
similarity index 100%
rename from components/f4ll_c/packetusart.c
rename to components/f4ll_c/src/packetusart.c
diff --git a/components/f4ll_c/strutil.c b/components/f4ll_c/src/strutil.c
similarity index 100%
rename from components/f4ll_c/strutil.c
rename to components/f4ll_c/src/strutil.c
diff --git a/components/f4ll_c/test.mk b/components/f4ll_c/test.mk
index 7c99a04..e58eb5e 100644
--- a/components/f4ll_c/test.mk
+++ b/components/f4ll_c/test.mk
@@ -4,7 +4,8 @@ ifeq ($(MKDBG), 1)
 $(info >>> $(REL_DIR)/component.mk)
 endif
 
-$(eval C_SOURCES += $(wildcard $(REL_DIR)/*.c))
+$(eval C_SOURCES += $(wildcard $(REL_DIR)/src/*.c))
+$(eval COMMON_INCLUDES += -I$(REL_DIR)/inc)
 $(eval CXX_SOURCES += $(wildcard $(REL_DIR)/test/*.cpp))
 
 ifeq ($(MKDBG), 1)