diff --git a/CMakeLists.txt b/CMakeLists.txt
index 678c894..b1ebffe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,7 @@ if(CONFIG_LV_TOUCH_CONTROLLER)
 endif()
 
 if(CONFIG_LV_I2C)
-    list(APPEND SOURCES "i2c_manager/i2c_manager.c")
+    list(APPEND SOURCES "lvgl_i2c/i2c_manager.c")
 endif()
 
 idf_component_register(SRCS ${SOURCES}
diff --git a/Kconfig b/Kconfig
index 370ad6e..48c3ce0 100644
--- a/Kconfig
+++ b/Kconfig
@@ -7,7 +7,7 @@ menu "LVGL ESP Drivers"
     menu "I2C Port Settings"
         depends on LV_I2C && !HAVE_I2C_MANAGER
 
-        rsource "i2c_manager/Kconfig"
+        rsource "lvgl_i2c/Kconfig"
     
     endmenu
 
diff --git a/component.mk b/component.mk
index c01caba..0017d0b 100644
--- a/component.mk
+++ b/component.mk
@@ -1,7 +1,7 @@
 # LVGL ESP32 drivers
 
 # Define sources and include dirs
-COMPONENT_SRCDIRS := . lvgl_tft lvgl_touch
+COMPONENT_SRCDIRS := . lvgl_tft lvgl_touch lvgl_i2c
 COMPONENT_ADD_INCLUDEDIRS := .
 
 # LVGL is supposed to be used as a ESP-IDF component
@@ -44,3 +44,6 @@ $(call compile_only_if,$(and $(CONFIG_LV_TOUCH_CONTROLLER),$(CONFIG_LV_TOUCH_CON
 $(call compile_only_if,$(and $(CONFIG_LV_TOUCH_CONTROLLER),$(CONFIG_LV_TOUCH_CONTROLLER_RA8875)), lvgl_touch/ra8875_touch.o)
 
 $(call compile_only_if,$(and $(CONFIG_LV_TOUCH_CONTROLLER),$(CONFIG_LV_TOUCH_DRIVER_PROTOCOL_SPI)), lvgl_touch/tp_spi.o)
+
+# I2C Manager
+$(call compile_only_if,$(CONFIG_LV_I2C), lvgl_i2c/i2c_manager.o)
diff --git a/lvgl_helpers.c b/lvgl_helpers.c
index dc98720..edc522f 100644
--- a/lvgl_helpers.c
+++ b/lvgl_helpers.c
@@ -15,7 +15,7 @@
 
 #include "lvgl_spi_conf.h"
 
-#include "i2c_manager/i2c_manager.h"
+#include "lvgl_i2c/i2c_manager.h"
 
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
 #include "lvgl.h"
diff --git a/i2c_manager/Kconfig b/lvgl_i2c/Kconfig
similarity index 100%
rename from i2c_manager/Kconfig
rename to lvgl_i2c/Kconfig
diff --git a/i2c_manager/README.md b/lvgl_i2c/README.md
similarity index 99%
rename from i2c_manager/README.md
rename to lvgl_i2c/README.md
index b602327..890f8da 100644
--- a/i2c_manager/README.md
+++ b/lvgl_i2c/README.md
@@ -59,7 +59,7 @@ To use the I2C port in your code you would do something like:
 
     
 ```c
-#include "i2c_manager/i2c_manager.h"
+#include "lvgl_i2c/i2c_manager.h"
 
 uint8_t data[2];
 lvgl_i2c_read(CONFIG_LV_I2C_TOUCH_PORT, 0x23, 0x42, &data, 2);
diff --git a/i2c_manager/i2c_manager.c b/lvgl_i2c/i2c_manager.c
similarity index 100%
rename from i2c_manager/i2c_manager.c
rename to lvgl_i2c/i2c_manager.c
diff --git a/i2c_manager/i2c_manager.h b/lvgl_i2c/i2c_manager.h
similarity index 100%
rename from i2c_manager/i2c_manager.h
rename to lvgl_i2c/i2c_manager.h
diff --git a/lvgl_tft/ssd1306.c b/lvgl_tft/ssd1306.c
index 811f164..5953d44 100644
--- a/lvgl_tft/ssd1306.c
+++ b/lvgl_tft/ssd1306.c
@@ -15,7 +15,7 @@
  *********************/
 #include "assert.h"
 
-#include "i2c_manager/i2c_manager.h"
+#include "lvgl_i2c/i2c_manager.h"
 
 #include "ssd1306.h"
 
diff --git a/lvgl_tft/st7735s.c b/lvgl_tft/st7735s.c
index d57def5..8be725b 100644
--- a/lvgl_tft/st7735s.c
+++ b/lvgl_tft/st7735s.c
@@ -14,7 +14,7 @@
 #include "freertos/task.h"
 
 #ifdef CONFIG_LV_M5STICKC_HANDLE_AXP192
-    #include "i2c_manager/i2c_manager.h"
+    #include "lvgl_i2c/i2c_manager.h"
 #endif
 
 /*********************
diff --git a/lvgl_touch/ft6x36.c b/lvgl_touch/ft6x36.c
index c7c2f9e..9e34845 100644
--- a/lvgl_touch/ft6x36.c
+++ b/lvgl_touch/ft6x36.c
@@ -26,7 +26,7 @@
 #endif
 #include "ft6x36.h"
 
-#include "i2c_manager/i2c_manager.h"
+#include "lvgl_i2c/i2c_manager.h"
 
 #define TAG "FT6X36"
 
diff --git a/lvgl_touch/gt911.c b/lvgl_touch/gt911.c
index 9974571..03c3d9d 100644
--- a/lvgl_touch/gt911.c
+++ b/lvgl_touch/gt911.c
@@ -26,7 +26,7 @@
 #endif
 #include "gt911.h"
 
-#include "i2c_manager/i2c_manager.h"
+#include "lvgl_i2c/i2c_manager.h"
 
 #define TAG "GT911"