diff --git a/lv_conf_templ.h b/lv_conf_templ.h
index eb9b30108..1f819d7d9 100644
--- a/lv_conf_templ.h
+++ b/lv_conf_templ.h
@@ -73,7 +73,10 @@
 #define LV_TXT_UTF8             1
 #define LV_TXT_BREAK_CHARS     " ,.;:-_"         /*Can break texts on these chars*/
 
-/*Feature usage*/
+/*Group settings*/
+#define LV_GROUP                1                  /*Enable object groups (for keyboards)*/
+
+/*Graphics feature usage*/
 #define LV_NO_ANIM				0				/*1: disable all animations*/
 #define LV_NO_SHADOW			0				/*1: disable shadows*/
 
@@ -146,18 +149,11 @@
 #define USE_LV_FONT_SYMBOL_80_FILE         0
 #define USE_LV_FONT_SYMBOL_80_FEEDBACK     0
 
-/*==================
- *  IMAGE USAGE
- *================*/
-#define LV_IMAGE_ENABLE_ALL    1       /*Unconditionally enable all image maps*/
-//#define USE_IMG_XYZ      1           /*Enable or disable to compile you image map files*/
-
 /*==================
  *  LV_OBJ SETTINGS
  *==================*/
 #define LV_OBJ_FREE_NUM_TYPE    uint32_t    /*Type of free number attribute (comment out disable free number)*/
 #define LV_OBJ_FREE_PTR         1           /*Enable the free pointer attribute*/
-#define LV_OBJ_GROUP            1           /*Enable object groups*/
 
 /*==================
  *  LV OBJ X USAGE 
@@ -180,7 +176,7 @@
 #define USE_LV_LINE     1
 
 /*******************
- * Container object
+ * Container objects
  *******************/
 
 /*Container (dependencies: -*/
@@ -199,7 +195,7 @@
 #endif
 
 /*************************
- * Data visualizer object
+ * Data visualizer objects
  *************************/
 
 /*Bar (dependencies: -)*/
@@ -228,7 +224,7 @@
 #endif
 
 /*************************
- * User input object
+ * User input objects
  *************************/
 
 /*Button (dependencies: lv_cont*/
