diff --git a/lvgl.mk b/lvgl.mk
index 1d2ebf1db..830fe1194 100644
--- a/lvgl.mk
+++ b/lvgl.mk
@@ -1,8 +1,8 @@
-include $(LVGL_DIR)/src/lv_core/lv_core.mk
-include $(LVGL_DIR)/src/lv_hal/lv_hal.mk
-include $(LVGL_DIR)/src/lv_objx/lv_objx.mk
-include $(LVGL_DIR)/src/lv_font/lv_font.mk
-include $(LVGL_DIR)/src/lv_misc/lv_misc.mk
-include $(LVGL_DIR)/src/lv_themes/lv_themes.mk
-include $(LVGL_DIR)/src/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_font/lv_font.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/src/lv_core/lv_core.mk b/src/lv_core/lv_core.mk
index b07d23290..eb1c5e0ca 100644
--- a/src/lv_core/lv_core.mk
+++ b/src/lv_core/lv_core.mk
@@ -6,7 +6,7 @@ CSRCS += lv_refr.c
 CSRCS += lv_style.c
 CSRCS += lv_debug.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/src/lv_core
-VPATH += :$(LVGL_DIR)/src/lv_core
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_core
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_core
 
-CFLAGS += "-I$(LVGL_DIR)/src/lv_core"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_core"
diff --git a/src/lv_draw/lv_draw.mk b/src/lv_draw/lv_draw.mk
index 133a4a45a..192173138 100644
--- a/src/lv_draw/lv_draw.mk
+++ b/src/lv_draw/lv_draw.mk
@@ -10,7 +10,7 @@ CSRCS += lv_img_decoder.c
 CSRCS += lv_img_cache.c
 CSRCS += lv_img_buf.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/src/lv_draw
-VPATH += :$(LVGL_DIR)/src/lv_draw
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl//src/lv_draw
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_draw
 
-CFLAGS += "-I$(LVGL_DIR)/src/lv_draw"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_draw"
diff --git a/src/lv_font/lv_font.mk b/src/lv_font/lv_font.mk
index 14477ffb6..836d86a6c 100644
--- a/src/lv_font/lv_font.mk
+++ b/src/lv_font/lv_font.mk
@@ -6,7 +6,7 @@ CSRCS += lv_font_roboto_22.c
 CSRCS += lv_font_roboto_28.c
 CSRCS += lv_font_unscii_8.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/src/lv_font
-VPATH += :$(LVGL_DIR)/src/lv_font
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_font
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_font
 
-CFLAGS += "-I$(LVGL_DIR)/src/lv_font"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_font"
diff --git a/src/lv_hal/lv_hal.mk b/src/lv_hal/lv_hal.mk
index 20bfb7d18..05af078ce 100644
--- a/src/lv_hal/lv_hal.mk
+++ b/src/lv_hal/lv_hal.mk
@@ -2,7 +2,7 @@ CSRCS += lv_hal_disp.c
 CSRCS += lv_hal_indev.c
 CSRCS += lv_hal_tick.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/src/lv_hal
-VPATH += :$(LVGL_DIR)/src/lv_hal
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_hal
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_hal
 
-CFLAGS += "-I$(LVGL_DIR)/src/lv_hal"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_hal"
diff --git a/src/lv_misc/lv_misc.mk b/src/lv_misc/lv_misc.mk
index 29fb82a0e..d0b682ab2 100644
--- a/src/lv_misc/lv_misc.mk
+++ b/src/lv_misc/lv_misc.mk
@@ -15,7 +15,7 @@ CSRCS += lv_async.c
 CSRCS += lv_printf.c
 CSRCS += lv_bidi.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/src/lv_misc
-VPATH += :$(LVGL_DIR)/src/lv_misc
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_misc
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_misc
 
-CFLAGS += "-I$(LVGL_DIR)/src/lv_misc"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_misc"
diff --git a/src/lv_objx/lv_objx.mk b/src/lv_objx/lv_objx.mk
index ae8d8e4e9..5879b420e 100644
--- a/src/lv_objx/lv_objx.mk
+++ b/src/lv_objx/lv_objx.mk
@@ -32,7 +32,7 @@ CSRCS += lv_sw.c
 CSRCS += lv_win.c
 CSRCS += lv_objmask.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/src/lv_objx
-VPATH += :$(LVGL_DIR)/src/lv_objx
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_objx
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_objx
 
-CFLAGS += "-I$(LVGL_DIR)/src/lv_objx"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_objx"
diff --git a/src/lv_themes/lv_themes.mk b/src/lv_themes/lv_themes.mk
index ee87a0943..fce41e4e1 100644
--- a/src/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)/src/lv_themes
-VPATH += :$(LVGL_DIR)/src/lv_themes
+DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_themes
+VPATH += :$(LVGL_DIR)/lvgl/src/lv_themes
 
-CFLAGS += "-I$(LVGL_DIR)/src/lv_themes"
+CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_themes"
diff --git a/tests/Makefile b/tests/Makefile
index 5fc4b6732..8f7fbf2ec 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2,7 +2,7 @@
 # Makefile
 #
 CC ?= gcc
-LVGL_DIR ?= ${shell pwd}/..
+LVGL_DIR ?= ${shell pwd}/../..
 
 WARNINGS ?= -Wall -Wextra
 OPTIMIZATION ?= -O3 -g0
@@ -17,7 +17,7 @@ BIN ?= demo
 #Collect the files to compile
 MAINSRC = ./test_main.c
 
-include $(LVGL_DIR)/lvgl.mk
+include $(LVGL_DIR)/lvgl/lvgl.mk
 
 OBJEXT ?= .o
 
diff --git a/tests/build.py b/tests/build.py
index a633a1953..bf04098bc 100644
--- a/tests/build.py
+++ b/tests/build.py
@@ -1,7 +1,7 @@
 import os
 
 warnings = '"-Wall -Werror"' 
-base_defines = '"-DLV_CONF_PATH=tests/lv_test_conf.h -DLV_BUILD_TEST"'
+base_defines = '"-DLV_CONF_PATH=lvgl/tests/lv_test_conf.h -DLV_BUILD_TEST"'
 optimization = '"-O3 -g0"'