diff --git a/lv_core/lv_core.mk b/lv_core/lv_core.mk
deleted file mode 100644
index daf6b33b1..000000000
--- a/lv_core/lv_core.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-CSRCS += lv_group.c
-CSRCS += lv_indev.c
-CSRCS += lv_disp.c
-CSRCS += lv_obj.c
-CSRCS += lv_refr.c
-CSRCS += lv_style.c
-
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/lv_core
-VPATH += :$(LVGL_DIR)/lvgl/lv_core
-
-CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_core"
diff --git a/lv_hal/lv_hal.mk b/lv_hal/lv_hal.mk
deleted file mode 100644
index 83f4bf175..000000000
--- a/lv_hal/lv_hal.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-CSRCS += lv_hal_disp.c
-CSRCS += lv_hal_indev.c
-CSRCS += lv_hal_tick.c
-
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/lv_hal
-VPATH += :$(LVGL_DIR)/lvgl/lv_hal
-
-CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_hal"
diff --git a/lvgl.h b/lvgl.h
index f4a3149fc..efe05f59f 100644
--- a/lvgl.h
+++ b/lvgl.h
@@ -14,53 +14,54 @@ extern "C" {
  *      INCLUDES
  *********************/
 
-#include "lv_version.h"
+#include "src/lv_version.h"
 
-#include "lv_misc/lv_log.h"
-#include "lv_misc/lv_task.h"
+#include "src/lv_misc/lv_log.h"
+#include "src/lv_misc/lv_task.h"
+#include "src/lv_misc/lv_math.h"
 
-#include "lv_hal/lv_hal.h"
+#include "src/lv_hal/lv_hal.h"
 
-#include "lv_core/lv_obj.h"
-#include "lv_core/lv_group.h"
+#include "src/lv_core/lv_obj.h"
+#include "src/lv_core/lv_group.h"
 
-#include "lv_core/lv_refr.h"
-#include "lv_core/lv_disp.h"
+#include "src/lv_core/lv_refr.h"
+#include "src/lv_core/lv_disp.h"
 
-#include "lv_themes/lv_theme.h"
+#include "src/lv_themes/lv_theme.h"
 
-#include "lv_objx/lv_btn.h"
-#include "lv_objx/lv_imgbtn.h"
-#include "lv_objx/lv_img.h"
-#include "lv_objx/lv_label.h"
-#include "lv_objx/lv_line.h"
-#include "lv_objx/lv_page.h"
-#include "lv_objx/lv_cont.h"
-#include "lv_objx/lv_list.h"
-#include "lv_objx/lv_chart.h"
-#include "lv_objx/lv_table.h"
-#include "lv_objx/lv_cb.h"
-#include "lv_objx/lv_bar.h"
-#include "lv_objx/lv_slider.h"
-#include "lv_objx/lv_led.h"
-#include "lv_objx/lv_btnm.h"
-#include "lv_objx/lv_kb.h"
-#include "lv_objx/lv_ddlist.h"
-#include "lv_objx/lv_roller.h"
-#include "lv_objx/lv_ta.h"
-#include "lv_objx/lv_canvas.h"
-#include "lv_objx/lv_win.h"
-#include "lv_objx/lv_tabview.h"
-#include "lv_objx/lv_tileview.h"
-#include "lv_objx/lv_mbox.h"
-#include "lv_objx/lv_gauge.h"
-#include "lv_objx/lv_lmeter.h"
-#include "lv_objx/lv_sw.h"
-#include "lv_objx/lv_kb.h"
-#include "lv_objx/lv_arc.h"
-#include "lv_objx/lv_preload.h"
-#include "lv_objx/lv_calendar.h"
-#include "lv_objx/lv_spinbox.h"
+#include "src/lv_objx/lv_btn.h"
+#include "src/lv_objx/lv_imgbtn.h"
+#include "src/lv_objx/lv_img.h"
+#include "src/lv_objx/lv_label.h"
+#include "src/lv_objx/lv_line.h"
+#include "src/lv_objx/lv_page.h"
+#include "src/lv_objx/lv_cont.h"
+#include "src/lv_objx/lv_list.h"
+#include "src/lv_objx/lv_chart.h"
+#include "src/lv_objx/lv_table.h"
+#include "src/lv_objx/lv_cb.h"
+#include "src/lv_objx/lv_bar.h"
+#include "src/lv_objx/lv_slider.h"
+#include "src/lv_objx/lv_led.h"
+#include "src/lv_objx/lv_btnm.h"
+#include "src/lv_objx/lv_kb.h"
+#include "src/lv_objx/lv_ddlist.h"
+#include "src/lv_objx/lv_roller.h"
+#include "src/lv_objx/lv_ta.h"
+#include "src/lv_objx/lv_canvas.h"
+#include "src/lv_objx/lv_win.h"
+#include "src/lv_objx/lv_tabview.h"
+#include "src/lv_objx/lv_tileview.h"
+#include "src/lv_objx/lv_mbox.h"
+#include "src/lv_objx/lv_gauge.h"
+#include "src/lv_objx/lv_lmeter.h"
+#include "src/lv_objx/lv_sw.h"
+#include "src/lv_objx/lv_kb.h"
+#include "src/lv_objx/lv_arc.h"
+#include "src/lv_objx/lv_preload.h"
+#include "src/lv_objx/lv_calendar.h"
+#include "src/lv_objx/lv_spinbox.h"
 
 /*********************
  *      DEFINES
diff --git a/lvgl.mk b/lvgl.mk
index a4f323769..a895f33f1 100644
--- a/lvgl.mk
+++ b/lvgl.mk
@@ -1,8 +1,8 @@
-include $(LVGL_DIR)/lvgl/lv_core/lv_core.mk
-include $(LVGL_DIR)/lvgl/lv_hal/lv_hal.mk
-include $(LVGL_DIR)/lvgl/lv_objx/lv_objx.mk
-include $(LVGL_DIR)/lvgl/lv_fonts/lv_fonts.mk
-include $(LVGL_DIR)/lvgl/lv_misc/lv_misc.mk
-include $(LVGL_DIR)/lvgl/lv_themes/lv_themes.mk
-include $(LVGL_DIR)/lvgl/lv_draw/lv_draw.mk
+include $(LVGL_DIR)/lvgl/src/lv_core/lv_core.mk
+include $(LVGL_DIR)/lvgl/src/lv_hal/lv_hal.mk
+include $(LVGL_DIR)/lvgl/src/lv_objx/lv_objx.mk
+include $(LVGL_DIR)/lvgl/src/lv_fonts/lv_fonts.mk
+include $(LVGL_DIR)/lvgl/src/lv_misc/lv_misc.mk
+include $(LVGL_DIR)/lvgl/src/lv_themes/lv_themes.mk
+include $(LVGL_DIR)/lvgl/src/lv_draw/lv_draw.mk
 
diff --git a/lv_conf_checker.py b/scrips/lv_conf_checker.py
similarity index 92%
rename from lv_conf_checker.py
rename to scrips/lv_conf_checker.py
index 1c9cb421a..fa062016a 100644
--- a/lv_conf_checker.py
+++ b/scrips/lv_conf_checker.py
@@ -5,8 +5,8 @@ Generates a chechker file for lv_conf.h from lv_conf_templ.h define all the not
 
 import re
 
-fin = open("lv_conf_templ.h", "r");
-fout = open("lv_conf_checker.h", "w");
+fin = open("../src/lv_conf_templ.h", "r");
+fout = open("../src/lv_conf_checker.h", "w");
 
 
 fout.write(
diff --git a/lv_conf_checker.h b/src/lv_conf_checker.h
similarity index 100%
rename from lv_conf_checker.h
rename to src/lv_conf_checker.h
diff --git a/lv_conf_templ.h b/src/lv_conf_templ.h
similarity index 99%
rename from lv_conf_templ.h
rename to src/lv_conf_templ.h
index dbd1d8824..8def85a49 100644
--- a/lv_conf_templ.h
+++ b/src/lv_conf_templ.h
@@ -353,7 +353,7 @@ typedef void * lv_obj_user_data_t;          /*Declare the type of the user data
 /*--END OF LV_CONF_H--*/
 
 /*Be sure every define has a default value*/
-#include "lvgl/lv_conf_checker.h"
+#include "lvgl/src/lv_conf_checker.h"
 
 #endif /*LV_CONF_H*/
 
diff --git a/src/lv_core/lv_core.mk b/src/lv_core/lv_core.mk
new file mode 100644
index 000000000..5cd51bfb5
--- /dev/null
+++ b/src/lv_core/lv_core.mk
@@ -0,0 +1,11 @@
+CSRCS += lv_group.c
+CSRCS += lv_indev.c
+CSRCS += lv_disp.c
+CSRCS += lv_obj.c
+CSRCS += lv_refr.c
+CSRCS += lv_style.c
+
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_core
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_core
+
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_core"
diff --git a/lv_core/lv_disp.c b/src/lv_core/lv_disp.c
similarity index 100%
rename from lv_core/lv_disp.c
rename to src/lv_core/lv_disp.c
diff --git a/lv_core/lv_disp.h b/src/lv_core/lv_disp.h
similarity index 100%
rename from lv_core/lv_disp.h
rename to src/lv_core/lv_disp.h
diff --git a/lv_core/lv_group.c b/src/lv_core/lv_group.c
similarity index 100%
rename from lv_core/lv_group.c
rename to src/lv_core/lv_group.c
diff --git a/lv_core/lv_group.h b/src/lv_core/lv_group.h
similarity index 99%
rename from lv_core/lv_group.h
rename to src/lv_core/lv_group.h
index 4cb730f2b..cfba02182 100644
--- a/lv_core/lv_group.h
+++ b/src/lv_core/lv_group.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include "lv_obj.h"
diff --git a/lv_core/lv_indev.c b/src/lv_core/lv_indev.c
similarity index 100%
rename from lv_core/lv_indev.c
rename to src/lv_core/lv_indev.c
diff --git a/lv_core/lv_indev.h b/src/lv_core/lv_indev.h
similarity index 100%
rename from lv_core/lv_indev.h
rename to src/lv_core/lv_indev.h
diff --git a/lv_core/lv_obj.c b/src/lv_core/lv_obj.c
similarity index 100%
rename from lv_core/lv_obj.c
rename to src/lv_core/lv_obj.c
diff --git a/lv_core/lv_obj.h b/src/lv_core/lv_obj.h
similarity index 99%
rename from lv_core/lv_obj.h
rename to src/lv_core/lv_obj.h
index 0d764df34..683cfba19 100644
--- a/lv_core/lv_obj.h
+++ b/src/lv_core/lv_obj.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include <stddef.h>
diff --git a/lv_core/lv_refr.c b/src/lv_core/lv_refr.c
similarity index 100%
rename from lv_core/lv_refr.c
rename to src/lv_core/lv_refr.c
diff --git a/lv_core/lv_refr.h b/src/lv_core/lv_refr.h
similarity index 100%
rename from lv_core/lv_refr.h
rename to src/lv_core/lv_refr.h
diff --git a/lv_core/lv_style.c b/src/lv_core/lv_style.c
similarity index 100%
rename from lv_core/lv_style.c
rename to src/lv_core/lv_style.c
diff --git a/lv_core/lv_style.h b/src/lv_core/lv_style.h
similarity index 100%
rename from lv_core/lv_style.h
rename to src/lv_core/lv_style.h
diff --git a/lv_draw/lv_draw.c b/src/lv_draw/lv_draw.c
similarity index 100%
rename from lv_draw/lv_draw.c
rename to src/lv_draw/lv_draw.c
diff --git a/lv_draw/lv_draw.h b/src/lv_draw/lv_draw.h
similarity index 98%
rename from lv_draw/lv_draw.h
rename to src/lv_draw/lv_draw.h
index ccd7b2ce4..a3d41b745 100644
--- a/lv_draw/lv_draw.h
+++ b/src/lv_draw/lv_draw.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include "../lv_core/lv_style.h"
diff --git a/lv_draw/lv_draw.mk b/src/lv_draw/lv_draw.mk
similarity index 59%
rename from lv_draw/lv_draw.mk
rename to src/lv_draw/lv_draw.mk
index 70fa7103f..ac9e76041 100644
--- a/lv_draw/lv_draw.mk
+++ b/src/lv_draw/lv_draw.mk
@@ -7,7 +7,7 @@ CSRCS += lv_draw_img.c
 CSRCS += lv_draw_arc.c
 CSRCS += lv_draw_triangle.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/lv_draw
-VPATH += :$(LVGL_DIR)/lvgl/lv_draw
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_draw
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_draw
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_draw"
+CFLAGS += "-I$(LVGL_DIR)lvgl/src/lv_draw"
diff --git a/lv_draw/lv_draw_arc.c b/src/lv_draw/lv_draw_arc.c
similarity index 100%
rename from lv_draw/lv_draw_arc.c
rename to src/lv_draw/lv_draw_arc.c
diff --git a/lv_draw/lv_draw_arc.h b/src/lv_draw/lv_draw_arc.h
similarity index 100%
rename from lv_draw/lv_draw_arc.h
rename to src/lv_draw/lv_draw_arc.h
diff --git a/lv_draw/lv_draw_basic.c b/src/lv_draw/lv_draw_basic.c
similarity index 100%
rename from lv_draw/lv_draw_basic.c
rename to src/lv_draw/lv_draw_basic.c
diff --git a/lv_draw/lv_draw_basic.h b/src/lv_draw/lv_draw_basic.h
similarity index 98%
rename from lv_draw/lv_draw_basic.h
rename to src/lv_draw/lv_draw_basic.h
index 2e52d29d8..ec261744d 100644
--- a/lv_draw/lv_draw_basic.h
+++ b/src/lv_draw/lv_draw_basic.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include "../lv_misc/lv_color.h"
diff --git a/lv_draw/lv_draw_img.c b/src/lv_draw/lv_draw_img.c
similarity index 100%
rename from lv_draw/lv_draw_img.c
rename to src/lv_draw/lv_draw_img.c
diff --git a/lv_draw/lv_draw_img.h b/src/lv_draw/lv_draw_img.h
similarity index 100%
rename from lv_draw/lv_draw_img.h
rename to src/lv_draw/lv_draw_img.h
diff --git a/lv_draw/lv_draw_label.c b/src/lv_draw/lv_draw_label.c
similarity index 100%
rename from lv_draw/lv_draw_label.c
rename to src/lv_draw/lv_draw_label.c
diff --git a/lv_draw/lv_draw_label.h b/src/lv_draw/lv_draw_label.h
similarity index 100%
rename from lv_draw/lv_draw_label.h
rename to src/lv_draw/lv_draw_label.h
diff --git a/lv_draw/lv_draw_line.c b/src/lv_draw/lv_draw_line.c
similarity index 100%
rename from lv_draw/lv_draw_line.c
rename to src/lv_draw/lv_draw_line.c
diff --git a/lv_draw/lv_draw_line.h b/src/lv_draw/lv_draw_line.h
similarity index 100%
rename from lv_draw/lv_draw_line.h
rename to src/lv_draw/lv_draw_line.h
diff --git a/lv_draw/lv_draw_rect.c b/src/lv_draw/lv_draw_rect.c
similarity index 100%
rename from lv_draw/lv_draw_rect.c
rename to src/lv_draw/lv_draw_rect.c
diff --git a/lv_draw/lv_draw_rect.h b/src/lv_draw/lv_draw_rect.h
similarity index 100%
rename from lv_draw/lv_draw_rect.h
rename to src/lv_draw/lv_draw_rect.h
diff --git a/lv_draw/lv_draw_triangle.c b/src/lv_draw/lv_draw_triangle.c
similarity index 100%
rename from lv_draw/lv_draw_triangle.c
rename to src/lv_draw/lv_draw_triangle.c
diff --git a/lv_draw/lv_draw_triangle.h b/src/lv_draw/lv_draw_triangle.h
similarity index 100%
rename from lv_draw/lv_draw_triangle.h
rename to src/lv_draw/lv_draw_triangle.h
diff --git a/lv_fonts/lv_font_builtin.c b/src/lv_fonts/lv_font_builtin.c
similarity index 100%
rename from lv_fonts/lv_font_builtin.c
rename to src/lv_fonts/lv_font_builtin.c
diff --git a/lv_fonts/lv_font_builtin.h b/src/lv_fonts/lv_font_builtin.h
similarity index 98%
rename from lv_fonts/lv_font_builtin.h
rename to src/lv_fonts/lv_font_builtin.h
index 07667ef32..65b1e1943 100644
--- a/lv_fonts/lv_font_builtin.h
+++ b/src/lv_fonts/lv_font_builtin.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include "../lv_misc/lv_font.h"
diff --git a/lv_fonts/lv_font_dejavu_10.c b/src/lv_fonts/lv_font_dejavu_10.c
similarity index 100%
rename from lv_fonts/lv_font_dejavu_10.c
rename to src/lv_fonts/lv_font_dejavu_10.c
diff --git a/lv_fonts/lv_font_dejavu_10_cyrillic.c b/src/lv_fonts/lv_font_dejavu_10_cyrillic.c
similarity index 100%
rename from lv_fonts/lv_font_dejavu_10_cyrillic.c
rename to src/lv_fonts/lv_font_dejavu_10_cyrillic.c
diff --git a/lv_fonts/lv_font_dejavu_10_latin_sup.c b/src/lv_fonts/lv_font_dejavu_10_latin_sup.c
similarity index 100%
rename from lv_fonts/lv_font_dejavu_10_latin_sup.c
rename to src/lv_fonts/lv_font_dejavu_10_latin_sup.c
diff --git a/lv_fonts/lv_font_dejavu_20.c b/src/lv_fonts/lv_font_dejavu_20.c
similarity index 100%
rename from lv_fonts/lv_font_dejavu_20.c
rename to src/lv_fonts/lv_font_dejavu_20.c
diff --git a/lv_fonts/lv_font_dejavu_20_cyrillic.c b/src/lv_fonts/lv_font_dejavu_20_cyrillic.c
similarity index 100%
rename from lv_fonts/lv_font_dejavu_20_cyrillic.c
rename to src/lv_fonts/lv_font_dejavu_20_cyrillic.c
diff --git a/lv_fonts/lv_font_dejavu_20_latin_sup.c b/src/lv_fonts/lv_font_dejavu_20_latin_sup.c
similarity index 100%
rename from lv_fonts/lv_font_dejavu_20_latin_sup.c
rename to src/lv_fonts/lv_font_dejavu_20_latin_sup.c
diff --git a/lv_fonts/lv_font_dejavu_30.c b/src/lv_fonts/lv_font_dejavu_30.c
similarity index 100%
rename from lv_fonts/lv_font_dejavu_30.c
rename to src/lv_fonts/lv_font_dejavu_30.c
diff --git a/lv_fonts/lv_font_dejavu_30_cyrillic.c b/src/lv_fonts/lv_font_dejavu_30_cyrillic.c
similarity index 100%
rename from lv_fonts/lv_font_dejavu_30_cyrillic.c
rename to src/lv_fonts/lv_font_dejavu_30_cyrillic.c
diff --git a/lv_fonts/lv_font_dejavu_30_latin_sup.c b/src/lv_fonts/lv_font_dejavu_30_latin_sup.c
similarity index 100%
rename from lv_fonts/lv_font_dejavu_30_latin_sup.c
rename to src/lv_fonts/lv_font_dejavu_30_latin_sup.c
diff --git a/lv_fonts/lv_font_dejavu_40.c b/src/lv_fonts/lv_font_dejavu_40.c
similarity index 100%
rename from lv_fonts/lv_font_dejavu_40.c
rename to src/lv_fonts/lv_font_dejavu_40.c
diff --git a/lv_fonts/lv_font_dejavu_40_cyrillic.c b/src/lv_fonts/lv_font_dejavu_40_cyrillic.c
similarity index 100%
rename from lv_fonts/lv_font_dejavu_40_cyrillic.c
rename to src/lv_fonts/lv_font_dejavu_40_cyrillic.c
diff --git a/lv_fonts/lv_font_dejavu_40_latin_sup.c b/src/lv_fonts/lv_font_dejavu_40_latin_sup.c
similarity index 100%
rename from lv_fonts/lv_font_dejavu_40_latin_sup.c
rename to src/lv_fonts/lv_font_dejavu_40_latin_sup.c
diff --git a/lv_fonts/lv_font_monospace_8.c b/src/lv_fonts/lv_font_monospace_8.c
similarity index 100%
rename from lv_fonts/lv_font_monospace_8.c
rename to src/lv_fonts/lv_font_monospace_8.c
diff --git a/lv_fonts/lv_font_symbol_10.c b/src/lv_fonts/lv_font_symbol_10.c
similarity index 100%
rename from lv_fonts/lv_font_symbol_10.c
rename to src/lv_fonts/lv_font_symbol_10.c
diff --git a/lv_fonts/lv_font_symbol_20.c b/src/lv_fonts/lv_font_symbol_20.c
similarity index 100%
rename from lv_fonts/lv_font_symbol_20.c
rename to src/lv_fonts/lv_font_symbol_20.c
diff --git a/lv_fonts/lv_font_symbol_30.c b/src/lv_fonts/lv_font_symbol_30.c
similarity index 100%
rename from lv_fonts/lv_font_symbol_30.c
rename to src/lv_fonts/lv_font_symbol_30.c
diff --git a/lv_fonts/lv_font_symbol_40.c b/src/lv_fonts/lv_font_symbol_40.c
similarity index 100%
rename from lv_fonts/lv_font_symbol_40.c
rename to src/lv_fonts/lv_font_symbol_40.c
diff --git a/lv_fonts/lv_fonts.mk b/src/lv_fonts/lv_fonts.mk
similarity index 81%
rename from lv_fonts/lv_fonts.mk
rename to src/lv_fonts/lv_fonts.mk
index f124b5590..002fb75b6 100644
--- a/lv_fonts/lv_fonts.mk
+++ b/src/lv_fonts/lv_fonts.mk
@@ -17,7 +17,7 @@ CSRCS += lv_font_symbol_30.c
 CSRCS += lv_font_symbol_40.c
 CSRCS += lv_font_monospace_8.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/lv_fonts
-VPATH += :$(LVGL_DIR)/lvgl/lv_fonts
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_fonts
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_fonts
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_fonts"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_fonts"
diff --git a/lv_hal/lv_hal.h b/src/lv_hal/lv_hal.h
similarity index 100%
rename from lv_hal/lv_hal.h
rename to src/lv_hal/lv_hal.h
diff --git a/src/lv_hal/lv_hal.mk b/src/lv_hal/lv_hal.mk
new file mode 100644
index 000000000..05af078ce
--- /dev/null
+++ b/src/lv_hal/lv_hal.mk
@@ -0,0 +1,8 @@
+CSRCS += lv_hal_disp.c
+CSRCS += lv_hal_indev.c
+CSRCS += lv_hal_tick.c
+
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_hal
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_hal
+
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_hal"
diff --git a/lv_hal/lv_hal_disp.c b/src/lv_hal/lv_hal_disp.c
similarity index 100%
rename from lv_hal/lv_hal_disp.c
rename to src/lv_hal/lv_hal_disp.c
diff --git a/lv_hal/lv_hal_disp.h b/src/lv_hal/lv_hal_disp.h
similarity index 100%
rename from lv_hal/lv_hal_disp.h
rename to src/lv_hal/lv_hal_disp.h
diff --git a/lv_hal/lv_hal_indev.c b/src/lv_hal/lv_hal_indev.c
similarity index 100%
rename from lv_hal/lv_hal_indev.c
rename to src/lv_hal/lv_hal_indev.c
diff --git a/lv_hal/lv_hal_indev.h b/src/lv_hal/lv_hal_indev.h
similarity index 99%
rename from lv_hal/lv_hal_indev.h
rename to src/lv_hal/lv_hal_indev.h
index 9d224948a..9ed1479f9 100644
--- a/lv_hal/lv_hal_indev.h
+++ b/src/lv_hal/lv_hal_indev.h
@@ -18,7 +18,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include <stdbool.h>
diff --git a/lv_hal/lv_hal_tick.c b/src/lv_hal/lv_hal_tick.c
similarity index 98%
rename from lv_hal/lv_hal_tick.c
rename to src/lv_hal/lv_hal_tick.c
index 0310092c6..621e05f53 100644
--- a/lv_hal/lv_hal_tick.c
+++ b/src/lv_hal/lv_hal_tick.c
@@ -9,7 +9,7 @@
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include "lv_hal_tick.h"
diff --git a/lv_hal/lv_hal_tick.h b/src/lv_hal/lv_hal_tick.h
similarity index 97%
rename from lv_hal/lv_hal_tick.h
rename to src/lv_hal/lv_hal_tick.h
index 088b360a7..e016abbf6 100644
--- a/lv_hal/lv_hal_tick.h
+++ b/src/lv_hal/lv_hal_tick.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/lv_misc/lv_anim.c b/src/lv_misc/lv_anim.c
similarity index 100%
rename from lv_misc/lv_anim.c
rename to src/lv_misc/lv_anim.c
diff --git a/lv_misc/lv_anim.h b/src/lv_misc/lv_anim.h
similarity index 99%
rename from lv_misc/lv_anim.h
rename to src/lv_misc/lv_anim.h
index 611f38611..70e0db9f0 100644
--- a/lv_misc/lv_anim.h
+++ b/src/lv_misc/lv_anim.h
@@ -17,7 +17,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_ANIMATION
diff --git a/lv_misc/lv_area.c b/src/lv_misc/lv_area.c
similarity index 100%
rename from lv_misc/lv_area.c
rename to src/lv_misc/lv_area.c
diff --git a/lv_misc/lv_area.h b/src/lv_misc/lv_area.h
similarity index 100%
rename from lv_misc/lv_area.h
rename to src/lv_misc/lv_area.h
diff --git a/lv_misc/lv_circ.c b/src/lv_misc/lv_circ.c
similarity index 100%
rename from lv_misc/lv_circ.c
rename to src/lv_misc/lv_circ.c
diff --git a/lv_misc/lv_circ.h b/src/lv_misc/lv_circ.h
similarity index 100%
rename from lv_misc/lv_circ.h
rename to src/lv_misc/lv_circ.h
diff --git a/lv_misc/lv_color.c b/src/lv_misc/lv_color.c
similarity index 100%
rename from lv_misc/lv_color.c
rename to src/lv_misc/lv_color.c
diff --git a/lv_misc/lv_color.h b/src/lv_misc/lv_color.h
similarity index 99%
rename from lv_misc/lv_color.h
rename to src/lv_misc/lv_color.h
index 23855fd9c..fc2a483d8 100644
--- a/lv_misc/lv_color.h
+++ b/src/lv_misc/lv_color.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 /*Error checking*/
diff --git a/lv_misc/lv_font.c b/src/lv_misc/lv_font.c
similarity index 100%
rename from lv_misc/lv_font.c
rename to src/lv_misc/lv_font.c
diff --git a/lv_misc/lv_font.h b/src/lv_misc/lv_font.h
similarity index 99%
rename from lv_misc/lv_font.h
rename to src/lv_misc/lv_font.h
index d1d24f3fe..b09674b33 100644
--- a/lv_misc/lv_font.h
+++ b/src/lv_misc/lv_font.h
@@ -17,7 +17,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include <stdint.h>
diff --git a/lv_misc/lv_fs.c b/src/lv_misc/lv_fs.c
similarity index 100%
rename from lv_misc/lv_fs.c
rename to src/lv_misc/lv_fs.c
diff --git a/lv_misc/lv_fs.h b/src/lv_misc/lv_fs.h
similarity index 99%
rename from lv_misc/lv_fs.h
rename to src/lv_misc/lv_fs.h
index 35e70408e..3559d35ce 100644
--- a/lv_misc/lv_fs.h
+++ b/src/lv_misc/lv_fs.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_FILESYSTEM
diff --git a/lv_misc/lv_gc.c b/src/lv_misc/lv_gc.c
similarity index 100%
rename from lv_misc/lv_gc.c
rename to src/lv_misc/lv_gc.c
diff --git a/lv_misc/lv_gc.h b/src/lv_misc/lv_gc.h
similarity index 97%
rename from lv_misc/lv_gc.h
rename to src/lv_misc/lv_gc.h
index 35559f39b..c6c89e1ef 100644
--- a/lv_misc/lv_gc.h
+++ b/src/lv_misc/lv_gc.h
@@ -17,7 +17,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include <stdint.h>
diff --git a/lv_misc/lv_ll.c b/src/lv_misc/lv_ll.c
similarity index 100%
rename from lv_misc/lv_ll.c
rename to src/lv_misc/lv_ll.c
diff --git a/lv_misc/lv_ll.h b/src/lv_misc/lv_ll.h
similarity index 100%
rename from lv_misc/lv_ll.h
rename to src/lv_misc/lv_ll.h
diff --git a/lv_misc/lv_log.c b/src/lv_misc/lv_log.c
similarity index 100%
rename from lv_misc/lv_log.c
rename to src/lv_misc/lv_log.c
diff --git a/lv_misc/lv_log.h b/src/lv_misc/lv_log.h
similarity index 98%
rename from lv_misc/lv_log.h
rename to src/lv_misc/lv_log.h
index b124a9294..9e399e802 100644
--- a/lv_misc/lv_log.h
+++ b/src/lv_misc/lv_log.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 #include <stdint.h>
 
diff --git a/lv_misc/lv_math.c b/src/lv_misc/lv_math.c
similarity index 100%
rename from lv_misc/lv_math.c
rename to src/lv_misc/lv_math.c
diff --git a/lv_misc/lv_math.h b/src/lv_misc/lv_math.h
similarity index 100%
rename from lv_misc/lv_math.h
rename to src/lv_misc/lv_math.h
diff --git a/lv_misc/lv_mem.c b/src/lv_misc/lv_mem.c
similarity index 100%
rename from lv_misc/lv_mem.c
rename to src/lv_misc/lv_mem.c
diff --git a/lv_misc/lv_mem.h b/src/lv_misc/lv_mem.h
similarity index 98%
rename from lv_misc/lv_mem.h
rename to src/lv_misc/lv_mem.h
index f195f7ac2..257e18536 100644
--- a/lv_misc/lv_mem.h
+++ b/src/lv_misc/lv_mem.h
@@ -17,7 +17,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include <stdint.h>
diff --git a/lv_misc/lv_misc.mk b/src/lv_misc/lv_misc.mk
similarity index 64%
rename from lv_misc/lv_misc.mk
rename to src/lv_misc/lv_misc.mk
index ad553d2ed..f9f2cbdc2 100644
--- a/lv_misc/lv_misc.mk
+++ b/src/lv_misc/lv_misc.mk
@@ -12,7 +12,7 @@ CSRCS += lv_math.c
 CSRCS += lv_log.c
 CSRCS += lv_gc.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/lv_misc
-VPATH += :$(LVGL_DIR)/lvgl/lv_misc
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_misc
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_misc
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_misc"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_misc"
diff --git a/lv_misc/lv_symbol_def.h b/src/lv_misc/lv_symbol_def.h
similarity index 99%
rename from lv_misc/lv_symbol_def.h
rename to src/lv_misc/lv_symbol_def.h
index fd73d29be..2ecbd1895 100644
--- a/lv_misc/lv_symbol_def.h
+++ b/src/lv_misc/lv_symbol_def.h
@@ -7,7 +7,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 /*
diff --git a/lv_misc/lv_task.c b/src/lv_misc/lv_task.c
similarity index 100%
rename from lv_misc/lv_task.c
rename to src/lv_misc/lv_task.c
diff --git a/lv_misc/lv_task.h b/src/lv_misc/lv_task.h
similarity index 99%
rename from lv_misc/lv_task.h
rename to src/lv_misc/lv_task.h
index 2c59b3979..a63420fd6 100644
--- a/lv_misc/lv_task.h
+++ b/src/lv_misc/lv_task.h
@@ -17,7 +17,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include <stdint.h>
diff --git a/lv_misc/lv_templ.c b/src/lv_misc/lv_templ.c
similarity index 100%
rename from lv_misc/lv_templ.c
rename to src/lv_misc/lv_templ.c
diff --git a/lv_misc/lv_templ.h b/src/lv_misc/lv_templ.h
similarity index 100%
rename from lv_misc/lv_templ.h
rename to src/lv_misc/lv_templ.h
diff --git a/lv_misc/lv_txt.c b/src/lv_misc/lv_txt.c
similarity index 100%
rename from lv_misc/lv_txt.c
rename to src/lv_misc/lv_txt.c
diff --git a/lv_misc/lv_txt.h b/src/lv_misc/lv_txt.h
similarity index 99%
rename from lv_misc/lv_txt.h
rename to src/lv_misc/lv_txt.h
index 22a780618..c1d955ad1 100644
--- a/lv_misc/lv_txt.h
+++ b/src/lv_misc/lv_txt.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include <stdbool.h>
diff --git a/lv_objx/lv_arc.c b/src/lv_objx/lv_arc.c
similarity index 100%
rename from lv_objx/lv_arc.c
rename to src/lv_objx/lv_arc.c
diff --git a/lv_objx/lv_arc.h b/src/lv_objx/lv_arc.h
similarity index 98%
rename from lv_objx/lv_arc.h
rename to src/lv_objx/lv_arc.h
index b37efee2e..49595f34c 100644
--- a/lv_objx/lv_arc.h
+++ b/src/lv_objx/lv_arc.h
@@ -17,7 +17,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_ARC != 0
diff --git a/lv_objx/lv_bar.c b/src/lv_objx/lv_bar.c
similarity index 100%
rename from lv_objx/lv_bar.c
rename to src/lv_objx/lv_bar.c
diff --git a/lv_objx/lv_bar.h b/src/lv_objx/lv_bar.h
similarity index 99%
rename from lv_objx/lv_bar.h
rename to src/lv_objx/lv_bar.h
index c9e98d25a..71cb32fe3 100644
--- a/lv_objx/lv_bar.h
+++ b/src/lv_objx/lv_bar.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_BAR != 0
diff --git a/lv_objx/lv_btn.c b/src/lv_objx/lv_btn.c
similarity index 100%
rename from lv_objx/lv_btn.c
rename to src/lv_objx/lv_btn.c
diff --git a/lv_objx/lv_btn.h b/src/lv_objx/lv_btn.h
similarity index 99%
rename from lv_objx/lv_btn.h
rename to src/lv_objx/lv_btn.h
index 7612cb44e..203f069c3 100644
--- a/lv_objx/lv_btn.h
+++ b/src/lv_objx/lv_btn.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_BTN != 0
diff --git a/lv_objx/lv_btnm.c b/src/lv_objx/lv_btnm.c
similarity index 100%
rename from lv_objx/lv_btnm.c
rename to src/lv_objx/lv_btnm.c
diff --git a/lv_objx/lv_btnm.h b/src/lv_objx/lv_btnm.h
similarity index 99%
rename from lv_objx/lv_btnm.h
rename to src/lv_objx/lv_btnm.h
index 6386d4dfb..b1e0f043b 100644
--- a/lv_objx/lv_btnm.h
+++ b/src/lv_objx/lv_btnm.h
@@ -17,7 +17,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_BTNM != 0
diff --git a/lv_objx/lv_calendar.c b/src/lv_objx/lv_calendar.c
similarity index 100%
rename from lv_objx/lv_calendar.c
rename to src/lv_objx/lv_calendar.c
diff --git a/lv_objx/lv_calendar.h b/src/lv_objx/lv_calendar.h
similarity index 99%
rename from lv_objx/lv_calendar.h
rename to src/lv_objx/lv_calendar.h
index 9064ee2fb..19ca98349 100644
--- a/lv_objx/lv_calendar.h
+++ b/src/lv_objx/lv_calendar.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_CALENDAR != 0
diff --git a/lv_objx/lv_canvas.c b/src/lv_objx/lv_canvas.c
similarity index 100%
rename from lv_objx/lv_canvas.c
rename to src/lv_objx/lv_canvas.c
diff --git a/lv_objx/lv_canvas.h b/src/lv_objx/lv_canvas.h
similarity index 99%
rename from lv_objx/lv_canvas.h
rename to src/lv_objx/lv_canvas.h
index f8d6e94d4..e68f70d05 100644
--- a/lv_objx/lv_canvas.h
+++ b/src/lv_objx/lv_canvas.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_CANVAS != 0
diff --git a/lv_objx/lv_cb.c b/src/lv_objx/lv_cb.c
similarity index 100%
rename from lv_objx/lv_cb.c
rename to src/lv_objx/lv_cb.c
diff --git a/lv_objx/lv_cb.h b/src/lv_objx/lv_cb.h
similarity index 99%
rename from lv_objx/lv_cb.h
rename to src/lv_objx/lv_cb.h
index 5c6c0b04e..3e8c38f20 100644
--- a/lv_objx/lv_cb.h
+++ b/src/lv_objx/lv_cb.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_CB != 0
diff --git a/lv_objx/lv_chart.c b/src/lv_objx/lv_chart.c
similarity index 100%
rename from lv_objx/lv_chart.c
rename to src/lv_objx/lv_chart.c
diff --git a/lv_objx/lv_chart.h b/src/lv_objx/lv_chart.h
similarity index 99%
rename from lv_objx/lv_chart.h
rename to src/lv_objx/lv_chart.h
index 53a674ff3..d0ca97df1 100644
--- a/lv_objx/lv_chart.h
+++ b/src/lv_objx/lv_chart.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_CHART != 0
diff --git a/lv_objx/lv_cont.c b/src/lv_objx/lv_cont.c
similarity index 100%
rename from lv_objx/lv_cont.c
rename to src/lv_objx/lv_cont.c
diff --git a/lv_objx/lv_cont.h b/src/lv_objx/lv_cont.h
similarity index 99%
rename from lv_objx/lv_cont.h
rename to src/lv_objx/lv_cont.h
index cf09e1740..0dade26db 100644
--- a/lv_objx/lv_cont.h
+++ b/src/lv_objx/lv_cont.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_CONT != 0
diff --git a/lv_objx/lv_ddlist.c b/src/lv_objx/lv_ddlist.c
similarity index 100%
rename from lv_objx/lv_ddlist.c
rename to src/lv_objx/lv_ddlist.c
diff --git a/lv_objx/lv_ddlist.h b/src/lv_objx/lv_ddlist.h
similarity index 99%
rename from lv_objx/lv_ddlist.h
rename to src/lv_objx/lv_ddlist.h
index 390352ea9..5a516a932 100644
--- a/lv_objx/lv_ddlist.h
+++ b/src/lv_objx/lv_ddlist.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_DDLIST != 0
diff --git a/lv_objx/lv_gauge.c b/src/lv_objx/lv_gauge.c
similarity index 100%
rename from lv_objx/lv_gauge.c
rename to src/lv_objx/lv_gauge.c
diff --git a/lv_objx/lv_gauge.h b/src/lv_objx/lv_gauge.h
similarity index 99%
rename from lv_objx/lv_gauge.h
rename to src/lv_objx/lv_gauge.h
index b37be3909..409c79e0f 100644
--- a/lv_objx/lv_gauge.h
+++ b/src/lv_objx/lv_gauge.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_GAUGE != 0
diff --git a/lv_objx/lv_img.c b/src/lv_objx/lv_img.c
similarity index 100%
rename from lv_objx/lv_img.c
rename to src/lv_objx/lv_img.c
diff --git a/lv_objx/lv_img.h b/src/lv_objx/lv_img.h
similarity index 99%
rename from lv_objx/lv_img.h
rename to src/lv_objx/lv_img.h
index 40fa43782..8681009b8 100644
--- a/lv_objx/lv_img.h
+++ b/src/lv_objx/lv_img.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_IMG != 0
diff --git a/lv_objx/lv_imgbtn.c b/src/lv_objx/lv_imgbtn.c
similarity index 100%
rename from lv_objx/lv_imgbtn.c
rename to src/lv_objx/lv_imgbtn.c
diff --git a/lv_objx/lv_imgbtn.h b/src/lv_objx/lv_imgbtn.h
similarity index 99%
rename from lv_objx/lv_imgbtn.h
rename to src/lv_objx/lv_imgbtn.h
index a3d4e7ff4..de551d67d 100644
--- a/lv_objx/lv_imgbtn.h
+++ b/src/lv_objx/lv_imgbtn.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_IMGBTN != 0
diff --git a/lv_objx/lv_kb.c b/src/lv_objx/lv_kb.c
similarity index 100%
rename from lv_objx/lv_kb.c
rename to src/lv_objx/lv_kb.c
diff --git a/lv_objx/lv_kb.h b/src/lv_objx/lv_kb.h
similarity index 99%
rename from lv_objx/lv_kb.h
rename to src/lv_objx/lv_kb.h
index 1ae5e3156..4c9c4ec72 100644
--- a/lv_objx/lv_kb.h
+++ b/src/lv_objx/lv_kb.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_KB != 0
diff --git a/lv_objx/lv_label.c b/src/lv_objx/lv_label.c
similarity index 100%
rename from lv_objx/lv_label.c
rename to src/lv_objx/lv_label.c
diff --git a/lv_objx/lv_label.h b/src/lv_objx/lv_label.h
similarity index 99%
rename from lv_objx/lv_label.h
rename to src/lv_objx/lv_label.h
index 2acc9c965..b72bc8ecf 100644
--- a/lv_objx/lv_label.h
+++ b/src/lv_objx/lv_label.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_LABEL != 0
diff --git a/lv_objx/lv_led.c b/src/lv_objx/lv_led.c
similarity index 100%
rename from lv_objx/lv_led.c
rename to src/lv_objx/lv_led.c
diff --git a/lv_objx/lv_led.h b/src/lv_objx/lv_led.h
similarity index 98%
rename from lv_objx/lv_led.h
rename to src/lv_objx/lv_led.h
index 8711570b5..22e661484 100644
--- a/lv_objx/lv_led.h
+++ b/src/lv_objx/lv_led.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_LED != 0
diff --git a/lv_objx/lv_line.c b/src/lv_objx/lv_line.c
similarity index 100%
rename from lv_objx/lv_line.c
rename to src/lv_objx/lv_line.c
diff --git a/lv_objx/lv_line.h b/src/lv_objx/lv_line.h
similarity index 99%
rename from lv_objx/lv_line.h
rename to src/lv_objx/lv_line.h
index d0c546062..b1c9a43a8 100644
--- a/lv_objx/lv_line.h
+++ b/src/lv_objx/lv_line.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_LINE != 0
diff --git a/lv_objx/lv_list.c b/src/lv_objx/lv_list.c
similarity index 100%
rename from lv_objx/lv_list.c
rename to src/lv_objx/lv_list.c
diff --git a/lv_objx/lv_list.h b/src/lv_objx/lv_list.h
similarity index 99%
rename from lv_objx/lv_list.h
rename to src/lv_objx/lv_list.h
index ccf294b52..a634a9f12 100644
--- a/lv_objx/lv_list.h
+++ b/src/lv_objx/lv_list.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_LIST != 0
diff --git a/lv_objx/lv_lmeter.c b/src/lv_objx/lv_lmeter.c
similarity index 100%
rename from lv_objx/lv_lmeter.c
rename to src/lv_objx/lv_lmeter.c
diff --git a/lv_objx/lv_lmeter.h b/src/lv_objx/lv_lmeter.h
similarity index 99%
rename from lv_objx/lv_lmeter.h
rename to src/lv_objx/lv_lmeter.h
index 7852b870e..dfabe4cb1 100644
--- a/lv_objx/lv_lmeter.h
+++ b/src/lv_objx/lv_lmeter.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_LMETER != 0
diff --git a/lv_objx/lv_mbox.c b/src/lv_objx/lv_mbox.c
similarity index 100%
rename from lv_objx/lv_mbox.c
rename to src/lv_objx/lv_mbox.c
diff --git a/lv_objx/lv_mbox.h b/src/lv_objx/lv_mbox.h
similarity index 99%
rename from lv_objx/lv_mbox.h
rename to src/lv_objx/lv_mbox.h
index 1d256b3ac..953f12c55 100644
--- a/lv_objx/lv_mbox.h
+++ b/src/lv_objx/lv_mbox.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_MBOX != 0
diff --git a/lv_objx/lv_objx.mk b/src/lv_objx/lv_objx.mk
similarity index 82%
rename from lv_objx/lv_objx.mk
rename to src/lv_objx/lv_objx.mk
index d35252bce..45b3e2ad3 100644
--- a/lv_objx/lv_objx.mk
+++ b/src/lv_objx/lv_objx.mk
@@ -30,7 +30,7 @@ CSRCS += lv_page.c
 CSRCS += lv_sw.c
 CSRCS += lv_win.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/lv_objx
-VPATH += :$(LVGL_DIR)/lvgl/lv_objx
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_objx
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_objx
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_objx"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_objx"
diff --git a/lv_objx/lv_objx_templ.c b/src/lv_objx/lv_objx_templ.c
similarity index 100%
rename from lv_objx/lv_objx_templ.c
rename to src/lv_objx/lv_objx_templ.c
diff --git a/lv_objx/lv_objx_templ.h b/src/lv_objx/lv_objx_templ.h
similarity index 98%
rename from lv_objx/lv_objx_templ.h
rename to src/lv_objx/lv_objx_templ.h
index 13a75d179..3fdac8eb6 100644
--- a/lv_objx/lv_objx_templ.h
+++ b/src/lv_objx/lv_objx_templ.h
@@ -24,7 +24,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_TEMPL != 0
diff --git a/lv_objx/lv_page.c b/src/lv_objx/lv_page.c
similarity index 100%
rename from lv_objx/lv_page.c
rename to src/lv_objx/lv_page.c
diff --git a/lv_objx/lv_page.h b/src/lv_objx/lv_page.h
similarity index 99%
rename from lv_objx/lv_page.h
rename to src/lv_objx/lv_page.h
index 365708669..2c9de41f2 100644
--- a/lv_objx/lv_page.h
+++ b/src/lv_objx/lv_page.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_PAGE != 0
diff --git a/lv_objx/lv_preload.c b/src/lv_objx/lv_preload.c
similarity index 100%
rename from lv_objx/lv_preload.c
rename to src/lv_objx/lv_preload.c
diff --git a/lv_objx/lv_preload.h b/src/lv_objx/lv_preload.h
similarity index 99%
rename from lv_objx/lv_preload.h
rename to src/lv_objx/lv_preload.h
index 965c2e278..913297a1a 100644
--- a/lv_objx/lv_preload.h
+++ b/src/lv_objx/lv_preload.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_PRELOAD != 0
diff --git a/lv_objx/lv_roller.c b/src/lv_objx/lv_roller.c
similarity index 100%
rename from lv_objx/lv_roller.c
rename to src/lv_objx/lv_roller.c
diff --git a/lv_objx/lv_roller.h b/src/lv_objx/lv_roller.h
similarity index 99%
rename from lv_objx/lv_roller.h
rename to src/lv_objx/lv_roller.h
index 7314ed4a2..bb76de7a6 100644
--- a/lv_objx/lv_roller.h
+++ b/src/lv_objx/lv_roller.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_ROLLER != 0
diff --git a/lv_objx/lv_slider.c b/src/lv_objx/lv_slider.c
similarity index 100%
rename from lv_objx/lv_slider.c
rename to src/lv_objx/lv_slider.c
diff --git a/lv_objx/lv_slider.h b/src/lv_objx/lv_slider.h
similarity index 99%
rename from lv_objx/lv_slider.h
rename to src/lv_objx/lv_slider.h
index edf376d08..7339aba6d 100644
--- a/lv_objx/lv_slider.h
+++ b/src/lv_objx/lv_slider.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_SLIDER != 0
diff --git a/lv_objx/lv_spinbox.c b/src/lv_objx/lv_spinbox.c
similarity index 100%
rename from lv_objx/lv_spinbox.c
rename to src/lv_objx/lv_spinbox.c
diff --git a/lv_objx/lv_spinbox.h b/src/lv_objx/lv_spinbox.h
similarity index 99%
rename from lv_objx/lv_spinbox.h
rename to src/lv_objx/lv_spinbox.h
index b387b6a80..ab2e6d1ad 100644
--- a/lv_objx/lv_spinbox.h
+++ b/src/lv_objx/lv_spinbox.h
@@ -17,7 +17,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_SPINBOX != 0
diff --git a/lv_objx/lv_sw.c b/src/lv_objx/lv_sw.c
similarity index 100%
rename from lv_objx/lv_sw.c
rename to src/lv_objx/lv_sw.c
diff --git a/lv_objx/lv_sw.h b/src/lv_objx/lv_sw.h
similarity index 99%
rename from lv_objx/lv_sw.h
rename to src/lv_objx/lv_sw.h
index b8e72ef55..3937cd978 100644
--- a/lv_objx/lv_sw.h
+++ b/src/lv_objx/lv_sw.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_SW != 0
diff --git a/lv_objx/lv_ta.c b/src/lv_objx/lv_ta.c
similarity index 100%
rename from lv_objx/lv_ta.c
rename to src/lv_objx/lv_ta.c
diff --git a/lv_objx/lv_ta.h b/src/lv_objx/lv_ta.h
similarity index 99%
rename from lv_objx/lv_ta.h
rename to src/lv_objx/lv_ta.h
index 3a29998df..58234603d 100644
--- a/lv_objx/lv_ta.h
+++ b/src/lv_objx/lv_ta.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_TA != 0
diff --git a/lv_objx/lv_table.c b/src/lv_objx/lv_table.c
similarity index 100%
rename from lv_objx/lv_table.c
rename to src/lv_objx/lv_table.c
diff --git a/lv_objx/lv_table.h b/src/lv_objx/lv_table.h
similarity index 99%
rename from lv_objx/lv_table.h
rename to src/lv_objx/lv_table.h
index 422566b01..c11dff336 100644
--- a/lv_objx/lv_table.h
+++ b/src/lv_objx/lv_table.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_TABLE != 0
diff --git a/lv_objx/lv_tabview.c b/src/lv_objx/lv_tabview.c
similarity index 100%
rename from lv_objx/lv_tabview.c
rename to src/lv_objx/lv_tabview.c
diff --git a/lv_objx/lv_tabview.h b/src/lv_objx/lv_tabview.h
similarity index 99%
rename from lv_objx/lv_tabview.h
rename to src/lv_objx/lv_tabview.h
index 7a56f3c22..6c451a6a6 100644
--- a/lv_objx/lv_tabview.h
+++ b/src/lv_objx/lv_tabview.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_TABVIEW != 0
diff --git a/lv_objx/lv_tileview.c b/src/lv_objx/lv_tileview.c
similarity index 100%
rename from lv_objx/lv_tileview.c
rename to src/lv_objx/lv_tileview.c
diff --git a/lv_objx/lv_tileview.h b/src/lv_objx/lv_tileview.h
similarity index 99%
rename from lv_objx/lv_tileview.h
rename to src/lv_objx/lv_tileview.h
index c01aa7faa..56748747d 100644
--- a/lv_objx/lv_tileview.h
+++ b/src/lv_objx/lv_tileview.h
@@ -17,7 +17,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_TILEVIEW != 0
diff --git a/lv_objx/lv_win.c b/src/lv_objx/lv_win.c
similarity index 100%
rename from lv_objx/lv_win.c
rename to src/lv_objx/lv_win.c
diff --git a/lv_objx/lv_win.h b/src/lv_objx/lv_win.h
similarity index 99%
rename from lv_objx/lv_win.h
rename to src/lv_objx/lv_win.h
index 37d0fd55e..9a153a2e5 100644
--- a/lv_objx/lv_win.h
+++ b/src/lv_objx/lv_win.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_WIN != 0
diff --git a/lv_porting/lv_port_disp_templ.c b/src/lv_porting/lv_port_disp_templ.c
similarity index 100%
rename from lv_porting/lv_port_disp_templ.c
rename to src/lv_porting/lv_port_disp_templ.c
diff --git a/lv_porting/lv_port_disp_templ.h b/src/lv_porting/lv_port_disp_templ.h
similarity index 100%
rename from lv_porting/lv_port_disp_templ.h
rename to src/lv_porting/lv_port_disp_templ.h
diff --git a/lv_porting/lv_port_fs_templ.c b/src/lv_porting/lv_port_fs_templ.c
similarity index 100%
rename from lv_porting/lv_port_fs_templ.c
rename to src/lv_porting/lv_port_fs_templ.c
diff --git a/lv_porting/lv_port_fs_templ.h b/src/lv_porting/lv_port_fs_templ.h
similarity index 100%
rename from lv_porting/lv_port_fs_templ.h
rename to src/lv_porting/lv_port_fs_templ.h
diff --git a/lv_porting/lv_port_indev_templ.c b/src/lv_porting/lv_port_indev_templ.c
similarity index 100%
rename from lv_porting/lv_port_indev_templ.c
rename to src/lv_porting/lv_port_indev_templ.c
diff --git a/lv_porting/lv_port_indev_templ.h b/src/lv_porting/lv_port_indev_templ.h
similarity index 100%
rename from lv_porting/lv_port_indev_templ.h
rename to src/lv_porting/lv_port_indev_templ.h
diff --git a/lv_themes/lv_theme.c b/src/lv_themes/lv_theme.c
similarity index 100%
rename from lv_themes/lv_theme.c
rename to src/lv_themes/lv_theme.c
diff --git a/lv_themes/lv_theme.h b/src/lv_themes/lv_theme.h
similarity index 99%
rename from lv_themes/lv_theme.h
rename to src/lv_themes/lv_theme.h
index 855699979..96df2a649 100644
--- a/lv_themes/lv_theme.h
+++ b/src/lv_themes/lv_theme.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #include "../lv_core/lv_style.h"
diff --git a/lv_themes/lv_theme_alien.c b/src/lv_themes/lv_theme_alien.c
similarity index 100%
rename from lv_themes/lv_theme_alien.c
rename to src/lv_themes/lv_theme_alien.c
diff --git a/lv_themes/lv_theme_alien.h b/src/lv_themes/lv_theme_alien.h
similarity index 97%
rename from lv_themes/lv_theme_alien.h
rename to src/lv_themes/lv_theme_alien.h
index ca88696ed..e25383d0c 100644
--- a/lv_themes/lv_theme_alien.h
+++ b/src/lv_themes/lv_theme_alien.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_THEME_ALIEN
diff --git a/lv_themes/lv_theme_default.c b/src/lv_themes/lv_theme_default.c
similarity index 100%
rename from lv_themes/lv_theme_default.c
rename to src/lv_themes/lv_theme_default.c
diff --git a/lv_themes/lv_theme_default.h b/src/lv_themes/lv_theme_default.h
similarity index 97%
rename from lv_themes/lv_theme_default.h
rename to src/lv_themes/lv_theme_default.h
index 772d76430..285c60445 100644
--- a/lv_themes/lv_theme_default.h
+++ b/src/lv_themes/lv_theme_default.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_THEME_DEFAULT
diff --git a/lv_themes/lv_theme_material.c b/src/lv_themes/lv_theme_material.c
similarity index 100%
rename from lv_themes/lv_theme_material.c
rename to src/lv_themes/lv_theme_material.c
diff --git a/lv_themes/lv_theme_material.h b/src/lv_themes/lv_theme_material.h
similarity index 97%
rename from lv_themes/lv_theme_material.h
rename to src/lv_themes/lv_theme_material.h
index 572801f2c..61fc323a6 100644
--- a/lv_themes/lv_theme_material.h
+++ b/src/lv_themes/lv_theme_material.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_THEME_MATERIAL
diff --git a/lv_themes/lv_theme_mono.c b/src/lv_themes/lv_theme_mono.c
similarity index 100%
rename from lv_themes/lv_theme_mono.c
rename to src/lv_themes/lv_theme_mono.c
diff --git a/lv_themes/lv_theme_mono.h b/src/lv_themes/lv_theme_mono.h
similarity index 97%
rename from lv_themes/lv_theme_mono.h
rename to src/lv_themes/lv_theme_mono.h
index 8e0e0553a..52665af1f 100644
--- a/lv_themes/lv_theme_mono.h
+++ b/src/lv_themes/lv_theme_mono.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_THEME_MONO
diff --git a/lv_themes/lv_theme_nemo.c b/src/lv_themes/lv_theme_nemo.c
similarity index 100%
rename from lv_themes/lv_theme_nemo.c
rename to src/lv_themes/lv_theme_nemo.c
diff --git a/lv_themes/lv_theme_nemo.h b/src/lv_themes/lv_theme_nemo.h
similarity index 97%
rename from lv_themes/lv_theme_nemo.h
rename to src/lv_themes/lv_theme_nemo.h
index 1f8c70263..92aceb85f 100644
--- a/lv_themes/lv_theme_nemo.h
+++ b/src/lv_themes/lv_theme_nemo.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_THEME_NEMO
diff --git a/lv_themes/lv_theme_night.c b/src/lv_themes/lv_theme_night.c
similarity index 100%
rename from lv_themes/lv_theme_night.c
rename to src/lv_themes/lv_theme_night.c
diff --git a/lv_themes/lv_theme_night.h b/src/lv_themes/lv_theme_night.h
similarity index 97%
rename from lv_themes/lv_theme_night.h
rename to src/lv_themes/lv_theme_night.h
index 7c1270c40..3ea15c370 100644
--- a/lv_themes/lv_theme_night.h
+++ b/src/lv_themes/lv_theme_night.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_THEME_NIGHT
diff --git a/lv_themes/lv_theme_templ.c b/src/lv_themes/lv_theme_templ.c
similarity index 100%
rename from lv_themes/lv_theme_templ.c
rename to src/lv_themes/lv_theme_templ.c
diff --git a/lv_themes/lv_theme_templ.h b/src/lv_themes/lv_theme_templ.h
similarity index 97%
rename from lv_themes/lv_theme_templ.h
rename to src/lv_themes/lv_theme_templ.h
index 9d17c4d9b..02a8a862b 100644
--- a/lv_themes/lv_theme_templ.h
+++ b/src/lv_themes/lv_theme_templ.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_THEME_TEMPL
diff --git a/lv_themes/lv_theme_zen.c b/src/lv_themes/lv_theme_zen.c
similarity index 100%
rename from lv_themes/lv_theme_zen.c
rename to src/lv_themes/lv_theme_zen.c
diff --git a/lv_themes/lv_theme_zen.h b/src/lv_themes/lv_theme_zen.h
similarity index 97%
rename from lv_themes/lv_theme_zen.h
rename to src/lv_themes/lv_theme_zen.h
index b43167335..181411fd0 100644
--- a/lv_themes/lv_theme_zen.h
+++ b/src/lv_themes/lv_theme_zen.h
@@ -16,7 +16,7 @@ extern "C" {
 #ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
 #else
-#include "../../lv_conf.h"
+#include "../../../lv_conf.h"
 #endif
 
 #if LV_USE_THEME_ZEN
diff --git a/lv_themes/lv_themes.mk b/src/lv_themes/lv_themes.mk
similarity index 62%
rename from lv_themes/lv_themes.mk
rename to src/lv_themes/lv_themes.mk
index 0e4a81a54..fce41e4e1 100644
--- a/lv_themes/lv_themes.mk
+++ b/src/lv_themes/lv_themes.mk
@@ -8,7 +8,7 @@ CSRCS += lv_theme_material.c
 CSRCS += lv_theme_nemo.c
 CSRCS += lv_theme_mono.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/lv_themes
-VPATH += :$(LVGL_DIR)/lvgl/lv_themes
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_themes
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_themes
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_themes"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_themes"
diff --git a/lv_version.h b/src/lv_version.h
similarity index 100%
rename from lv_version.h
rename to src/lv_version.h