diff --git a/lvgl.h b/lvgl.h
index 83c296f4f..7415cd05c 100644
--- a/lvgl.h
+++ b/lvgl.h
@@ -22,45 +22,45 @@ extern "C" {
  *      INCLUDES
  *********************/
 
-#include "src/lv_misc/lv_log.h"
-#include "src/lv_misc/lv_timer.h"
-#include "src/lv_misc/lv_math.h"
-#include "src/lv_misc/lv_async.h"
+#include "src/misc/lv_log.h"
+#include "src/misc/lv_timer.h"
+#include "src/misc/lv_math.h"
+#include "src/misc/lv_async.h"
 
-#include "src/lv_hal/lv_hal.h"
+#include "src/hal/lv_hal.h"
 
-#include "src/lv_core/lv_obj.h"
-#include "src/lv_core/lv_group.h"
-#include "src/lv_core/lv_indev.h"
+#include "src/core/lv_obj.h"
+#include "src/core/lv_group.h"
+#include "src/core/lv_indev.h"
 
-#include "src/lv_core/lv_refr.h"
-#include "src/lv_core/lv_disp.h"
-#include "src/lv_core/lv_theme.h"
+#include "src/core/lv_refr.h"
+#include "src/core/lv_disp.h"
+#include "src/core/lv_theme.h"
 
-#include "src/lv_font/lv_font.h"
-#include "src/lv_font/lv_font_loader.h"
-#include "src/lv_font/lv_font_fmt_txt.h"
-#include "src/lv_misc/lv_printf.h"
+#include "src/font/lv_font.h"
+#include "src/font/lv_font_loader.h"
+#include "src/font/lv_font_fmt_txt.h"
+#include "src/misc/lv_printf.h"
 
-#include "src/lv_widgets/lv_arc.h"
-#include "src/lv_widgets/lv_btn.h"
-#include "src/lv_widgets/lv_img.h"
-#include "src/lv_widgets/lv_label.h"
-#include "src/lv_widgets/lv_line.h"
-#include "src/lv_widgets/lv_chart.h"
-#include "src/lv_widgets/lv_table.h"
-#include "src/lv_widgets/lv_checkbox.h"
-#include "src/lv_widgets/lv_bar.h"
-#include "src/lv_widgets/lv_slider.h"
-#include "src/lv_widgets/lv_btnmatrix.h"
-#include "src/lv_widgets/lv_dropdown.h"
-#include "src/lv_widgets/lv_roller.h"
-#include "src/lv_widgets/lv_textarea.h"
-#include "src/lv_widgets/lv_canvas.h"
-#include "src/lv_widgets/lv_meter.h"
-#include "src/lv_widgets/lv_switch.h"
+#include "src/widgets/lv_arc.h"
+#include "src/widgets/lv_btn.h"
+#include "src/widgets/lv_img.h"
+#include "src/widgets/lv_label.h"
+#include "src/widgets/lv_line.h"
+#include "src/widgets/lv_chart.h"
+#include "src/widgets/lv_table.h"
+#include "src/widgets/lv_checkbox.h"
+#include "src/widgets/lv_bar.h"
+#include "src/widgets/lv_slider.h"
+#include "src/widgets/lv_btnmatrix.h"
+#include "src/widgets/lv_dropdown.h"
+#include "src/widgets/lv_roller.h"
+#include "src/widgets/lv_textarea.h"
+#include "src/widgets/lv_canvas.h"
+#include "src/widgets/lv_meter.h"
+#include "src/widgets/lv_switch.h"
 
-#include "src/lv_draw/lv_img_cache.h"
+#include "src/draw/lv_img_cache.h"
 
 #include "src/lv_api_map.h"
 
diff --git a/src/lv_core/lv_core.mk b/src/core/lv_core.mk
similarity index 100%
rename from src/lv_core/lv_core.mk
rename to src/core/lv_core.mk
diff --git a/src/lv_core/lv_disp.c b/src/core/lv_disp.c
similarity index 99%
rename from src/lv_core/lv_disp.c
rename to src/core/lv_disp.c
index 728074afa..0390b9cb8 100644
--- a/src/lv_core/lv_disp.c
+++ b/src/core/lv_disp.c
@@ -7,8 +7,8 @@
  *      INCLUDES
  *********************/
 #include "lv_disp.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_core/lv_refr.h"
+#include "../misc/lv_math.h"
+#include "../core/lv_refr.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_core/lv_disp.h b/src/core/lv_disp.h
similarity index 99%
rename from src/lv_core/lv_disp.h
rename to src/core/lv_disp.h
index f2fbd7a46..7821c96d8 100644
--- a/src/lv_core/lv_disp.h
+++ b/src/core/lv_disp.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_hal/lv_hal.h"
+#include "../hal/lv_hal.h"
 #include "lv_obj.h"
 #include "lv_theme.h"
 
diff --git a/src/lv_core/lv_group.c b/src/core/lv_group.c
similarity index 99%
rename from src/lv_core/lv_group.c
rename to src/core/lv_group.c
index d3c400072..e17723156 100644
--- a/src/lv_core/lv_group.c
+++ b/src/core/lv_group.c
@@ -9,8 +9,8 @@
 #include <stddef.h>
 
 #include "lv_group.h"
-#include "../lv_misc/lv_gc.h"
-#include "../lv_core/lv_obj.h"
+#include "../misc/lv_gc.h"
+#include "../core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_core/lv_group.h b/src/core/lv_group.h
similarity index 99%
rename from src/lv_core/lv_group.h
rename to src/core/lv_group.h
index 9300b8a66..a3da5f1a9 100644
--- a/src/lv_core/lv_group.h
+++ b/src/core/lv_group.h
@@ -18,8 +18,8 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "../lv_misc/lv_ll.h"
-#include "../lv_misc/lv_types.h"
+#include "../misc/lv_ll.h"
+#include "../misc/lv_types.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_core/lv_indev.c b/src/core/lv_indev.c
similarity index 99%
rename from src/lv_core/lv_indev.c
rename to src/core/lv_indev.c
index f944659ae..4a34ea6b8 100644
--- a/src/lv_core/lv_indev.c
+++ b/src/core/lv_indev.c
@@ -13,9 +13,9 @@
 #include "lv_group.h"
 #include "lv_refr.h"
 
-#include "../lv_hal/lv_hal_tick.h"
-#include "../lv_misc/lv_timer.h"
-#include "../lv_misc/lv_math.h"
+#include "../hal/lv_hal_tick.h"
+#include "../misc/lv_timer.h"
+#include "../misc/lv_math.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_core/lv_indev.h b/src/core/lv_indev.h
similarity index 99%
rename from src/lv_core/lv_indev.h
rename to src/core/lv_indev.h
index 0f5946578..724311ecc 100644
--- a/src/lv_core/lv_indev.h
+++ b/src/core/lv_indev.h
@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_obj.h"
-#include "../lv_hal/lv_hal_indev.h"
+#include "../hal/lv_hal_indev.h"
 #include "lv_group.h"
 
 /*********************
diff --git a/src/lv_core/lv_indev_scroll.c b/src/core/lv_indev_scroll.c
similarity index 100%
rename from src/lv_core/lv_indev_scroll.c
rename to src/core/lv_indev_scroll.c
diff --git a/src/lv_core/lv_indev_scroll.h b/src/core/lv_indev_scroll.h
similarity index 100%
rename from src/lv_core/lv_indev_scroll.h
rename to src/core/lv_indev_scroll.h
diff --git a/src/lv_core/lv_obj.c b/src/core/lv_obj.c
similarity index 98%
rename from src/lv_core/lv_obj.c
rename to src/core/lv_obj.c
index f4952deed..910d56c9a 100644
--- a/src/lv_core/lv_obj.c
+++ b/src/core/lv_obj.c
@@ -12,21 +12,21 @@
 #include "lv_group.h"
 #include "lv_disp.h"
 #include "lv_theme.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_misc/lv_anim.h"
-#include "../lv_misc/lv_timer.h"
-#include "../lv_misc/lv_async.h"
-#include "../lv_misc/lv_fs.h"
-#include "../lv_misc/lv_gc.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_log.h"
-#include "../lv_hal/lv_hal.h"
+#include "../misc/lv_assert.h"
+#include "../draw/lv_draw.h"
+#include "../misc/lv_anim.h"
+#include "../misc/lv_timer.h"
+#include "../misc/lv_async.h"
+#include "../misc/lv_fs.h"
+#include "../misc/lv_gc.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_log.h"
+#include "../hal/lv_hal.h"
 #include <stdint.h>
 #include <string.h>
 
 #if LV_USE_GPU_STM32_DMA2D
-    #include "../lv_gpu/lv_gpu_stm32_dma2d.h"
+    #include "../gpu/gpu_stm32_dma2d.h"
 #endif
 
 /*********************
diff --git a/src/lv_core/lv_obj.h b/src/core/lv_obj.h
similarity index 99%
rename from src/lv_core/lv_obj.h
rename to src/core/lv_obj.h
index 6f9cad04d..2ba6cd151 100644
--- a/src/lv_core/lv_obj.h
+++ b/src/core/lv_obj.h
@@ -17,12 +17,12 @@ extern "C" {
 
 #include <stddef.h>
 #include <stdbool.h>
-#include "../lv_misc/lv_style.h"
-#include "../lv_misc/lv_types.h"
-#include "../lv_misc/lv_area.h"
-#include "../lv_misc/lv_color.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_hal/lv_hal.h"
+#include "../misc/lv_style.h"
+#include "../misc/lv_types.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_assert.h"
+#include "../hal/lv_hal.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_core/lv_obj_class.c b/src/core/lv_obj_class.c
similarity index 100%
rename from src/lv_core/lv_obj_class.c
rename to src/core/lv_obj_class.c
diff --git a/src/lv_core/lv_obj_class.h b/src/core/lv_obj_class.h
similarity index 100%
rename from src/lv_core/lv_obj_class.h
rename to src/core/lv_obj_class.h
diff --git a/src/lv_core/lv_obj_draw.c b/src/core/lv_obj_draw.c
similarity index 100%
rename from src/lv_core/lv_obj_draw.c
rename to src/core/lv_obj_draw.c
diff --git a/src/lv_core/lv_obj_draw.h b/src/core/lv_obj_draw.h
similarity index 99%
rename from src/lv_core/lv_obj_draw.h
rename to src/core/lv_obj_draw.h
index effa96420..1ce08709e 100644
--- a/src/lv_core/lv_obj_draw.h
+++ b/src/core/lv_obj_draw.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_draw/lv_draw.h"
+#include "../draw/lv_draw.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_core/lv_obj_pos.c b/src/core/lv_obj_pos.c
similarity index 100%
rename from src/lv_core/lv_obj_pos.c
rename to src/core/lv_obj_pos.c
diff --git a/src/lv_core/lv_obj_pos.h b/src/core/lv_obj_pos.h
similarity index 99%
rename from src/lv_core/lv_obj_pos.h
rename to src/core/lv_obj_pos.h
index 6eaff866f..8f4f91f34 100644
--- a/src/lv_core/lv_obj_pos.h
+++ b/src/core/lv_obj_pos.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_misc/lv_area.h"
+#include "../misc/lv_area.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_core/lv_obj_scroll.c b/src/core/lv_obj_scroll.c
similarity index 100%
rename from src/lv_core/lv_obj_scroll.c
rename to src/core/lv_obj_scroll.c
diff --git a/src/lv_core/lv_obj_scroll.h b/src/core/lv_obj_scroll.h
similarity index 99%
rename from src/lv_core/lv_obj_scroll.h
rename to src/core/lv_obj_scroll.h
index ad3e7a02b..4a6bf4d20 100644
--- a/src/lv_core/lv_obj_scroll.h
+++ b/src/core/lv_obj_scroll.h
@@ -13,8 +13,8 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_misc/lv_area.h"
-#include "../lv_misc/lv_anim.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_anim.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_core/lv_obj_style.c b/src/core/lv_obj_style.c
similarity index 99%
rename from src/lv_core/lv_obj_style.c
rename to src/core/lv_obj_style.c
index 81dd3b166..405fa9178 100644
--- a/src/lv_core/lv_obj_style.c
+++ b/src/core/lv_obj_style.c
@@ -8,7 +8,7 @@
  *********************/
 #include "lv_obj.h"
 #include "lv_disp.h"
-#include "../lv_misc/lv_gc.h"
+#include "../misc/lv_gc.h"
 
 #if defined(LV_GC_INCLUDE)
     #include LV_GC_INCLUDE
diff --git a/src/lv_core/lv_obj_style.h b/src/core/lv_obj_style.h
similarity index 100%
rename from src/lv_core/lv_obj_style.h
rename to src/core/lv_obj_style.h
diff --git a/src/lv_core/lv_obj_style_gen.h b/src/core/lv_obj_style_gen.h
similarity index 100%
rename from src/lv_core/lv_obj_style_gen.h
rename to src/core/lv_obj_style_gen.h
diff --git a/src/lv_core/lv_obj_tree.c b/src/core/lv_obj_tree.c
similarity index 99%
rename from src/lv_core/lv_obj_tree.c
rename to src/core/lv_obj_tree.c
index 5096e992c..b0eb00a0d 100644
--- a/src/lv_core/lv_obj_tree.c
+++ b/src/core/lv_obj_tree.c
@@ -8,9 +8,9 @@
  *********************/
 #include "lv_obj.h"
 #include "lv_indev.h"
-#include "../lv_misc/lv_anim.h"
-#include "../lv_misc/lv_gc.h"
-#include "../lv_misc/lv_async.h"
+#include "../misc/lv_anim.h"
+#include "../misc/lv_gc.h"
+#include "../misc/lv_async.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_core/lv_obj_tree.h b/src/core/lv_obj_tree.h
similarity index 100%
rename from src/lv_core/lv_obj_tree.h
rename to src/core/lv_obj_tree.h
diff --git a/src/lv_core/lv_refr.c b/src/core/lv_refr.c
similarity index 98%
rename from src/lv_core/lv_refr.c
rename to src/core/lv_refr.c
index c62938f12..f9a6cd25d 100644
--- a/src/lv_core/lv_refr.c
+++ b/src/core/lv_refr.c
@@ -9,18 +9,17 @@
 #include <stddef.h>
 #include "lv_refr.h"
 #include "lv_disp.h"
-#include "../lv_hal/lv_hal_tick.h"
-#include "../lv_hal/lv_hal_disp.h"
-#include "../lv_misc/lv_timer.h"
-#include "../lv_misc/lv_mem.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_gc.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_font/lv_font_fmt_txt.h"
-#include "../lv_gpu/lv_gpu_stm32_dma2d.h"
+#include "../hal/lv_hal_tick.h"
+#include "../hal/lv_hal_disp.h"
+#include "../misc/lv_timer.h"
+#include "../misc/lv_mem.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_gc.h"
+#include "../draw/lv_draw.h"
+#include "../font/lv_font_fmt_txt.h"
 
 #if LV_USE_PERF_MONITOR || LV_USE_MEM_MONITOR
-    #include "../lv_widgets/lv_label.h"
+    #include "../widgets/lv_label.h"
 #endif
 
 /*********************
diff --git a/src/lv_core/lv_refr.h b/src/core/lv_refr.h
similarity index 100%
rename from src/lv_core/lv_refr.h
rename to src/core/lv_refr.h
diff --git a/src/lv_core/lv_theme.c b/src/core/lv_theme.c
similarity index 100%
rename from src/lv_core/lv_theme.c
rename to src/core/lv_theme.c
diff --git a/src/lv_core/lv_theme.h b/src/core/lv_theme.h
similarity index 98%
rename from src/lv_core/lv_theme.h
rename to src/core/lv_theme.h
index 07afdd65e..ae971f874 100644
--- a/src/lv_core/lv_theme.h
+++ b/src/core/lv_theme.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *    INCLUDES
  *********************/
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 
 /*********************
  *    DEFINES
diff --git a/src/lv_draw/lv_draw.h b/src/draw/lv_draw.h
similarity index 93%
rename from src/lv_draw/lv_draw.h
rename to src/draw/lv_draw.h
index 5d5e099a2..b3985f86c 100644
--- a/src/lv_draw/lv_draw.h
+++ b/src/draw/lv_draw.h
@@ -15,8 +15,8 @@ extern "C" {
  *********************/
 #include "../lv_conf_internal.h"
 
-#include "../lv_misc/lv_style.h"
-#include "../lv_misc/lv_txt.h"
+#include "../misc/lv_style.h"
+#include "../misc/lv_txt.h"
 #include "lv_img_decoder.h"
 
 #include "lv_draw_rect.h"
diff --git a/src/lv_draw/lv_draw.mk b/src/draw/lv_draw.mk
similarity index 100%
rename from src/lv_draw/lv_draw.mk
rename to src/draw/lv_draw.mk
diff --git a/src/lv_draw/lv_draw_arc.c b/src/draw/lv_draw_arc.c
similarity index 99%
rename from src/lv_draw/lv_draw_arc.c
rename to src/draw/lv_draw_arc.c
index 9c06dd7a5..1e9940d7b 100644
--- a/src/lv_draw/lv_draw_arc.c
+++ b/src/draw/lv_draw_arc.c
@@ -9,9 +9,9 @@
 #include "lv_draw_arc.h"
 #include "lv_draw_rect.h"
 #include "lv_draw_mask.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_log.h"
-#include "../lv_misc/lv_mem.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_log.h"
+#include "../misc/lv_mem.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_draw_arc.h b/src/draw/lv_draw_arc.h
similarity index 100%
rename from src/lv_draw/lv_draw_arc.h
rename to src/draw/lv_draw_arc.h
diff --git a/src/lv_draw/lv_draw_blend.c b/src/draw/lv_draw_blend.c
similarity index 99%
rename from src/lv_draw/lv_draw_blend.c
rename to src/draw/lv_draw_blend.c
index 8ebdbce34..86f12acb1 100644
--- a/src/lv_draw/lv_draw_blend.c
+++ b/src/draw/lv_draw_blend.c
@@ -8,16 +8,16 @@
  *********************/
 #include "lv_draw_blend.h"
 #include "lv_img_decoder.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_hal/lv_hal_disp.h"
-#include "../lv_core/lv_refr.h"
+#include "../misc/lv_math.h"
+#include "../hal/lv_hal_disp.h"
+#include "../core/lv_refr.h"
 
 #if LV_USE_GPU_NXP_PXP
-    #include "../lv_gpu/lv_gpu_nxp_pxp.h"
+    #include "../gpu/gpu_nxp_pxp.h"
 #elif LV_USE_GPU_NXP_VG_LITE
-    #include "../lv_gpu/lv_gpu_nxp_vglite.h"
+    #include "../gpu/gpu_nxp_vglite.h"
 #elif LV_USE_GPU_STM32_DMA2D
-    #include "../lv_gpu/lv_gpu_stm32_dma2d.h"
+    #include "../gpu/gpu_stm32_dma2d.h"
 #endif
 
 /*********************
diff --git a/src/lv_draw/lv_draw_blend.h b/src/draw/lv_draw_blend.h
similarity index 92%
rename from src/lv_draw/lv_draw_blend.h
rename to src/draw/lv_draw_blend.h
index 29f57c4ea..fb1f9f8d6 100644
--- a/src/lv_draw/lv_draw_blend.h
+++ b/src/draw/lv_draw_blend.h
@@ -13,9 +13,9 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_misc/lv_color.h"
-#include "../lv_misc/lv_area.h"
-#include "../lv_misc/lv_style.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_style.h"
 #include "lv_draw_mask.h"
 
 /*********************
diff --git a/src/lv_draw/lv_draw_img.c b/src/draw/lv_draw_img.c
similarity index 98%
rename from src/lv_draw/lv_draw_img.c
rename to src/draw/lv_draw_img.c
index ba0296ac1..c2eb1edfa 100644
--- a/src/lv_draw/lv_draw_img.c
+++ b/src/draw/lv_draw_img.c
@@ -8,15 +8,15 @@
  *********************/
 #include "lv_draw_img.h"
 #include "lv_img_cache.h"
-#include "../lv_hal/lv_hal_disp.h"
-#include "../lv_misc/lv_log.h"
-#include "../lv_core/lv_refr.h"
-#include "../lv_misc/lv_mem.h"
-#include "../lv_misc/lv_math.h"
+#include "../hal/lv_hal_disp.h"
+#include "../misc/lv_log.h"
+#include "../core/lv_refr.h"
+#include "../misc/lv_mem.h"
+#include "../misc/lv_math.h"
 #if LV_USE_GPU_STM32_DMA2D
-    #include "../lv_gpu/lv_gpu_stm32_dma2d.h"
+    #include "../gpu/gpu_stm32_dma2d.h"
 #elif LV_USE_GPU_NXP_PXP
-    #include "../lv_gpu/lv_gpu_nxp_pxp.h"
+    #include "../gpu/gpu_nxp_pxp.h"
 #endif
 
 /*********************
diff --git a/src/lv_draw/lv_draw_img.h b/src/draw/lv_draw_img.h
similarity index 100%
rename from src/lv_draw/lv_draw_img.h
rename to src/draw/lv_draw_img.h
diff --git a/src/lv_draw/lv_draw_label.c b/src/draw/lv_draw_label.c
similarity index 99%
rename from src/lv_draw/lv_draw_label.c
rename to src/draw/lv_draw_label.c
index 781ca3935..5f3f5cb7a 100644
--- a/src/lv_draw/lv_draw_label.c
+++ b/src/draw/lv_draw_label.c
@@ -7,11 +7,11 @@
  *      INCLUDES
  *********************/
 #include "lv_draw_label.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_hal/lv_hal_disp.h"
-#include "../lv_core/lv_refr.h"
-#include "../lv_misc/lv_bidi.h"
-#include "../lv_misc/lv_assert.h"
+#include "../misc/lv_math.h"
+#include "../hal/lv_hal_disp.h"
+#include "../core/lv_refr.h"
+#include "../misc/lv_bidi.h"
+#include "../misc/lv_assert.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_draw_label.h b/src/draw/lv_draw_label.h
similarity index 96%
rename from src/lv_draw/lv_draw_label.h
rename to src/draw/lv_draw_label.h
index 69d6f0973..cf8357755 100644
--- a/src/lv_draw/lv_draw_label.h
+++ b/src/draw/lv_draw_label.h
@@ -14,9 +14,9 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_draw_blend.h"
-#include "../lv_misc/lv_bidi.h"
-#include "../lv_misc/lv_txt.h"
-#include "../lv_misc/lv_color.h"
+#include "../misc/lv_bidi.h"
+#include "../misc/lv_txt.h"
+#include "../misc/lv_color.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_draw_line.c b/src/draw/lv_draw_line.c
similarity index 99%
rename from src/lv_draw/lv_draw_line.c
rename to src/draw/lv_draw_line.c
index f2fb9b369..622149008 100644
--- a/src/lv_draw/lv_draw_line.c
+++ b/src/draw/lv_draw_line.c
@@ -10,8 +10,8 @@
 #include <stdbool.h>
 #include "lv_draw_mask.h"
 #include "lv_draw_blend.h"
-#include "../lv_core/lv_refr.h"
-#include "../lv_misc/lv_math.h"
+#include "../core/lv_refr.h"
+#include "../misc/lv_math.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_draw_line.h b/src/draw/lv_draw_line.h
similarity index 100%
rename from src/lv_draw/lv_draw_line.h
rename to src/draw/lv_draw_line.h
diff --git a/src/lv_draw/lv_draw_mask.c b/src/draw/lv_draw_mask.c
similarity index 99%
rename from src/lv_draw/lv_draw_mask.c
rename to src/draw/lv_draw_mask.c
index 68d2d068b..73ecef52f 100644
--- a/src/lv_draw/lv_draw_mask.c
+++ b/src/draw/lv_draw_mask.c
@@ -10,10 +10,10 @@
 
 #include "lv_draw_mask.h"
 #if LV_DRAW_COMPLEX
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_log.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_misc/lv_gc.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_log.h"
+#include "../misc/lv_assert.h"
+#include "../misc/lv_gc.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_draw_mask.h b/src/draw/lv_draw_mask.h
similarity index 99%
rename from src/lv_draw/lv_draw_mask.h
rename to src/draw/lv_draw_mask.h
index 5aa15c086..a0be7d8dd 100644
--- a/src/lv_draw/lv_draw_mask.h
+++ b/src/draw/lv_draw_mask.h
@@ -15,9 +15,9 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include <stdbool.h>
-#include "../lv_misc/lv_area.h"
-#include "../lv_misc/lv_color.h"
-#include "../lv_misc/lv_math.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_math.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_draw_rect.c b/src/draw/lv_draw_rect.c
similarity index 99%
rename from src/lv_draw/lv_draw_rect.c
rename to src/draw/lv_draw_rect.c
index 8e2ab4869..694dade98 100644
--- a/src/lv_draw/lv_draw_rect.c
+++ b/src/draw/lv_draw_rect.c
@@ -9,10 +9,10 @@
 #include "lv_draw_rect.h"
 #include "lv_draw_blend.h"
 #include "lv_draw_mask.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_txt_ap.h"
-#include "../lv_core/lv_refr.h"
-#include "../lv_misc/lv_assert.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_txt_ap.h"
+#include "../core/lv_refr.h"
+#include "../misc/lv_assert.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_draw_rect.h b/src/draw/lv_draw_rect.h
similarity index 98%
rename from src/lv_draw/lv_draw_rect.h
rename to src/draw/lv_draw_rect.h
index 7485ab1f6..a6203c73d 100644
--- a/src/lv_draw/lv_draw_rect.h
+++ b/src/draw/lv_draw_rect.h
@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_draw_blend.h"
-#include "../lv_font/lv_font.h"
+#include "../font/lv_font.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_draw_triangle.c b/src/draw/lv_draw_triangle.c
similarity index 99%
rename from src/lv_draw/lv_draw_triangle.c
rename to src/draw/lv_draw_triangle.c
index 17f562aad..4ed514cce 100644
--- a/src/lv_draw/lv_draw_triangle.c
+++ b/src/draw/lv_draw_triangle.c
@@ -7,8 +7,8 @@
  *      INCLUDES
  *********************/
 #include "lv_draw_triangle.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_mem.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_mem.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_draw_triangle.h b/src/draw/lv_draw_triangle.h
similarity index 100%
rename from src/lv_draw/lv_draw_triangle.h
rename to src/draw/lv_draw_triangle.h
diff --git a/src/lv_draw/lv_img_buf.c b/src/draw/lv_img_buf.c
similarity index 99%
rename from src/lv_draw/lv_img_buf.c
rename to src/draw/lv_img_buf.c
index f3d834eaf..ba07ad1a7 100644
--- a/src/lv_draw/lv_img_buf.c
+++ b/src/draw/lv_img_buf.c
@@ -10,9 +10,9 @@
 #include <string.h>
 #include "lv_img_buf.h"
 #include "lv_draw_img.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_log.h"
-#include "../lv_misc/lv_mem.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_log.h"
+#include "../misc/lv_mem.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_img_buf.h b/src/draw/lv_img_buf.h
similarity index 99%
rename from src/lv_draw/lv_img_buf.h
rename to src/draw/lv_img_buf.h
index e39b59c0a..c0faa4231 100644
--- a/src/lv_draw/lv_img_buf.h
+++ b/src/draw/lv_img_buf.h
@@ -14,8 +14,8 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include <stdbool.h>
-#include "../lv_misc/lv_color.h"
-#include "../lv_misc/lv_area.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_area.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_img_cache.c b/src/draw/lv_img_cache.c
similarity index 98%
rename from src/lv_draw/lv_img_cache.c
rename to src/draw/lv_img_cache.c
index c5f1481fa..84d9d0f26 100644
--- a/src/lv_draw/lv_img_cache.c
+++ b/src/draw/lv_img_cache.c
@@ -6,12 +6,12 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_misc/lv_assert.h"
+#include "../misc/lv_assert.h"
 #include "lv_img_cache.h"
 #include "lv_img_decoder.h"
 #include "lv_draw_img.h"
-#include "../lv_hal/lv_hal_tick.h"
-#include "../lv_misc/lv_gc.h"
+#include "../hal/lv_hal_tick.h"
+#include "../misc/lv_gc.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_img_cache.h b/src/draw/lv_img_cache.h
similarity index 100%
rename from src/lv_draw/lv_img_cache.h
rename to src/draw/lv_img_cache.h
diff --git a/src/lv_draw/lv_img_decoder.c b/src/draw/lv_img_decoder.c
similarity index 99%
rename from src/lv_draw/lv_img_decoder.c
rename to src/draw/lv_img_decoder.c
index 391235cf4..459bc5e6a 100644
--- a/src/lv_draw/lv_img_decoder.c
+++ b/src/draw/lv_img_decoder.c
@@ -7,10 +7,10 @@
  *      INCLUDES
  *********************/
 #include "lv_img_decoder.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_draw/lv_draw_img.h"
-#include "../lv_misc/lv_ll.h"
-#include "../lv_misc/lv_gc.h"
+#include "../misc/lv_assert.h"
+#include "../draw/lv_draw_img.h"
+#include "../misc/lv_ll.h"
+#include "../misc/lv_gc.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_draw/lv_img_decoder.h b/src/draw/lv_img_decoder.h
similarity index 99%
rename from src/lv_draw/lv_img_decoder.h
rename to src/draw/lv_img_decoder.h
index 8eea0d212..351db8f44 100644
--- a/src/lv_draw/lv_img_decoder.h
+++ b/src/draw/lv_img_decoder.h
@@ -17,9 +17,9 @@ extern "C" {
 
 #include <stdint.h>
 #include "lv_img_buf.h"
-#include "../lv_misc/lv_fs.h"
-#include "../lv_misc/lv_types.h"
-#include "../lv_misc/lv_area.h"
+#include "../misc/lv_fs.h"
+#include "../misc/lv_types.h"
+#include "../misc/lv_area.h"
 
 /*********************
  *      DEFINES
diff --git a/src/extra/layouts/flex/lv_flex.h b/src/extra/layouts/flex/lv_flex.h
index 3a82fd602..138787f10 100644
--- a/src/extra/layouts/flex/lv_flex.h
+++ b/src/extra/layouts/flex/lv_flex.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 #if LV_USE_FLEX
 
 /*********************
diff --git a/src/extra/layouts/grid/lv_grid.h b/src/extra/layouts/grid/lv_grid.h
index 512a4ee55..da5db17ea 100644
--- a/src/extra/layouts/grid/lv_grid.h
+++ b/src/extra/layouts/grid/lv_grid.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/src/extra/themes/default/lv_theme_default.c b/src/extra/themes/default/lv_theme_default.c
index 63ca10fc5..7a37ed535 100644
--- a/src/extra/themes/default/lv_theme_default.c
+++ b/src/extra/themes/default/lv_theme_default.c
@@ -11,7 +11,7 @@
 #if LV_USE_THEME_DEFAULT
 
 #include "lv_theme_default.h"
-#include "../../../lv_misc/lv_gc.h"
+#include "../../../misc/lv_gc.h"
 
 #if defined(LV_GC_INCLUDE)
 #include LV_GC_INCLUDE
diff --git a/src/extra/themes/default/lv_theme_default.h b/src/extra/themes/default/lv_theme_default.h
index a0a8a7ea1..40671282f 100644
--- a/src/extra/themes/default/lv_theme_default.h
+++ b/src/extra/themes/default/lv_theme_default.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 
 #if LV_USE_THEME_DEFAULT
 
diff --git a/src/extra/widgets/calendar/lv_calendar.h b/src/extra/widgets/calendar/lv_calendar.h
index 66380b822..9a03e002f 100644
--- a/src/extra/widgets/calendar/lv_calendar.h
+++ b/src/extra/widgets/calendar/lv_calendar.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_widgets/lv_btnmatrix.h"
+#include "../../../widgets/lv_btnmatrix.h"
 
 #if LV_USE_CALENDAR
 
diff --git a/src/extra/widgets/calendar/lv_calendar_header_arrow.c b/src/extra/widgets/calendar/lv_calendar_header_arrow.c
index e7bb45a6c..874746e0e 100644
--- a/src/extra/widgets/calendar/lv_calendar_header_arrow.c
+++ b/src/extra/widgets/calendar/lv_calendar_header_arrow.c
@@ -10,8 +10,8 @@
 #if LV_USE_CALENDAR_HEADER_ARROW
 
 #include "lv_calendar.h"
-#include "../../../lv_widgets/lv_btn.h"
-#include "../../../lv_widgets/lv_label.h"
+#include "../../../widgets/lv_btn.h"
+#include "../../../widgets/lv_label.h"
 #include "../../layouts/flex/lv_flex.h"
 
 /*********************
diff --git a/src/extra/widgets/calendar/lv_calendar_header_arrow.h b/src/extra/widgets/calendar/lv_calendar_header_arrow.h
index 6e71b6164..5e1a4d97a 100644
--- a/src/extra/widgets/calendar/lv_calendar_header_arrow.h
+++ b/src/extra/widgets/calendar/lv_calendar_header_arrow.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 #if LV_USE_CALENDAR_HEADER_ARROW
 
 /*********************
diff --git a/src/extra/widgets/calendar/lv_calendar_header_dropdown.c b/src/extra/widgets/calendar/lv_calendar_header_dropdown.c
index e7a6d8161..c795b883b 100644
--- a/src/extra/widgets/calendar/lv_calendar_header_dropdown.c
+++ b/src/extra/widgets/calendar/lv_calendar_header_dropdown.c
@@ -10,7 +10,7 @@
 #if LV_USE_CALENDAR_HEADER_DROPDOWN
 
 #include "lv_calendar.h"
-#include "../../../lv_widgets/lv_dropdown.h"
+#include "../../../widgets/lv_dropdown.h"
 #include "../../layouts/flex/lv_flex.h"
 
 /*********************
diff --git a/src/extra/widgets/calendar/lv_calendar_header_dropdown.h b/src/extra/widgets/calendar/lv_calendar_header_dropdown.h
index efaebbce1..d218228ae 100644
--- a/src/extra/widgets/calendar/lv_calendar_header_dropdown.h
+++ b/src/extra/widgets/calendar/lv_calendar_header_dropdown.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 #if LV_USE_CALENDAR_HEADER_DROPDOWN
 
 /*********************
diff --git a/src/extra/widgets/keyboard/lv_keyboard.c b/src/extra/widgets/keyboard/lv_keyboard.c
index fa3acf293..e55824896 100644
--- a/src/extra/widgets/keyboard/lv_keyboard.c
+++ b/src/extra/widgets/keyboard/lv_keyboard.c
@@ -10,7 +10,7 @@
 #include "lv_keyboard.h"
 #if LV_USE_KEYBOARD
 
-#include "../../../lv_widgets/lv_textarea.h"
+#include "../../../widgets/lv_textarea.h"
 
 /*********************
  *      DEFINES
diff --git a/src/extra/widgets/keyboard/lv_keyboard.h b/src/extra/widgets/keyboard/lv_keyboard.h
index 69325cedd..3a34a55dc 100644
--- a/src/extra/widgets/keyboard/lv_keyboard.h
+++ b/src/extra/widgets/keyboard/lv_keyboard.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_widgets/lv_btnmatrix.h"
+#include "../../../widgets/lv_btnmatrix.h"
 
 #if LV_USE_KEYBOARD
 
diff --git a/src/extra/widgets/list/lv_list.c b/src/extra/widgets/list/lv_list.c
index 11342e476..56b190856 100644
--- a/src/extra/widgets/list/lv_list.c
+++ b/src/extra/widgets/list/lv_list.c
@@ -7,10 +7,10 @@
  *      INCLUDES
  *********************/
 #include "lv_list.h"
-#include "../../../lv_core/lv_disp.h"
-#include "../../../lv_widgets/lv_label.h"
-#include "../../../lv_widgets/lv_img.h"
-#include "../../../lv_widgets/lv_btn.h"
+#include "../../../core/lv_disp.h"
+#include "../../../widgets/lv_label.h"
+#include "../../../widgets/lv_img.h"
+#include "../../../widgets/lv_btn.h"
 
 #if LV_USE_LIST
 
diff --git a/src/extra/widgets/list/lv_list.h b/src/extra/widgets/list/lv_list.h
index e2b133569..16de9a45a 100644
--- a/src/extra/widgets/list/lv_list.h
+++ b/src/extra/widgets/list/lv_list.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 #include "../../layouts/flex/lv_flex.h"
 
 #if LV_USE_LIST
diff --git a/src/extra/widgets/tileview/lv_tileview.h b/src/extra/widgets/tileview/lv_tileview.h
index 1e31ac06b..e8703563e 100644
--- a/src/extra/widgets/tileview/lv_tileview.h
+++ b/src/extra/widgets/tileview/lv_tileview.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 
 #if LV_USE_TILEVIEW
 
diff --git a/src/lv_font/lv_font.c b/src/font/lv_font.c
similarity index 96%
rename from src/lv_font/lv_font.c
rename to src/font/lv_font.c
index 9e3ec2201..5af902c57 100644
--- a/src/lv_font/lv_font.c
+++ b/src/font/lv_font.c
@@ -8,8 +8,8 @@
  *********************/
 
 #include "lv_font.h"
-#include "../lv_misc/lv_utils.h"
-#include "../lv_misc/lv_log.h"
+#include "../misc/lv_utils.h"
+#include "../misc/lv_log.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_font/lv_font.h b/src/font/lv_font.h
similarity index 99%
rename from src/lv_font/lv_font.h
rename to src/font/lv_font.h
index eca007300..fd313fbef 100644
--- a/src/lv_font/lv_font.h
+++ b/src/font/lv_font.h
@@ -19,7 +19,7 @@ extern "C" {
 #include <stdbool.h>
 
 #include "lv_symbol_def.h"
-#include "../lv_misc/lv_area.h"
+#include "../misc/lv_area.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_font/lv_font.mk b/src/font/lv_font.mk
similarity index 100%
rename from src/lv_font/lv_font.mk
rename to src/font/lv_font.mk
diff --git a/src/lv_font/lv_font_dejavu_16_persian_hebrew.c b/src/font/lv_font_dejavu_16_persian_hebrew.c
similarity index 100%
rename from src/lv_font/lv_font_dejavu_16_persian_hebrew.c
rename to src/font/lv_font_dejavu_16_persian_hebrew.c
diff --git a/src/lv_font/lv_font_fmt_txt.c b/src/font/lv_font_fmt_txt.c
similarity index 98%
rename from src/lv_font/lv_font_fmt_txt.c
rename to src/font/lv_font_fmt_txt.c
index 2502a3875..9146b42f3 100644
--- a/src/lv_font/lv_font_fmt_txt.c
+++ b/src/font/lv_font_fmt_txt.c
@@ -8,12 +8,12 @@
  *********************/
 #include "lv_font.h"
 #include "lv_font_fmt_txt.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_misc/lv_types.h"
-#include "../lv_misc/lv_gc.h"
-#include "../lv_misc/lv_log.h"
-#include "../lv_misc/lv_utils.h"
-#include "../lv_misc/lv_mem.h"
+#include "../misc/lv_assert.h"
+#include "../misc/lv_types.h"
+#include "../misc/lv_gc.h"
+#include "../misc/lv_log.h"
+#include "../misc/lv_utils.h"
+#include "../misc/lv_mem.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_font/lv_font_fmt_txt.h b/src/font/lv_font_fmt_txt.h
similarity index 100%
rename from src/lv_font/lv_font_fmt_txt.h
rename to src/font/lv_font_fmt_txt.h
diff --git a/src/lv_font/lv_font_loader.c b/src/font/lv_font_loader.c
similarity index 99%
rename from src/lv_font/lv_font_loader.c
rename to src/font/lv_font_loader.c
index 0eb1172f5..7fc8172ea 100644
--- a/src/lv_font/lv_font_loader.c
+++ b/src/font/lv_font_loader.c
@@ -11,7 +11,7 @@
 #include <stdbool.h>
 
 #include "../lvgl.h"
-#include "../lv_misc/lv_fs.h"
+#include "../misc/lv_fs.h"
 #include "lv_font_loader.h"
 
 /**********************
diff --git a/src/lv_font/lv_font_loader.h b/src/font/lv_font_loader.h
similarity index 100%
rename from src/lv_font/lv_font_loader.h
rename to src/font/lv_font_loader.h
diff --git a/src/lv_font/lv_font_montserrat_10.c b/src/font/lv_font_montserrat_10.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_10.c
rename to src/font/lv_font_montserrat_10.c
diff --git a/src/lv_font/lv_font_montserrat_12.c b/src/font/lv_font_montserrat_12.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_12.c
rename to src/font/lv_font_montserrat_12.c
diff --git a/src/lv_font/lv_font_montserrat_12_subpx.c b/src/font/lv_font_montserrat_12_subpx.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_12_subpx.c
rename to src/font/lv_font_montserrat_12_subpx.c
diff --git a/src/lv_font/lv_font_montserrat_14.c b/src/font/lv_font_montserrat_14.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_14.c
rename to src/font/lv_font_montserrat_14.c
diff --git a/src/lv_font/lv_font_montserrat_16.c b/src/font/lv_font_montserrat_16.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_16.c
rename to src/font/lv_font_montserrat_16.c
diff --git a/src/lv_font/lv_font_montserrat_18.c b/src/font/lv_font_montserrat_18.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_18.c
rename to src/font/lv_font_montserrat_18.c
diff --git a/src/lv_font/lv_font_montserrat_20.c b/src/font/lv_font_montserrat_20.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_20.c
rename to src/font/lv_font_montserrat_20.c
diff --git a/src/lv_font/lv_font_montserrat_22.c b/src/font/lv_font_montserrat_22.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_22.c
rename to src/font/lv_font_montserrat_22.c
diff --git a/src/lv_font/lv_font_montserrat_24.c b/src/font/lv_font_montserrat_24.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_24.c
rename to src/font/lv_font_montserrat_24.c
diff --git a/src/lv_font/lv_font_montserrat_26.c b/src/font/lv_font_montserrat_26.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_26.c
rename to src/font/lv_font_montserrat_26.c
diff --git a/src/lv_font/lv_font_montserrat_28.c b/src/font/lv_font_montserrat_28.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_28.c
rename to src/font/lv_font_montserrat_28.c
diff --git a/src/lv_font/lv_font_montserrat_28_compressed.c b/src/font/lv_font_montserrat_28_compressed.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_28_compressed.c
rename to src/font/lv_font_montserrat_28_compressed.c
diff --git a/src/lv_font/lv_font_montserrat_30.c b/src/font/lv_font_montserrat_30.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_30.c
rename to src/font/lv_font_montserrat_30.c
diff --git a/src/lv_font/lv_font_montserrat_32.c b/src/font/lv_font_montserrat_32.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_32.c
rename to src/font/lv_font_montserrat_32.c
diff --git a/src/lv_font/lv_font_montserrat_34.c b/src/font/lv_font_montserrat_34.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_34.c
rename to src/font/lv_font_montserrat_34.c
diff --git a/src/lv_font/lv_font_montserrat_36.c b/src/font/lv_font_montserrat_36.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_36.c
rename to src/font/lv_font_montserrat_36.c
diff --git a/src/lv_font/lv_font_montserrat_38.c b/src/font/lv_font_montserrat_38.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_38.c
rename to src/font/lv_font_montserrat_38.c
diff --git a/src/lv_font/lv_font_montserrat_40.c b/src/font/lv_font_montserrat_40.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_40.c
rename to src/font/lv_font_montserrat_40.c
diff --git a/src/lv_font/lv_font_montserrat_42.c b/src/font/lv_font_montserrat_42.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_42.c
rename to src/font/lv_font_montserrat_42.c
diff --git a/src/lv_font/lv_font_montserrat_44.c b/src/font/lv_font_montserrat_44.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_44.c
rename to src/font/lv_font_montserrat_44.c
diff --git a/src/lv_font/lv_font_montserrat_46.c b/src/font/lv_font_montserrat_46.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_46.c
rename to src/font/lv_font_montserrat_46.c
diff --git a/src/lv_font/lv_font_montserrat_48.c b/src/font/lv_font_montserrat_48.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_48.c
rename to src/font/lv_font_montserrat_48.c
diff --git a/src/lv_font/lv_font_montserrat_8.c b/src/font/lv_font_montserrat_8.c
similarity index 100%
rename from src/lv_font/lv_font_montserrat_8.c
rename to src/font/lv_font_montserrat_8.c
diff --git a/src/lv_font/lv_font_simsun_16_cjk.c b/src/font/lv_font_simsun_16_cjk.c
similarity index 100%
rename from src/lv_font/lv_font_simsun_16_cjk.c
rename to src/font/lv_font_simsun_16_cjk.c
diff --git a/src/lv_font/lv_font_unscii_16.c b/src/font/lv_font_unscii_16.c
similarity index 100%
rename from src/lv_font/lv_font_unscii_16.c
rename to src/font/lv_font_unscii_16.c
diff --git a/src/lv_font/lv_font_unscii_8.c b/src/font/lv_font_unscii_8.c
similarity index 100%
rename from src/lv_font/lv_font_unscii_8.c
rename to src/font/lv_font_unscii_8.c
diff --git a/src/lv_font/lv_symbol_def.h b/src/font/lv_symbol_def.h
similarity index 100%
rename from src/lv_font/lv_symbol_def.h
rename to src/font/lv_symbol_def.h
diff --git a/src/lv_gpu/lv_gpu.mk b/src/gpu/lv_gpu.mk
similarity index 100%
rename from src/lv_gpu/lv_gpu.mk
rename to src/gpu/lv_gpu.mk
diff --git a/src/lv_gpu/lv_gpu_nxp_pxp.c b/src/gpu/lv_gpu_nxp_pxp.c
similarity index 99%
rename from src/lv_gpu/lv_gpu_nxp_pxp.c
rename to src/gpu/lv_gpu_nxp_pxp.c
index cc3b90966..212d2f863 100644
--- a/src/lv_gpu/lv_gpu_nxp_pxp.c
+++ b/src/gpu/lv_gpu_nxp_pxp.c
@@ -37,8 +37,8 @@
 
 #include "lvgl.h"
 #include "lv_gpu_nxp_pxp.h"
-#include "../lv_misc/lv_mem.h"
-#include "../lv_misc/lv_log.h"
+#include "../misc/lv_mem.h"
+#include "../misc/lv_log.h"
 
 #include "fsl_pxp.h"
 #include "fsl_cache.h"
diff --git a/src/lv_gpu/lv_gpu_nxp_pxp.h b/src/gpu/lv_gpu_nxp_pxp.h
similarity index 98%
rename from src/lv_gpu/lv_gpu_nxp_pxp.h
rename to src/gpu/lv_gpu_nxp_pxp.h
index c91d80fd3..3cd168841 100644
--- a/src/lv_gpu/lv_gpu_nxp_pxp.h
+++ b/src/gpu/lv_gpu_nxp_pxp.h
@@ -38,8 +38,8 @@ extern "C" {
  *      INCLUDES
  *********************/
 
-#include "../lv_misc/lv_area.h"
-#include "../lv_misc/lv_color.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_color.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_gpu/lv_gpu_nxp_pxp_osa.c b/src/gpu/lv_gpu_nxp_pxp_osa.c
similarity index 100%
rename from src/lv_gpu/lv_gpu_nxp_pxp_osa.c
rename to src/gpu/lv_gpu_nxp_pxp_osa.c
diff --git a/src/lv_gpu/lv_gpu_nxp_pxp_osa.h b/src/gpu/lv_gpu_nxp_pxp_osa.h
similarity index 100%
rename from src/lv_gpu/lv_gpu_nxp_pxp_osa.h
rename to src/gpu/lv_gpu_nxp_pxp_osa.h
diff --git a/src/lv_gpu/lv_gpu_nxp_vglite.c b/src/gpu/lv_gpu_nxp_vglite.c
similarity index 99%
rename from src/lv_gpu/lv_gpu_nxp_vglite.c
rename to src/gpu/lv_gpu_nxp_vglite.c
index 8b4da5917..ad7286a7f 100644
--- a/src/lv_gpu/lv_gpu_nxp_vglite.c
+++ b/src/gpu/lv_gpu_nxp_vglite.c
@@ -37,7 +37,7 @@
 
 #include "lvgl.h"
 #include "lv_gpu_nxp_vglite.h"
-#include "../lv_misc/lv_log.h"
+#include "../misc/lv_log.h"
 #include "fsl_cache.h"
 #include "vg_lite.h"
 
diff --git a/src/lv_gpu/lv_gpu_nxp_vglite.h b/src/gpu/lv_gpu_nxp_vglite.h
similarity index 100%
rename from src/lv_gpu/lv_gpu_nxp_vglite.h
rename to src/gpu/lv_gpu_nxp_vglite.h
diff --git a/src/lv_gpu/lv_gpu_stm32_dma2d.c b/src/gpu/lv_gpu_stm32_dma2d.c
similarity index 99%
rename from src/lv_gpu/lv_gpu_stm32_dma2d.c
rename to src/gpu/lv_gpu_stm32_dma2d.c
index 088370343..c4dac92b3 100644
--- a/src/lv_gpu/lv_gpu_stm32_dma2d.c
+++ b/src/gpu/lv_gpu_stm32_dma2d.c
@@ -7,8 +7,8 @@
  *      INCLUDES
  *********************/
 #include "lv_gpu_stm32_dma2d.h"
-#include "../lv_core/lv_disp.h"
-#include "../lv_core/lv_refr.h"
+#include "../core/lv_disp.h"
+#include "../core/lv_refr.h"
 
 #if LV_USE_GPU_STM32_DMA2D
 
diff --git a/src/lv_gpu/lv_gpu_stm32_dma2d.h b/src/gpu/lv_gpu_stm32_dma2d.h
similarity index 97%
rename from src/lv_gpu/lv_gpu_stm32_dma2d.h
rename to src/gpu/lv_gpu_stm32_dma2d.h
index 59b14c00f..cf61e42f5 100644
--- a/src/lv_gpu/lv_gpu_stm32_dma2d.h
+++ b/src/gpu/lv_gpu_stm32_dma2d.h
@@ -13,9 +13,9 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_misc/lv_area.h"
-#include "../lv_misc/lv_color.h"
-#include "../lv_hal/lv_hal_disp.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_color.h"
+#include "../hal/lv_hal_disp.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_hal/lv_hal.h b/src/hal/lv_hal.h
similarity index 100%
rename from src/lv_hal/lv_hal.h
rename to src/hal/lv_hal.h
diff --git a/src/lv_hal/lv_hal.mk b/src/hal/lv_hal.mk
similarity index 100%
rename from src/lv_hal/lv_hal.mk
rename to src/hal/lv_hal.mk
diff --git a/src/lv_hal/lv_hal_disp.c b/src/hal/lv_hal_disp.c
similarity index 98%
rename from src/lv_hal/lv_hal_disp.c
rename to src/hal/lv_hal_disp.c
index 1d1b982dd..8f1741e13 100644
--- a/src/lv_hal/lv_hal_disp.c
+++ b/src/hal/lv_hal_disp.c
@@ -11,12 +11,12 @@
 #include <stdint.h>
 #include <stddef.h>
 #include "lv_hal.h"
-#include "../lv_misc/lv_mem.h"
-#include "../lv_misc/lv_gc.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_core/lv_obj.h"
-#include "../lv_core/lv_refr.h"
-#include "../lv_core/lv_theme.h"
+#include "../misc/lv_mem.h"
+#include "../misc/lv_gc.h"
+#include "../misc/lv_assert.h"
+#include "../core/lv_obj.h"
+#include "../core/lv_refr.h"
+#include "../core/lv_theme.h"
 #if LV_USE_THEME_DEFAULT
 #include "../extra/themes/default/lv_theme_default.h"
 #endif
diff --git a/src/lv_hal/lv_hal_disp.h b/src/hal/lv_hal_disp.h
similarity index 98%
rename from src/lv_hal/lv_hal_disp.h
rename to src/hal/lv_hal_disp.h
index d84fcd92d..ef7941577 100644
--- a/src/lv_hal/lv_hal_disp.h
+++ b/src/hal/lv_hal_disp.h
@@ -18,10 +18,10 @@ extern "C" {
 #include <stdint.h>
 #include <stdbool.h>
 #include "lv_hal.h"
-#include "../lv_misc/lv_color.h"
-#include "../lv_misc/lv_area.h"
-#include "../lv_misc/lv_ll.h"
-#include "../lv_misc/lv_timer.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_ll.h"
+#include "../misc/lv_timer.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_hal/lv_hal_indev.c b/src/hal/lv_hal_indev.c
similarity index 96%
rename from src/lv_hal/lv_hal_indev.c
rename to src/hal/lv_hal_indev.c
index 9e3a52e3a..c39d883f9 100644
--- a/src/lv_hal/lv_hal_indev.c
+++ b/src/hal/lv_hal_indev.c
@@ -8,11 +8,11 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_misc/lv_assert.h"
-#include "../lv_hal/lv_hal_indev.h"
-#include "../lv_core/lv_indev.h"
-#include "../lv_misc/lv_mem.h"
-#include "../lv_misc/lv_gc.h"
+#include "../misc/lv_assert.h"
+#include "../hal/lv_hal_indev.h"
+#include "../core/lv_indev.h"
+#include "../misc/lv_mem.h"
+#include "../misc/lv_gc.h"
 #include "lv_hal_disp.h"
 
 /*********************
diff --git a/src/lv_hal/lv_hal_indev.h b/src/hal/lv_hal_indev.h
similarity index 99%
rename from src/lv_hal/lv_hal_indev.h
rename to src/hal/lv_hal_indev.h
index 4e45bb213..5fc355900 100644
--- a/src/lv_hal/lv_hal_indev.h
+++ b/src/hal/lv_hal_indev.h
@@ -19,8 +19,8 @@ extern "C" {
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "../lv_misc/lv_area.h"
-#include "../lv_misc/lv_timer.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_timer.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_hal/lv_hal_tick.c b/src/hal/lv_hal_tick.c
similarity index 100%
rename from src/lv_hal/lv_hal_tick.c
rename to src/hal/lv_hal_tick.c
diff --git a/src/lv_hal/lv_hal_tick.h b/src/hal/lv_hal_tick.h
similarity index 100%
rename from src/lv_hal/lv_hal_tick.h
rename to src/hal/lv_hal_tick.h
diff --git a/src/lv_misc/lv_anim.c b/src/misc/lv_anim.c
similarity index 99%
rename from src/lv_misc/lv_anim.c
rename to src/misc/lv_anim.c
index b371065a2..9157ca9f7 100644
--- a/src/lv_misc/lv_anim.c
+++ b/src/misc/lv_anim.c
@@ -10,8 +10,8 @@
 
 #include <stddef.h>
 #include <string.h>
-#include "../lv_misc/lv_assert.h"
-#include "../lv_hal/lv_hal_tick.h"
+#include "../misc/lv_assert.h"
+#include "../hal/lv_hal_tick.h"
 #include "lv_timer.h"
 #include "lv_math.h"
 #include "lv_mem.h"
diff --git a/src/lv_misc/lv_anim.h b/src/misc/lv_anim.h
similarity index 100%
rename from src/lv_misc/lv_anim.h
rename to src/misc/lv_anim.h
diff --git a/src/lv_misc/lv_area.c b/src/misc/lv_area.c
similarity index 100%
rename from src/lv_misc/lv_area.c
rename to src/misc/lv_area.c
diff --git a/src/lv_misc/lv_area.h b/src/misc/lv_area.h
similarity index 100%
rename from src/lv_misc/lv_area.h
rename to src/misc/lv_area.h
diff --git a/src/lv_misc/lv_assert.h b/src/misc/lv_assert.h
similarity index 100%
rename from src/lv_misc/lv_assert.h
rename to src/misc/lv_assert.h
diff --git a/src/lv_misc/lv_async.c b/src/misc/lv_async.c
similarity index 100%
rename from src/lv_misc/lv_async.c
rename to src/misc/lv_async.c
diff --git a/src/lv_misc/lv_async.h b/src/misc/lv_async.h
similarity index 100%
rename from src/lv_misc/lv_async.h
rename to src/misc/lv_async.h
diff --git a/src/lv_misc/lv_bidi.c b/src/misc/lv_bidi.c
similarity index 99%
rename from src/lv_misc/lv_bidi.c
rename to src/misc/lv_bidi.c
index a62c62a64..431e25898 100644
--- a/src/lv_misc/lv_bidi.c
+++ b/src/misc/lv_bidi.c
@@ -9,7 +9,7 @@
 #include <stddef.h>
 #include "lv_bidi.h"
 #include "lv_txt.h"
-#include "../lv_misc/lv_mem.h"
+#include "../misc/lv_mem.h"
 
 #if LV_USE_BIDI
 
diff --git a/src/lv_misc/lv_bidi.h b/src/misc/lv_bidi.h
similarity index 100%
rename from src/lv_misc/lv_bidi.h
rename to src/misc/lv_bidi.h
diff --git a/src/lv_misc/lv_color.c b/src/misc/lv_color.c
similarity index 100%
rename from src/lv_misc/lv_color.c
rename to src/misc/lv_color.c
diff --git a/src/lv_misc/lv_color.h b/src/misc/lv_color.h
similarity index 100%
rename from src/lv_misc/lv_color.h
rename to src/misc/lv_color.h
diff --git a/src/lv_misc/lv_fs.c b/src/misc/lv_fs.c
similarity index 99%
rename from src/lv_misc/lv_fs.c
rename to src/misc/lv_fs.c
index a2f0da64d..a6b57f42a 100644
--- a/src/lv_misc/lv_fs.c
+++ b/src/misc/lv_fs.c
@@ -8,7 +8,7 @@
  *********************/
 #include "lv_fs.h"
 
-#include "../lv_misc/lv_assert.h"
+#include "../misc/lv_assert.h"
 #include "lv_ll.h"
 #include <string.h>
 #include "lv_gc.h"
diff --git a/src/lv_misc/lv_fs.h b/src/misc/lv_fs.h
similarity index 100%
rename from src/lv_misc/lv_fs.h
rename to src/misc/lv_fs.h
diff --git a/src/lv_misc/lv_gc.c b/src/misc/lv_gc.c
similarity index 100%
rename from src/lv_misc/lv_gc.c
rename to src/misc/lv_gc.c
diff --git a/src/lv_misc/lv_gc.h b/src/misc/lv_gc.h
similarity index 97%
rename from src/lv_misc/lv_gc.h
rename to src/misc/lv_gc.h
index 2318fe2f5..c0c7bf1a4 100644
--- a/src/lv_misc/lv_gc.h
+++ b/src/misc/lv_gc.h
@@ -18,8 +18,8 @@ extern "C" {
 #include "lv_mem.h"
 #include "lv_ll.h"
 #include "lv_timer.h"
-#include "../lv_draw/lv_img_cache.h"
-#include "../lv_draw/lv_draw_mask.h"
+#include "../draw/lv_img_cache.h"
+#include "../draw/lv_draw_mask.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_misc/lv_ll.c b/src/misc/lv_ll.c
similarity index 100%
rename from src/lv_misc/lv_ll.c
rename to src/misc/lv_ll.c
diff --git a/src/lv_misc/lv_ll.h b/src/misc/lv_ll.h
similarity index 100%
rename from src/lv_misc/lv_ll.h
rename to src/misc/lv_ll.h
diff --git a/src/lv_misc/lv_log.c b/src/misc/lv_log.c
similarity index 98%
rename from src/lv_misc/lv_log.c
rename to src/misc/lv_log.c
index ec06b98d5..9ee1be339 100644
--- a/src/lv_misc/lv_log.c
+++ b/src/misc/lv_log.c
@@ -12,7 +12,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include "lv_printf.h"
-#include "../lv_hal/lv_hal_tick.h"
+#include "../hal/lv_hal_tick.h"
 
 #if LV_LOG_PRINTF
     #include <stdio.h>
diff --git a/src/lv_misc/lv_log.h b/src/misc/lv_log.h
similarity index 100%
rename from src/lv_misc/lv_log.h
rename to src/misc/lv_log.h
diff --git a/src/lv_misc/lv_math.c b/src/misc/lv_math.c
similarity index 100%
rename from src/lv_misc/lv_math.c
rename to src/misc/lv_math.c
diff --git a/src/lv_misc/lv_math.h b/src/misc/lv_math.h
similarity index 100%
rename from src/lv_misc/lv_math.h
rename to src/misc/lv_math.h
diff --git a/src/lv_misc/lv_mem.c b/src/misc/lv_mem.c
similarity index 100%
rename from src/lv_misc/lv_mem.c
rename to src/misc/lv_mem.c
diff --git a/src/lv_misc/lv_mem.h b/src/misc/lv_mem.h
similarity index 100%
rename from src/lv_misc/lv_mem.h
rename to src/misc/lv_mem.h
diff --git a/src/lv_misc/lv_misc.mk b/src/misc/lv_misc.mk
similarity index 100%
rename from src/lv_misc/lv_misc.mk
rename to src/misc/lv_misc.mk
diff --git a/src/lv_misc/lv_printf.c b/src/misc/lv_printf.c
similarity index 100%
rename from src/lv_misc/lv_printf.c
rename to src/misc/lv_printf.c
diff --git a/src/lv_misc/lv_printf.h b/src/misc/lv_printf.h
similarity index 100%
rename from src/lv_misc/lv_printf.h
rename to src/misc/lv_printf.h
diff --git a/src/lv_misc/lv_style.c b/src/misc/lv_style.c
similarity index 99%
rename from src/lv_misc/lv_style.c
rename to src/misc/lv_style.c
index e20ed0e01..580585f95 100644
--- a/src/lv_misc/lv_style.c
+++ b/src/misc/lv_style.c
@@ -7,7 +7,7 @@
  *      INCLUDES
  *********************/
 #include "lv_style.h"
-#include "../lv_misc/lv_mem.h"
+#include "../misc/lv_mem.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_misc/lv_style.h b/src/misc/lv_style.h
similarity index 99%
rename from src/lv_misc/lv_style.h
rename to src/misc/lv_style.h
index 1966a1b56..e699199e9 100644
--- a/src/lv_misc/lv_style.h
+++ b/src/misc/lv_style.h
@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include <stdbool.h>
-#include "../lv_font/lv_font.h"
+#include "../font/lv_font.h"
 #include "lv_color.h"
 #include "lv_area.h"
 #include "lv_anim.h"
diff --git a/src/lv_misc/lv_style_gen.h b/src/misc/lv_style_gen.h
similarity index 100%
rename from src/lv_misc/lv_style_gen.h
rename to src/misc/lv_style_gen.h
diff --git a/src/lv_misc/lv_templ.c b/src/misc/lv_templ.c
similarity index 100%
rename from src/lv_misc/lv_templ.c
rename to src/misc/lv_templ.c
diff --git a/src/lv_misc/lv_templ.h b/src/misc/lv_templ.h
similarity index 100%
rename from src/lv_misc/lv_templ.h
rename to src/misc/lv_templ.h
diff --git a/src/lv_misc/lv_timer.c b/src/misc/lv_timer.c
similarity index 99%
rename from src/lv_misc/lv_timer.c
rename to src/misc/lv_timer.c
index a138733d9..f182c8bad 100644
--- a/src/lv_misc/lv_timer.c
+++ b/src/misc/lv_timer.c
@@ -7,8 +7,8 @@
  *********************/
 #include "lv_timer.h"
 #include <stddef.h>
-#include "../lv_misc/lv_assert.h"
-#include "../lv_hal/lv_hal_tick.h"
+#include "../misc/lv_assert.h"
+#include "../hal/lv_hal_tick.h"
 #include "lv_gc.h"
 
 /*********************
diff --git a/src/lv_misc/lv_timer.h b/src/misc/lv_timer.h
similarity index 100%
rename from src/lv_misc/lv_timer.h
rename to src/misc/lv_timer.h
diff --git a/src/lv_misc/lv_tlsf.c b/src/misc/lv_tlsf.c
similarity index 100%
rename from src/lv_misc/lv_tlsf.c
rename to src/misc/lv_tlsf.c
diff --git a/src/lv_misc/lv_tlsf.h b/src/misc/lv_tlsf.h
similarity index 100%
rename from src/lv_misc/lv_tlsf.h
rename to src/misc/lv_tlsf.h
diff --git a/src/lv_misc/lv_txt.c b/src/misc/lv_txt.c
similarity index 100%
rename from src/lv_misc/lv_txt.c
rename to src/misc/lv_txt.c
diff --git a/src/lv_misc/lv_txt.h b/src/misc/lv_txt.h
similarity index 99%
rename from src/lv_misc/lv_txt.h
rename to src/misc/lv_txt.h
index 52fe2647e..cf74438bd 100644
--- a/src/lv_misc/lv_txt.h
+++ b/src/misc/lv_txt.h
@@ -18,7 +18,7 @@ extern "C" {
 #include <stdbool.h>
 #include <stdarg.h>
 #include "lv_area.h"
-#include "../lv_font/lv_font.h"
+#include "../font/lv_font.h"
 #include "lv_printf.h"
 
 /*********************
diff --git a/src/lv_misc/lv_txt_ap.c b/src/misc/lv_txt_ap.c
similarity index 99%
rename from src/lv_misc/lv_txt_ap.c
rename to src/misc/lv_txt_ap.c
index fcfd53a5e..16d5acc90 100644
--- a/src/lv_misc/lv_txt_ap.c
+++ b/src/misc/lv_txt_ap.c
@@ -11,7 +11,7 @@
 #include "lv_txt.h"
 #include "lv_txt_ap.h"
 #include "lv_mem.h"
-#include "../lv_draw/lv_draw.h"
+#include "../draw/lv_draw.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_misc/lv_txt_ap.h b/src/misc/lv_txt_ap.h
similarity index 97%
rename from src/lv_misc/lv_txt_ap.h
rename to src/misc/lv_txt_ap.h
index d57420134..3bf7a4d1d 100644
--- a/src/lv_misc/lv_txt_ap.h
+++ b/src/misc/lv_txt_ap.h
@@ -15,7 +15,7 @@ extern "C" {
  *********************/
 #include <stddef.h>
 #include "lv_txt.h"
-#include "../lv_draw/lv_draw.h"
+#include "../draw/lv_draw.h"
 
 #if LV_USE_ARABIC_PERSIAN_CHARS == 1
 
diff --git a/src/lv_misc/lv_types.h b/src/misc/lv_types.h
similarity index 100%
rename from src/lv_misc/lv_types.h
rename to src/misc/lv_types.h
diff --git a/src/lv_misc/lv_utils.c b/src/misc/lv_utils.c
similarity index 100%
rename from src/lv_misc/lv_utils.c
rename to src/misc/lv_utils.c
diff --git a/src/lv_misc/lv_utils.h b/src/misc/lv_utils.h
similarity index 100%
rename from src/lv_misc/lv_utils.h
rename to src/misc/lv_utils.h
diff --git a/src/lv_widgets/lv_arc.c b/src/widgets/lv_arc.c
similarity index 99%
rename from src/lv_widgets/lv_arc.c
rename to src/widgets/lv_arc.c
index 38970db34..d621ac96a 100644
--- a/src/lv_widgets/lv_arc.c
+++ b/src/widgets/lv_arc.c
@@ -9,11 +9,11 @@
 #include "lv_arc.h"
 #if LV_USE_ARC != 0
 
-#include "../lv_core/lv_group.h"
-#include "../lv_core/lv_indev.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_draw/lv_draw_arc.h"
+#include "../core/lv_group.h"
+#include "../core/lv_indev.h"
+#include "../misc/lv_assert.h"
+#include "../misc/lv_math.h"
+#include "../draw/lv_draw_arc.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_arc.h b/src/widgets/lv_arc.h
similarity index 99%
rename from src/lv_widgets/lv_arc.h
rename to src/widgets/lv_arc.h
index 0bcc83d31..2b859ecd8 100644
--- a/src/lv_widgets/lv_arc.h
+++ b/src/widgets/lv_arc.h
@@ -17,7 +17,7 @@ extern "C" {
 
 #if LV_USE_ARC != 0
 
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_bar.c b/src/widgets/lv_bar.c
similarity index 99%
rename from src/lv_widgets/lv_bar.c
rename to src/widgets/lv_bar.c
index 99d5583bb..ca34b65ee 100644
--- a/src/lv_widgets/lv_bar.c
+++ b/src/widgets/lv_bar.c
@@ -9,10 +9,10 @@
 #include "lv_bar.h"
 #if LV_USE_BAR != 0
 
-#include "../lv_misc/lv_assert.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_misc/lv_anim.h"
-#include "../lv_misc/lv_math.h"
+#include "../misc/lv_assert.h"
+#include "../draw/lv_draw.h"
+#include "../misc/lv_anim.h"
+#include "../misc/lv_math.h"
 #include <stdio.h>
 
 /*********************
diff --git a/src/lv_widgets/lv_bar.h b/src/widgets/lv_bar.h
similarity index 98%
rename from src/lv_widgets/lv_bar.h
rename to src/widgets/lv_bar.h
index ffab8dc25..b13f38239 100644
--- a/src/lv_widgets/lv_bar.h
+++ b/src/widgets/lv_bar.h
@@ -17,8 +17,8 @@ extern "C" {
 
 #if LV_USE_BAR != 0
 
-#include "../lv_core/lv_obj.h"
-#include "../lv_misc/lv_anim.h"
+#include "../core/lv_obj.h"
+#include "../misc/lv_anim.h"
 #include "lv_btn.h"
 #include "lv_label.h"
 
diff --git a/src/lv_widgets/lv_btn.c b/src/widgets/lv_btn.c
similarity index 100%
rename from src/lv_widgets/lv_btn.c
rename to src/widgets/lv_btn.c
diff --git a/src/lv_widgets/lv_btn.h b/src/widgets/lv_btn.h
similarity index 97%
rename from src/lv_widgets/lv_btn.h
rename to src/widgets/lv_btn.h
index ea11b9aa7..a4876aad8 100644
--- a/src/lv_widgets/lv_btn.h
+++ b/src/widgets/lv_btn.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../lv_conf_internal.h"
 
 #if LV_USE_BTN != 0
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_btnmatrix.c b/src/widgets/lv_btnmatrix.c
similarity index 99%
rename from src/lv_widgets/lv_btnmatrix.c
rename to src/widgets/lv_btnmatrix.c
index 449c3d312..a533bbd2b 100644
--- a/src/lv_widgets/lv_btnmatrix.c
+++ b/src/widgets/lv_btnmatrix.c
@@ -9,13 +9,13 @@
 #include "lv_btnmatrix.h"
 #if LV_USE_BTNMATRIX != 0
 
-#include "../lv_misc/lv_assert.h"
-#include "../lv_core/lv_indev.h"
-#include "../lv_core/lv_group.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_core/lv_refr.h"
-#include "../lv_misc/lv_txt.h"
-#include "../lv_misc/lv_txt_ap.h"
+#include "../misc/lv_assert.h"
+#include "../core/lv_indev.h"
+#include "../core/lv_group.h"
+#include "../draw/lv_draw.h"
+#include "../core/lv_refr.h"
+#include "../misc/lv_txt.h"
+#include "../misc/lv_txt_ap.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_btnmatrix.h b/src/widgets/lv_btnmatrix.h
similarity index 99%
rename from src/lv_widgets/lv_btnmatrix.h
rename to src/widgets/lv_btnmatrix.h
index 2e945b45f..867cad745 100644
--- a/src/lv_widgets/lv_btnmatrix.h
+++ b/src/widgets/lv_btnmatrix.h
@@ -17,7 +17,7 @@ extern "C" {
 
 #if LV_USE_BTNMATRIX != 0
 
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_canvas.c b/src/widgets/lv_canvas.c
similarity index 99%
rename from src/lv_widgets/lv_canvas.c
rename to src/widgets/lv_canvas.c
index 840a5d1db..4f2d5e32b 100644
--- a/src/lv_widgets/lv_canvas.c
+++ b/src/widgets/lv_canvas.c
@@ -8,10 +8,10 @@
  *********************/
 #include <stdlib.h>
 #include "lv_canvas.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_core/lv_refr.h"
+#include "../misc/lv_assert.h"
+#include "../misc/lv_math.h"
+#include "../draw/lv_draw.h"
+#include "../core/lv_refr.h"
 
 #if LV_USE_CANVAS != 0
 
diff --git a/src/lv_widgets/lv_canvas.h b/src/widgets/lv_canvas.h
similarity index 98%
rename from src/lv_widgets/lv_canvas.h
rename to src/widgets/lv_canvas.h
index 749b615df..0bb4c7fda 100644
--- a/src/lv_widgets/lv_canvas.h
+++ b/src/widgets/lv_canvas.h
@@ -17,9 +17,9 @@ extern "C" {
 
 #if LV_USE_CANVAS != 0
 
-#include "../lv_core/lv_obj.h"
-#include "../lv_widgets/lv_img.h"
-#include "../lv_draw/lv_draw_img.h"
+#include "../core/lv_obj.h"
+#include "../widgets/lv_img.h"
+#include "../draw/lv_draw_img.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_chart.c b/src/widgets/lv_chart.c
similarity index 99%
rename from src/lv_widgets/lv_chart.c
rename to src/widgets/lv_chart.c
index 660126097..fa66992bf 100644
--- a/src/lv_widgets/lv_chart.c
+++ b/src/widgets/lv_chart.c
@@ -9,12 +9,12 @@
 #include "lv_chart.h"
 #if LV_USE_CHART != 0
 
-#include "../lv_misc/lv_assert.h"
-#include "../lv_core/lv_refr.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_core/lv_disp.h"
-#include "../lv_core/lv_indev.h"
-#include "../lv_misc/lv_math.h"
+#include "../misc/lv_assert.h"
+#include "../core/lv_refr.h"
+#include "../draw/lv_draw.h"
+#include "../core/lv_disp.h"
+#include "../core/lv_indev.h"
+#include "../misc/lv_math.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_chart.h b/src/widgets/lv_chart.h
similarity index 99%
rename from src/lv_widgets/lv_chart.h
rename to src/widgets/lv_chart.h
index dd59f8ecb..597337df8 100644
--- a/src/lv_widgets/lv_chart.h
+++ b/src/widgets/lv_chart.h
@@ -17,7 +17,7 @@ extern "C" {
 
 #if LV_USE_CHART != 0
 
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 #include "lv_line.h"
 
 /*********************
diff --git a/src/lv_widgets/lv_checkbox.c b/src/widgets/lv_checkbox.c
similarity index 98%
rename from src/lv_widgets/lv_checkbox.c
rename to src/widgets/lv_checkbox.c
index b57cbfd63..fd86eafe7 100644
--- a/src/lv_widgets/lv_checkbox.c
+++ b/src/widgets/lv_checkbox.c
@@ -9,10 +9,10 @@
 #include "lv_checkbox.h"
 #if LV_USE_CHECKBOX != 0
 
-#include "../lv_misc/lv_assert.h"
-#include "../lv_misc/lv_txt_ap.h"
-#include "../lv_core/lv_group.h"
-#include "../lv_draw/lv_draw.h"
+#include "../misc/lv_assert.h"
+#include "../misc/lv_txt_ap.h"
+#include "../core/lv_group.h"
+#include "../draw/lv_draw.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_checkbox.h b/src/widgets/lv_checkbox.h
similarity index 98%
rename from src/lv_widgets/lv_checkbox.h
rename to src/widgets/lv_checkbox.h
index 17c3638b6..3f7ca747a 100644
--- a/src/lv_widgets/lv_checkbox.h
+++ b/src/widgets/lv_checkbox.h
@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "../lv_conf_internal.h"
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 
 #if LV_USE_CHECKBOX != 0
 
diff --git a/src/lv_widgets/lv_dropdown.c b/src/widgets/lv_dropdown.c
similarity index 99%
rename from src/lv_widgets/lv_dropdown.c
rename to src/widgets/lv_dropdown.c
index e590aeae6..2be4e5dc9 100644
--- a/src/lv_widgets/lv_dropdown.c
+++ b/src/widgets/lv_dropdown.c
@@ -9,15 +9,15 @@
 #include "lv_dropdown.h"
 #if LV_USE_DROPDOWN != 0
 
-#include "../lv_misc/lv_assert.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_core/lv_group.h"
-#include "../lv_core/lv_indev.h"
-#include "../lv_core/lv_disp.h"
-#include "../lv_font/lv_symbol_def.h"
-#include "../lv_misc/lv_anim.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_txt_ap.h"
+#include "../misc/lv_assert.h"
+#include "../draw/lv_draw.h"
+#include "../core/lv_group.h"
+#include "../core/lv_indev.h"
+#include "../core/lv_disp.h"
+#include "../font/lv_symbol_def.h"
+#include "../misc/lv_anim.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_txt_ap.h"
 #include <string.h>
 
 /*********************
diff --git a/src/lv_widgets/lv_dropdown.h b/src/widgets/lv_dropdown.h
similarity index 99%
rename from src/lv_widgets/lv_dropdown.h
rename to src/widgets/lv_dropdown.h
index 85db903e8..4a4c8f0c9 100644
--- a/src/lv_widgets/lv_dropdown.h
+++ b/src/widgets/lv_dropdown.h
@@ -23,7 +23,7 @@ extern "C" {
 #error "lv_ddlist: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)"
 #endif
 
-#include "../lv_widgets/lv_label.h"
+#include "../widgets/lv_label.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_img.c b/src/widgets/lv_img.c
similarity index 99%
rename from src/lv_widgets/lv_img.c
rename to src/widgets/lv_img.c
index 12ad9d44c..2cae38b40 100644
--- a/src/lv_widgets/lv_img.c
+++ b/src/widgets/lv_img.c
@@ -9,12 +9,12 @@
 #include "lv_img.h"
 #if LV_USE_IMG != 0
 
-#include "../lv_misc/lv_assert.h"
-#include "../lv_draw/lv_img_decoder.h"
-#include "../lv_misc/lv_fs.h"
-#include "../lv_misc/lv_txt.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_log.h"
+#include "../misc/lv_assert.h"
+#include "../draw/lv_img_decoder.h"
+#include "../misc/lv_fs.h"
+#include "../misc/lv_txt.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_log.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_img.h b/src/widgets/lv_img.h
similarity index 98%
rename from src/lv_widgets/lv_img.h
rename to src/widgets/lv_img.h
index 7a64845e6..36fd717bd 100644
--- a/src/lv_widgets/lv_img.h
+++ b/src/widgets/lv_img.h
@@ -17,9 +17,9 @@ extern "C" {
 
 #if LV_USE_IMG != 0
 
-#include "../lv_core/lv_obj.h"
-#include "../lv_misc/lv_fs.h"
-#include "../lv_draw/lv_draw.h"
+#include "../core/lv_obj.h"
+#include "../misc/lv_fs.h"
+#include "../draw/lv_draw.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_label.c b/src/widgets/lv_label.c
similarity index 99%
rename from src/lv_widgets/lv_label.c
rename to src/widgets/lv_label.c
index b43ec3c66..331f1dedf 100644
--- a/src/lv_widgets/lv_label.c
+++ b/src/widgets/lv_label.c
@@ -8,15 +8,15 @@
  *********************/
 #include "lv_label.h"
 #if LV_USE_LABEL != 0
-#include "../lv_core/lv_obj.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_core/lv_group.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_misc/lv_color.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_bidi.h"
-#include "../lv_misc/lv_txt_ap.h"
-#include "../lv_misc/lv_printf.h"
+#include "../core/lv_obj.h"
+#include "../misc/lv_assert.h"
+#include "../core/lv_group.h"
+#include "../draw/lv_draw.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_bidi.h"
+#include "../misc/lv_txt_ap.h"
+#include "../misc/lv_printf.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_label.h b/src/widgets/lv_label.h
similarity index 98%
rename from src/lv_widgets/lv_label.h
rename to src/widgets/lv_label.h
index bb7a6e7b5..0fa12390d 100644
--- a/src/lv_widgets/lv_label.h
+++ b/src/widgets/lv_label.h
@@ -18,11 +18,11 @@ extern "C" {
 #if LV_USE_LABEL != 0
 
 #include <stdarg.h>
-#include "../lv_core/lv_obj.h"
-#include "../lv_font/lv_font.h"
-#include "../lv_font/lv_symbol_def.h"
-#include "../lv_misc/lv_txt.h"
-#include "../lv_draw/lv_draw.h"
+#include "../core/lv_obj.h"
+#include "../font/lv_font.h"
+#include "../font/lv_symbol_def.h"
+#include "../misc/lv_txt.h"
+#include "../draw/lv_draw.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_line.c b/src/widgets/lv_line.c
similarity index 98%
rename from src/lv_widgets/lv_line.c
rename to src/widgets/lv_line.c
index 44a9d5dbc..9428c9e9a 100644
--- a/src/lv_widgets/lv_line.c
+++ b/src/widgets/lv_line.c
@@ -9,9 +9,9 @@
 #include "lv_line.h"
 
 #if LV_USE_LINE != 0
-#include "../lv_misc/lv_assert.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_misc/lv_math.h"
+#include "../misc/lv_assert.h"
+#include "../draw/lv_draw.h"
+#include "../misc/lv_math.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/src/lv_widgets/lv_line.h b/src/widgets/lv_line.h
similarity index 98%
rename from src/lv_widgets/lv_line.h
rename to src/widgets/lv_line.h
index 898a46b63..ca9aa065b 100644
--- a/src/lv_widgets/lv_line.h
+++ b/src/widgets/lv_line.h
@@ -17,7 +17,7 @@ extern "C" {
 
 #if LV_USE_LINE != 0
 
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_meter.c b/src/widgets/lv_meter.c
similarity index 99%
rename from src/lv_widgets/lv_meter.c
rename to src/widgets/lv_meter.c
index df759bcc2..7b259114f 100644
--- a/src/lv_widgets/lv_meter.c
+++ b/src/widgets/lv_meter.c
@@ -9,11 +9,11 @@
 #include "lv_meter.h"
 #if LV_USE_METER != 0
 
-#include "../lv_misc/lv_assert.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_core/lv_group.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_core/lv_disp.h"
+#include "../misc/lv_assert.h"
+#include "../draw/lv_draw.h"
+#include "../core/lv_group.h"
+#include "../misc/lv_math.h"
+#include "../core/lv_disp.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_meter.h b/src/widgets/lv_meter.h
similarity index 99%
rename from src/lv_widgets/lv_meter.h
rename to src/widgets/lv_meter.h
index 7e22eacfe..783d6ae13 100644
--- a/src/lv_widgets/lv_meter.h
+++ b/src/widgets/lv_meter.h
@@ -17,7 +17,7 @@ extern "C" {
 
 #if LV_USE_METER != 0
 
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_objx_templ.c b/src/widgets/lv_objx_templ.c
similarity index 99%
rename from src/lv_widgets/lv_objx_templ.c
rename to src/widgets/lv_objx_templ.c
index aa11ac638..9bc0c0dd5 100644
--- a/src/lv_widgets/lv_objx_templ.c
+++ b/src/widgets/lv_objx_templ.c
@@ -15,7 +15,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_misc/lv_assert.h"
+#include "../misc/lv_assert.h"
 //#include "lv_templ.h" /*TODO uncomment this*/
 
 #if defined(LV_USE_TEMPL) && LV_USE_TEMPL != 0
diff --git a/src/lv_widgets/lv_objx_templ.h b/src/widgets/lv_objx_templ.h
similarity index 98%
rename from src/lv_widgets/lv_objx_templ.h
rename to src/widgets/lv_objx_templ.h
index 7079291c8..bb2623a34 100644
--- a/src/lv_widgets/lv_objx_templ.h
+++ b/src/widgets/lv_objx_templ.h
@@ -24,7 +24,7 @@ extern "C" {
 
 #if LV_USE_TEMPL != 0
 
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_roller.c b/src/widgets/lv_roller.c
similarity index 99%
rename from src/lv_widgets/lv_roller.c
rename to src/widgets/lv_roller.c
index 7e8859a3f..c58927dc4 100644
--- a/src/lv_widgets/lv_roller.c
+++ b/src/widgets/lv_roller.c
@@ -9,11 +9,11 @@
 #include "lv_roller.h"
 #if LV_USE_ROLLER != 0
 
-#include "../lv_misc/lv_assert.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_core/lv_group.h"
-#include "../lv_core/lv_indev.h"
-#include "../lv_core/lv_indev_scroll.h"
+#include "../misc/lv_assert.h"
+#include "../draw/lv_draw.h"
+#include "../core/lv_group.h"
+#include "../core/lv_indev.h"
+#include "../core/lv_indev_scroll.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_roller.h b/src/widgets/lv_roller.h
similarity index 99%
rename from src/lv_widgets/lv_roller.h
rename to src/widgets/lv_roller.h
index 627d21d84..031d211cf 100644
--- a/src/lv_widgets/lv_roller.h
+++ b/src/widgets/lv_roller.h
@@ -17,7 +17,7 @@ extern "C" {
 
 #if LV_USE_ROLLER != 0
 
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 #include "lv_label.h"
 
 /*********************
diff --git a/src/lv_widgets/lv_slider.c b/src/widgets/lv_slider.c
similarity index 98%
rename from src/lv_widgets/lv_slider.c
rename to src/widgets/lv_slider.c
index 9bacd58e5..82f44d825 100644
--- a/src/lv_widgets/lv_slider.c
+++ b/src/widgets/lv_slider.c
@@ -9,12 +9,12 @@
 #include "lv_slider.h"
 #if LV_USE_SLIDER != 0
 
-#include "../lv_misc/lv_assert.h"
-#include "../lv_core/lv_group.h"
-#include "../lv_core/lv_indev.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_core/lv_disp.h"
+#include "../misc/lv_assert.h"
+#include "../core/lv_group.h"
+#include "../core/lv_indev.h"
+#include "../draw/lv_draw.h"
+#include "../misc/lv_math.h"
+#include "../core/lv_disp.h"
 #include "lv_img.h"
 
 /*********************
diff --git a/src/lv_widgets/lv_slider.h b/src/widgets/lv_slider.h
similarity index 99%
rename from src/lv_widgets/lv_slider.h
rename to src/widgets/lv_slider.h
index 9fbbac7d6..dc9d45974 100644
--- a/src/lv_widgets/lv_slider.h
+++ b/src/widgets/lv_slider.h
@@ -22,7 +22,7 @@ extern "C" {
 #error "lv_slider: lv_bar is required. Enable it in lv_conf.h (LV_USE_BAR 1)"
 #endif
 
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 #include "lv_bar.h"
 
 /*********************
diff --git a/src/lv_widgets/lv_switch.c b/src/widgets/lv_switch.c
similarity index 98%
rename from src/lv_widgets/lv_switch.c
rename to src/widgets/lv_switch.c
index 0a0a05967..76075fb2e 100644
--- a/src/lv_widgets/lv_switch.c
+++ b/src/widgets/lv_switch.c
@@ -15,10 +15,10 @@
     #error "lv_sw: lv_slider is required. Enable it in lv_conf.h (LV_USE_SLIDER 1)"
 #endif
 
-#include "../lv_misc/lv_assert.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_core/lv_indev.h"
-#include "../lv_core/lv_disp.h"
+#include "../misc/lv_assert.h"
+#include "../misc/lv_math.h"
+#include "../core/lv_indev.h"
+#include "../core/lv_disp.h"
 #include "lv_img.h"
 
 /*********************
diff --git a/src/lv_widgets/lv_switch.h b/src/widgets/lv_switch.h
similarity index 97%
rename from src/lv_widgets/lv_switch.h
rename to src/widgets/lv_switch.h
index a61c65c7a..52fb8f325 100644
--- a/src/lv_widgets/lv_switch.h
+++ b/src/widgets/lv_switch.h
@@ -22,7 +22,7 @@ extern "C" {
 #error "lv_switch: lv_slider is required. Enable it in lv_conf.h (LV_USE_SLIDER  1)"
 #endif
 
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_table.c b/src/widgets/lv_table.c
similarity index 99%
rename from src/lv_widgets/lv_table.c
rename to src/widgets/lv_table.c
index 6e9c29517..8926e0d9a 100644
--- a/src/lv_widgets/lv_table.c
+++ b/src/widgets/lv_table.c
@@ -9,13 +9,13 @@
 #include "lv_table.h"
 #if LV_USE_TABLE != 0
 
-#include "../lv_core/lv_indev.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_misc/lv_txt.h"
-#include "../lv_misc/lv_txt_ap.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_printf.h"
-#include "../lv_draw/lv_draw_label.h"
+#include "../core/lv_indev.h"
+#include "../misc/lv_assert.h"
+#include "../misc/lv_txt.h"
+#include "../misc/lv_txt_ap.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_printf.h"
+#include "../draw/lv_draw.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_table.h b/src/widgets/lv_table.h
similarity index 99%
rename from src/lv_widgets/lv_table.h
rename to src/widgets/lv_table.h
index 1ca1b7a7b..e5f2c097f 100644
--- a/src/lv_widgets/lv_table.h
+++ b/src/widgets/lv_table.h
@@ -22,7 +22,7 @@ extern "C" {
 #error "lv_table: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)"
 #endif
 
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 #include "lv_label.h"
 
 /*********************
diff --git a/src/lv_widgets/lv_textarea.c b/src/widgets/lv_textarea.c
similarity index 99%
rename from src/lv_widgets/lv_textarea.c
rename to src/widgets/lv_textarea.c
index 38a676c5a..dc62bd55e 100644
--- a/src/lv_widgets/lv_textarea.c
+++ b/src/widgets/lv_textarea.c
@@ -10,14 +10,14 @@
 #if LV_USE_TEXTAREA != 0
 
 #include <string.h>
-#include "../lv_misc/lv_assert.h"
-#include "../lv_core/lv_group.h"
-#include "../lv_core/lv_refr.h"
-#include "../lv_core/lv_indev.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_misc/lv_anim.h"
-#include "../lv_misc/lv_txt.h"
-#include "../lv_misc/lv_math.h"
+#include "../misc/lv_assert.h"
+#include "../core/lv_group.h"
+#include "../core/lv_refr.h"
+#include "../core/lv_indev.h"
+#include "../draw/lv_draw.h"
+#include "../misc/lv_anim.h"
+#include "../misc/lv_txt.h"
+#include "../misc/lv_math.h"
 
 /*********************
  *      DEFINES
diff --git a/src/lv_widgets/lv_textarea.h b/src/widgets/lv_textarea.h
similarity index 99%
rename from src/lv_widgets/lv_textarea.h
rename to src/widgets/lv_textarea.h
index d775a7389..390a8443f 100644
--- a/src/lv_widgets/lv_textarea.h
+++ b/src/widgets/lv_textarea.h
@@ -22,7 +22,7 @@ extern "C" {
 #error "lv_ta: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)"
 #endif
 
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 #include "lv_label.h"
 
 /*********************
diff --git a/src/lv_widgets/lv_widgets.mk b/src/widgets/lv_widgets.mk
similarity index 100%
rename from src/lv_widgets/lv_widgets.mk
rename to src/widgets/lv_widgets.mk