diff --git a/lv_obj/lv_group.c b/lv_core/lv_group.c
similarity index 99%
rename from lv_obj/lv_group.c
rename to lv_core/lv_group.c
index 8ee19bc30..72b3b1b28 100644
--- a/lv_obj/lv_group.c
+++ b/lv_core/lv_group.c
@@ -7,7 +7,7 @@
  *      INCLUDES
  *********************/
 #include "lv_group.h"
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
 #include <stddef.h>
 
 /*********************
@@ -265,4 +265,4 @@ static void style_mod_def(lv_style_t * style)
     style->text.color = lv_color_mix(style->text.color, LV_COLOR_ORANGE, LV_OPA_70);
 }
 
-#endif /*LV_OBJ_GROUP != 0*/
+#endif /*LV_GROUP != 0*/
diff --git a/lv_obj/lv_group.h b/lv_core/lv_group.h
similarity index 97%
rename from lv_obj/lv_group.h
rename to lv_core/lv_group.h
index 146738db0..c0ef3a181 100644
--- a/lv_obj/lv_group.h
+++ b/lv_core/lv_group.h
@@ -20,7 +20,7 @@ extern "C" {
  *      DEFINES
  *********************/
 /*Predefined keys to control the focused object via lv_group_send(group, c)*/
-/*For compatibility in signal function define the keys regardless to LV_OBJ_GROUP*/
+/*For compatibility in signal function define the keys regardless to LV_GROUP*/
 #define LV_GROUP_KEY_UP             17      /*0x11*/
 #define LV_GROUP_KEY_DOWN           18      /*0x12*/
 #define LV_GROUP_KEY_RIGHT          19      /*0x13*/
@@ -30,7 +30,7 @@ extern "C" {
 #define LV_GROUP_KEY_NEXT           9       /*0x09, '\t'*/
 #define LV_GROUP_KEY_PREV           11      /*0x0B, '*/
 
-#if LV_OBJ_GROUP  != 0
+#if LV_GROUP  != 0
 /**********************
  *      TYPEDEFS
  **********************/
@@ -125,7 +125,7 @@ lv_obj_t * lv_group_get_focused(lv_group_t * group);
  *      MACROS
  **********************/
 
-#endif /*LV_OBJ_GROUP != 0*/
+#endif /*LV_GROUP != 0*/
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/lv_obj/lv_indev.c b/lv_core/lv_indev.c
similarity index 99%
rename from lv_obj/lv_indev.c
rename to lv_core/lv_indev.c
index c4c4765fa..995158cfa 100644
--- a/lv_obj/lv_indev.c
+++ b/lv_core/lv_indev.c
@@ -10,7 +10,7 @@
 #include "../../lv_conf.h"
 
 #include "../lv_hal/lv_hal_tick.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_misc/lv_task.h"
 #include "../lv_misc/lv_math.h"
 #include "../lv_draw/lv_draw_rbasic.h"
@@ -128,7 +128,7 @@ void lv_indev_set_cursor(lv_indev_t *indev, lv_obj_t *cur_obj)
     lv_obj_set_pos(indev->cursor, indev->proc.act_point.x,  indev->proc.act_point.y);
 }
 
-#if LV_OBJ_GROUP
+#if LV_GROUP
 /**
  * Set a destination group for a keypad input device
  * @param indev pointer to an input device (type: 'LV_INDEV_TYPE_KEYPAD')
@@ -237,7 +237,7 @@ static void indev_proc_task(void * param)
                 indev_proc_point(&i->proc);
             }
             else if (i->driver.type == LV_INDEV_TYPE_KEYPAD) {
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
                 if(i->group != NULL && data.key != 0 &&
                    data.state == LV_INDEV_STATE_PR && i->proc.last_state == LV_INDEV_STATE_REL)
                 {
diff --git a/lv_obj/lv_indev.h b/lv_core/lv_indev.h
similarity index 98%
rename from lv_obj/lv_indev.h
rename to lv_core/lv_indev.h
index 62642529f..462eef6a7 100644
--- a/lv_obj/lv_indev.h
+++ b/lv_core/lv_indev.h
@@ -15,7 +15,7 @@ extern "C" {
  *********************/
 #include "lv_obj.h"
 #include "../lv_hal/lv_hal_indev.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 
 /*********************
  *      DEFINES
@@ -66,7 +66,7 @@ void lv_indev_enable(lv_hal_indev_type_t type, bool enable);
  */
 void lv_indev_set_cursor(lv_indev_t *indev, lv_obj_t *cur_obj);
 
-#if LV_OBJ_GROUP
+#if LV_GROUP
 /**
  * Set a destination group for a keypad input device
  * @param indev pointer to an input device (type: 'LV_INDEV_TYPE_KEYPAD')
diff --git a/lv_obj/lv_obj.c b/lv_core/lv_obj.c
similarity index 99%
rename from lv_obj/lv_obj.c
rename to lv_core/lv_obj.c
index bfe72b453..a63550e16 100644
--- a/lv_obj/lv_obj.c
+++ b/lv_core/lv_obj.c
@@ -152,7 +152,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
         new_obj->free_ptr = NULL;
 #endif
 
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
         new_obj->group_p = NULL;
 #endif
 		/*Set attributes*/
@@ -197,7 +197,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
 #if LV_OBJ_FREE_PTR != 0
         new_obj->free_ptr = NULL;
 #endif
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
         new_obj->group_p = NULL;
 #endif
         
@@ -235,7 +235,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
 
         new_obj->style_p = copy->style_p;
 
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
         /*Add to the same group*/
         if(copy->group_p != NULL) {
             lv_group_add_obj(copy->group_p, new_obj);
@@ -1209,7 +1209,7 @@ lv_style_t * lv_obj_get_style(lv_obj_t * obj)
             par = par->par;
         }
     }
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
     if(obj->group_p) {
         if(lv_group_get_focused(obj->group_p) == obj) {
             style_act = lv_group_mod_style(obj->group_p, style_act);
@@ -1366,7 +1366,7 @@ void * lv_obj_get_free_ptr(lv_obj_t * obj)
 }
 #endif
 
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
 /**
  * Get the group of the object
  * @param obj pointer to an object
@@ -1539,7 +1539,7 @@ static void delete_children(lv_obj_t * obj)
 #endif
 
    /*Delete from the group*/
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
    if(obj->group_p != NULL) lv_group_remove_obj(obj);
 #endif
 
diff --git a/lv_obj/lv_obj.h b/lv_core/lv_obj.h
similarity index 99%
rename from lv_obj/lv_obj.h
rename to lv_core/lv_obj.h
index f560b3900..8cd7d9d99 100644
--- a/lv_obj/lv_obj.h
+++ b/lv_core/lv_obj.h
@@ -774,7 +774,7 @@ LV_OBJ_FREE_NUM_TYPE lv_obj_get_free_num(lv_obj_t * obj);
 void * lv_obj_get_free_ptr(lv_obj_t * obj);
 #endif
 
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
 /**
  * Get the group of the object
  * @param obj pointer to an object
diff --git a/lv_obj/lv_refr.c b/lv_core/lv_refr.c
similarity index 100%
rename from lv_obj/lv_refr.c
rename to lv_core/lv_refr.c
diff --git a/lv_obj/lv_refr.h b/lv_core/lv_refr.h
similarity index 100%
rename from lv_obj/lv_refr.h
rename to lv_core/lv_refr.h
diff --git a/lv_obj/lv_style.c b/lv_core/lv_style.c
similarity index 100%
rename from lv_obj/lv_style.c
rename to lv_core/lv_style.c
diff --git a/lv_obj/lv_style.h b/lv_core/lv_style.h
similarity index 100%
rename from lv_obj/lv_style.h
rename to lv_core/lv_style.h
diff --git a/lv_obj/lv_vdb.c b/lv_core/lv_vdb.c
similarity index 100%
rename from lv_obj/lv_vdb.c
rename to lv_core/lv_vdb.c
diff --git a/lv_obj/lv_vdb.h b/lv_core/lv_vdb.h
similarity index 100%
rename from lv_obj/lv_vdb.h
rename to lv_core/lv_vdb.h
diff --git a/lv_draw/lv_draw.h b/lv_draw/lv_draw.h
index 9e45b5812..3b41aa259 100644
--- a/lv_draw/lv_draw.h
+++ b/lv_draw/lv_draw.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_obj/lv_style.h"
+#include "../lv_core/lv_style.h"
 #include "../lv_misc/lv_txt.h"
 
 /*********************
diff --git a/lv_draw/lv_draw_vbasic.c b/lv_draw/lv_draw_vbasic.c
index 9465e4eb5..436f156a0 100644
--- a/lv_draw/lv_draw_vbasic.c
+++ b/lv_draw/lv_draw_vbasic.c
@@ -17,7 +17,7 @@
 #if LV_VDB_SIZE != 0
 
 #include <stddef.h>
-#include "../lv_obj/lv_vdb.h"
+#include "../lv_core/lv_vdb.h"
 
 /*********************
  *      INCLUDES
diff --git a/lv_hal/lv_hal_disp.c b/lv_hal/lv_hal_disp.c
index 6eb6739b0..649448220 100644
--- a/lv_hal/lv_hal_disp.c
+++ b/lv_hal/lv_hal_disp.c
@@ -13,7 +13,7 @@
 #include <stddef.h>
 #include "../lv_hal/lv_hal_disp.h"
 #include "../lv_misc/lv_mem.h"
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_bar.h b/lv_objx/lv_bar.h
index 3ed6b41e9..5edcecbf0 100644
--- a/lv_objx/lv_bar.h
+++ b/lv_objx/lv_bar.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_BAR != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_cont.h"
 #include "lv_btn.h"
 #include "lv_label.h"
diff --git a/lv_objx/lv_btn.c b/lv_objx/lv_btn.c
index 0b8473a87..3cafa7ce5 100644
--- a/lv_objx/lv_btn.c
+++ b/lv_objx/lv_btn.c
@@ -12,7 +12,7 @@
 
 #include <string.h>
 #include "lv_btn.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_area.h"
diff --git a/lv_objx/lv_btn.h b/lv_objx/lv_btn.h
index 0560546ab..5d949beee 100644
--- a/lv_objx/lv_btn.h
+++ b/lv_objx/lv_btn.h
@@ -22,7 +22,7 @@ extern "C" {
 #endif
 
 #include "lv_cont.h"
-#include "../lv_obj/lv_indev.h"
+#include "../lv_core/lv_indev.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_btnm.c b/lv_objx/lv_btnm.c
index e41b767e2..95c70e815 100644
--- a/lv_objx/lv_btnm.c
+++ b/lv_objx/lv_btnm.c
@@ -10,9 +10,9 @@
 #if USE_LV_BTNM != 0
 
 #include "lv_btnm.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
-#include "../lv_obj/lv_refr.h"
+#include "../lv_core/lv_refr.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_txt.h"
 
diff --git a/lv_objx/lv_btnm.h b/lv_objx/lv_btnm.h
index b13ccb27e..ba13cef4c 100644
--- a/lv_objx/lv_btnm.h
+++ b/lv_objx/lv_btnm.h
@@ -17,7 +17,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_BTNM != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_label.h"
 #include "lv_btn.h"
 
diff --git a/lv_objx/lv_cb.c b/lv_objx/lv_cb.c
index 6ac9bd855..5b145a56d 100644
--- a/lv_objx/lv_cb.c
+++ b/lv_objx/lv_cb.c
@@ -10,7 +10,7 @@
 #if USE_LV_CB != 0
 
 #include "lv_cb.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 
 /*********************
@@ -247,7 +247,7 @@ static bool lv_bullet_design(lv_obj_t * bullet, const lv_area_t * mask, lv_desig
     if(mode == LV_DESIGN_COVER_CHK) {
         return ancestor_bullet_design(bullet, mask, mode);
     } else if(mode == LV_DESIGN_DRAW_MAIN) {
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
         /* If the check box is the active in a group and
          * the background is not visible (transparent or empty)
          * then activate the style of the bullet*/
@@ -265,7 +265,7 @@ static bool lv_bullet_design(lv_obj_t * bullet, const lv_area_t * mask, lv_desig
 #endif
         ancestor_bullet_design(bullet, mask, mode);
 
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
         bullet->style_p = style_ori;  /*Revert the style*/
 #endif
     } else if(mode == LV_DESIGN_DRAW_POST) {
diff --git a/lv_objx/lv_cb.h b/lv_objx/lv_cb.h
index 1036875ae..fd9a68546 100644
--- a/lv_objx/lv_cb.h
+++ b/lv_objx/lv_cb.h
@@ -25,7 +25,7 @@ extern "C" {
 #error "lv_cb: lv_label is required. Enable it in lv_conf.h (USE_LV_LABEL  1) "
 #endif
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_btn.h"
 #include "lv_label.h"
 
diff --git a/lv_objx/lv_chart.h b/lv_objx/lv_chart.h
index d97cac5f7..6a5d0fc82 100644
--- a/lv_objx/lv_chart.h
+++ b/lv_objx/lv_chart.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_CHART != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_line.h"
 
 /*********************
diff --git a/lv_objx/lv_cont.h b/lv_objx/lv_cont.h
index 1171f3381..712f3cfd0 100644
--- a/lv_objx/lv_cont.h
+++ b/lv_objx/lv_cont.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_CONT != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c
index 8fb781c58..2bcd7e14e 100644
--- a/lv_objx/lv_ddlist.c
+++ b/lv_objx/lv_ddlist.c
@@ -12,8 +12,8 @@
 
 #include "lv_ddlist.h"
 #include "../lv_draw/lv_draw.h"
-#include "../lv_obj/lv_group.h"
-#include "../lv_obj/lv_indev.h"
+#include "../lv_core/lv_group.h"
+#include "../lv_core/lv_indev.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_fonts/symbol_def.h"
 #include "../lv_misc/lv_anim.h"
diff --git a/lv_objx/lv_ddlist.h b/lv_objx/lv_ddlist.h
index 22781d6ac..507196d6b 100644
--- a/lv_objx/lv_ddlist.h
+++ b/lv_objx/lv_ddlist.h
@@ -25,7 +25,7 @@ extern "C" {
 #error "lv_ddlist: lv_label is required. Enable it in lv_conf.h (USE_LV_LABEL  1) "
 #endif
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "../lv_objx/lv_page.h"
 #include "../lv_objx/lv_label.h"
 
diff --git a/lv_objx/lv_gauge.h b/lv_objx/lv_gauge.h
index 895e22392..bbd8e3489 100644
--- a/lv_objx/lv_gauge.h
+++ b/lv_objx/lv_gauge.h
@@ -21,7 +21,7 @@ extern "C" {
 #error "lv_gauge: lv_lmeter is required. Enable it in lv_conf.h (USE_LV_LMETER  1) "
 #endif
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_lmeter.h"
 #include "lv_label.h"
 #include "lv_line.h"
diff --git a/lv_objx/lv_img.h b/lv_objx/lv_img.h
index b3191be06..80340146a 100644
--- a/lv_objx/lv_img.h
+++ b/lv_objx/lv_img.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_IMG != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_fs.h"
 #include "../lv_misc/lv_fonts/symbol_def.h"
 #include "lv_label.h"
diff --git a/lv_objx/lv_kb.h b/lv_objx/lv_kb.h
index a159e3b96..a1fd170f2 100644
--- a/lv_objx/lv_kb.h
+++ b/lv_objx/lv_kb.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_KB != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_btnm.h"
 
 /*********************
diff --git a/lv_objx/lv_label.c b/lv_objx/lv_label.c
index 0cf12ce43..fe10b5781 100644
--- a/lv_objx/lv_label.c
+++ b/lv_objx/lv_label.c
@@ -10,8 +10,8 @@
 #if USE_LV_LABEL != 0
 
 #include "lv_label.h"
-#include "../lv_obj/lv_obj.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_obj.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"
@@ -629,7 +629,7 @@ static bool lv_label_design(lv_obj_t * label, const lv_area_t * mask, lv_design_
         lv_style_t * style = lv_obj_get_style(label);
         lv_obj_get_coords(label, &cords);
 
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
         lv_group_t * g = lv_obj_get_group(label);
         if(lv_group_get_focused(g) == label) {
             lv_draw_rect(&cords, mask, style);
diff --git a/lv_objx/lv_label.h b/lv_objx/lv_label.h
index 8e59479c2..1d7374fc9 100644
--- a/lv_objx/lv_label.h
+++ b/lv_objx/lv_label.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_LABEL != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_font.h"
 #include "../lv_misc/lv_txt.h"
 #include "../lv_misc/lv_fonts/symbol_def.h"
diff --git a/lv_objx/lv_led.h b/lv_objx/lv_led.h
index 7fd6e6482..641b6c8b4 100644
--- a/lv_objx/lv_led.h
+++ b/lv_objx/lv_led.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_LED != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_line.h b/lv_objx/lv_line.h
index bc6f9c66c..0923ed1cf 100644
--- a/lv_objx/lv_line.h
+++ b/lv_objx/lv_line.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_LINE != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c
index 47ecd2557..ef476e17c 100644
--- a/lv_objx/lv_list.c
+++ b/lv_objx/lv_list.c
@@ -10,7 +10,7 @@
 #if USE_LV_LIST != 0
 
 #include "lv_list.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
 #include "../lv_misc/lv_math.h"
diff --git a/lv_objx/lv_list.h b/lv_objx/lv_list.h
index 7725c5508..c14827a93 100644
--- a/lv_objx/lv_list.h
+++ b/lv_objx/lv_list.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif
 
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_page.h"
 #include "lv_btn.h"
 #include "lv_label.h"
diff --git a/lv_objx/lv_lmeter.c b/lv_objx/lv_lmeter.c
index 352fbb948..dd407cf15 100644
--- a/lv_objx/lv_lmeter.c
+++ b/lv_objx/lv_lmeter.c
@@ -12,7 +12,7 @@
 #include "lv_lmeter.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_misc/lv_trigo.h"
 
 /*********************
@@ -242,7 +242,7 @@ static bool lv_lmeter_design(lv_obj_t * lmeter, const lv_area_t * mask, lv_desig
         memcpy(&style_tmp, style, sizeof(lv_style_t));
 
 
-#if LV_OBJ_GROUP
+#if LV_GROUP
         lv_group_t *g = lv_obj_get_group(lmeter);
         if(lv_group_get_focused(g) == lmeter) {
             style_tmp.line.width += 1 << LV_ANTIALIAS;
diff --git a/lv_objx/lv_lmeter.h b/lv_objx/lv_lmeter.h
index fb09f940e..65d9899d8 100644
--- a/lv_objx/lv_lmeter.h
+++ b/lv_objx/lv_lmeter.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_LMETER != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_mbox.c b/lv_objx/lv_mbox.c
index 5c406e30e..dfad646e2 100644
--- a/lv_objx/lv_mbox.c
+++ b/lv_objx/lv_mbox.c
@@ -11,7 +11,7 @@
 #if USE_LV_MBOX != 0
 
 #include "lv_mbox.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
 #include "../lv_misc/lv_math.h"
diff --git a/lv_objx/lv_mbox.h b/lv_objx/lv_mbox.h
index 37e869357..29c436aa7 100644
--- a/lv_objx/lv_mbox.h
+++ b/lv_objx/lv_mbox.h
@@ -30,7 +30,7 @@ extern "C" {
 #endif
 
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_cont.h"
 #include "lv_btnm.h"
 #include "lv_label.h"
diff --git a/lv_objx/lv_objx_templ.h b/lv_objx/lv_objx_templ.h
index 3f02ed767..68df59fb6 100644
--- a/lv_objx/lv_objx_templ.h
+++ b/lv_objx/lv_objx_templ.h
@@ -24,7 +24,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_TEMPL != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c
index 468b6f623..61a9b3eee 100644
--- a/lv_objx/lv_page.c
+++ b/lv_objx/lv_page.c
@@ -9,11 +9,11 @@
 #include "../../lv_conf.h"
 #if USE_LV_PAGE != 0
 
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_objx/lv_page.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
-#include "../lv_obj/lv_refr.h"
+#include "../lv_core/lv_refr.h"
 #include "../lv_misc/lv_anim.h"
 #include "../lv_misc/lv_math.h"
 
@@ -389,7 +389,7 @@ static bool lv_scrl_design(lv_obj_t * scrl, const lv_area_t * mask, lv_design_mo
     if(mode == LV_DESIGN_COVER_CHK) {
         return ancestor_design(scrl, mask, mode);
     } else if(mode == LV_DESIGN_DRAW_MAIN) {
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
         /* If the page is the active in a group and
          * the background (page) is not visible (transparent or empty)
          * then activate the style of the scrollable*/
@@ -407,7 +407,7 @@ static bool lv_scrl_design(lv_obj_t * scrl, const lv_area_t * mask, lv_design_mo
 #endif
         ancestor_design(scrl, mask, mode);
 
-#if LV_OBJ_GROUP != 0
+#if LV_GROUP != 0
         scrl->style_p = style_ori;  /*Revert the style*/
 #endif
     } else if(mode == LV_DESIGN_DRAW_POST) {
diff --git a/lv_objx/lv_page.h b/lv_objx/lv_page.h
index e105043ff..7150341ac 100644
--- a/lv_objx/lv_page.h
+++ b/lv_objx/lv_page.h
@@ -22,7 +22,7 @@ extern "C" {
 #endif
 
 #include "lv_cont.h"
-#include "../lv_obj/lv_indev.h"
+#include "../lv_core/lv_indev.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_roller.c b/lv_objx/lv_roller.c
index 385c3dad6..1d24ffd1e 100644
--- a/lv_objx/lv_roller.c
+++ b/lv_objx/lv_roller.c
@@ -11,7 +11,7 @@
 
 #include "lv_roller.h"
 #include "../lv_draw/lv_draw.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 
 /*********************
diff --git a/lv_objx/lv_roller.h b/lv_objx/lv_roller.h
index 9a17fe583..799049138 100644
--- a/lv_objx/lv_roller.h
+++ b/lv_objx/lv_roller.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_ROLLER != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_ddlist.h"
 
 /*********************
diff --git a/lv_objx/lv_slider.c b/lv_objx/lv_slider.c
index ed389f8c1..7dcdb750f 100644
--- a/lv_objx/lv_slider.c
+++ b/lv_objx/lv_slider.c
@@ -10,7 +10,7 @@
 #if USE_LV_SLIDER != 0
 
 #include "lv_slider.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_math.h"
diff --git a/lv_objx/lv_slider.h b/lv_objx/lv_slider.h
index 7990b6c8d..82eac4d88 100644
--- a/lv_objx/lv_slider.h
+++ b/lv_objx/lv_slider.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf.h"
 #if USE_LV_SLIDER != 0
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_bar.h"
 
 /*********************
diff --git a/lv_objx/lv_sw.h b/lv_objx/lv_sw.h
index b7a4a53c2..9c96aa3de 100644
--- a/lv_objx/lv_sw.h
+++ b/lv_objx/lv_sw.h
@@ -21,7 +21,7 @@ extern "C" {
 #error "lv_sw: lv_slider is required. Enable it in lv_conf.h (USE_LV_SLIDER  1)"
 #endif
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_slider.h"
 
 /*********************
diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c
index e69f47118..cd203c3a9 100644
--- a/lv_objx/lv_ta.c
+++ b/lv_objx/lv_ta.c
@@ -11,7 +11,7 @@
 #if USE_LV_TA != 0
 
 #include "lv_ta.h"
-#include "../lv_obj/lv_group.h"
+#include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
diff --git a/lv_objx/lv_ta.h b/lv_objx/lv_ta.h
index d8d217f75..6a2c29058 100644
--- a/lv_objx/lv_ta.h
+++ b/lv_objx/lv_ta.h
@@ -25,7 +25,7 @@ extern "C" {
 #error "lv_ta: lv_label is required. Enable it in lv_conf.h (USE_LV_LABEL  1) "
 #endif
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_page.h"
 #include "lv_label.h"
 
diff --git a/lv_objx/lv_tabview.h b/lv_objx/lv_tabview.h
index d6e1729f9..549eb637f 100644
--- a/lv_objx/lv_tabview.h
+++ b/lv_objx/lv_tabview.h
@@ -26,7 +26,7 @@ extern "C" {
 #error "lv_tabview: lv_page is required. Enable it in lv_conf.h (USE_LV_PAGE  1) "
 #endif
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "../lv_objx/lv_win.h"
 #include "../lv_objx/lv_page.h"
 
diff --git a/lv_objx/lv_win.h b/lv_objx/lv_win.h
index e81ce1638..ec40f420a 100644
--- a/lv_objx/lv_win.h
+++ b/lv_objx/lv_win.h
@@ -34,7 +34,7 @@ extern "C" {
 #error "lv_win: lv_page is required. Enable it in lv_conf.h (USE_LV_PAGE  1) "
 #endif
 
-#include "../lv_obj/lv_obj.h"
+#include "../lv_core/lv_obj.h"
 #include "lv_cont.h"
 #include "lv_btn.h"
 #include "lv_label.h"
diff --git a/lv_themes/lv_theme.h b/lv_themes/lv_theme.h
index 2f995dd2d..272af91b7 100644
--- a/lv_themes/lv_theme.h
+++ b/lv_themes/lv_theme.h
@@ -14,7 +14,7 @@ extern "C" {
  *    INCLUDES
  *********************/
 #include "../../lv_conf.h"
-#include "../lv_obj/lv_style.h"
+#include "../lv_core/lv_style.h"
 
 /*********************
  *    DEFINES
diff --git a/lvgl.h b/lvgl.h
index 3d6d525f3..a8b8aad8d 100644
--- a/lvgl.h
+++ b/lvgl.h
@@ -19,8 +19,9 @@ extern "C" {
 
 #include "lv_hal/lv_hal.h"
 
-#include "lv_obj/lv_obj.h"
-#include "lv_obj/lv_group.h"
+#include "lv_core/lv_obj.h"
+#include "lv_core/lv_group.h"
+#include "lv_core/lv_vdb.h"
 
 #include "lv_themes/lv_theme.h"