diff --git a/components/display/display/component.mk b/components/display/component.mk
similarity index 100%
rename from components/display/display/component.mk
rename to components/display/component.mk
diff --git a/components/display/display/display.c b/components/display/display.c
similarity index 100%
rename from components/display/display/display.c
rename to components/display/display.c
diff --git a/components/display/display/display.h b/components/display/display.h
similarity index 100%
rename from components/display/display/display.h
rename to components/display/display.h
diff --git a/components/display/display/driver_SSD1306.c b/components/display/driver_SSD1306.c
similarity index 100%
rename from components/display/display/driver_SSD1306.c
rename to components/display/driver_SSD1306.c
diff --git a/components/display/display/tarablessd1306/.gitignore b/components/display/tarablessd1306/.gitignore
similarity index 100%
rename from components/display/display/tarablessd1306/.gitignore
rename to components/display/tarablessd1306/.gitignore
diff --git a/components/display/display/tarablessd1306/CMakeLists.txt b/components/display/tarablessd1306/CMakeLists.txt
similarity index 100%
rename from components/display/display/tarablessd1306/CMakeLists.txt
rename to components/display/tarablessd1306/CMakeLists.txt
diff --git a/components/display/display/tarablessd1306/Kconfig b/components/display/tarablessd1306/Kconfig
similarity index 100%
rename from components/display/display/tarablessd1306/Kconfig
rename to components/display/tarablessd1306/Kconfig
diff --git a/components/display/display/tarablessd1306/LICENSE b/components/display/tarablessd1306/LICENSE
similarity index 100%
rename from components/display/display/tarablessd1306/LICENSE
rename to components/display/tarablessd1306/LICENSE
diff --git a/components/display/display/tarablessd1306/README.md b/components/display/tarablessd1306/README.md
similarity index 100%
rename from components/display/display/tarablessd1306/README.md
rename to components/display/tarablessd1306/README.md
diff --git a/components/display/display/tarablessd1306/component.mk b/components/display/tarablessd1306/component.mk
similarity index 100%
rename from components/display/display/tarablessd1306/component.mk
rename to components/display/tarablessd1306/component.mk
diff --git a/components/display/display/tarablessd1306/fonts/LICENSE-apache b/components/display/tarablessd1306/fonts/LICENSE-apache
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/LICENSE-apache
rename to components/display/tarablessd1306/fonts/LICENSE-apache
diff --git a/components/display/display/tarablessd1306/fonts/LICENSE-liberation-mono b/components/display/tarablessd1306/fonts/LICENSE-liberation-mono
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/LICENSE-liberation-mono
rename to components/display/tarablessd1306/fonts/LICENSE-liberation-mono
diff --git a/components/display/display/tarablessd1306/fonts/font_droid_sans_fallback_11x13.c b/components/display/tarablessd1306/fonts/font_droid_sans_fallback_11x13.c
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/font_droid_sans_fallback_11x13.c
rename to components/display/tarablessd1306/fonts/font_droid_sans_fallback_11x13.c
diff --git a/components/display/display/tarablessd1306/fonts/font_droid_sans_fallback_15x17.c b/components/display/tarablessd1306/fonts/font_droid_sans_fallback_15x17.c
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/font_droid_sans_fallback_15x17.c
rename to components/display/tarablessd1306/fonts/font_droid_sans_fallback_15x17.c
diff --git a/components/display/display/tarablessd1306/fonts/font_droid_sans_fallback_24x28.c b/components/display/tarablessd1306/fonts/font_droid_sans_fallback_24x28.c
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/font_droid_sans_fallback_24x28.c
rename to components/display/tarablessd1306/fonts/font_droid_sans_fallback_24x28.c
diff --git a/components/display/display/tarablessd1306/fonts/font_droid_sans_mono_13x24.c b/components/display/tarablessd1306/fonts/font_droid_sans_mono_13x24.c
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/font_droid_sans_mono_13x24.c
rename to components/display/tarablessd1306/fonts/font_droid_sans_mono_13x24.c
diff --git a/components/display/display/tarablessd1306/fonts/font_droid_sans_mono_16x31.c b/components/display/tarablessd1306/fonts/font_droid_sans_mono_16x31.c
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/font_droid_sans_mono_16x31.c
rename to components/display/tarablessd1306/fonts/font_droid_sans_mono_16x31.c
diff --git a/components/display/display/tarablessd1306/fonts/font_droid_sans_mono_7x13.c b/components/display/tarablessd1306/fonts/font_droid_sans_mono_7x13.c
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/font_droid_sans_mono_7x13.c
rename to components/display/tarablessd1306/fonts/font_droid_sans_mono_7x13.c
diff --git a/components/display/display/tarablessd1306/fonts/font_liberation_mono_13x21.c b/components/display/tarablessd1306/fonts/font_liberation_mono_13x21.c
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/font_liberation_mono_13x21.c
rename to components/display/tarablessd1306/fonts/font_liberation_mono_13x21.c
diff --git a/components/display/display/tarablessd1306/fonts/font_liberation_mono_17x30.c b/components/display/tarablessd1306/fonts/font_liberation_mono_17x30.c
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/font_liberation_mono_17x30.c
rename to components/display/tarablessd1306/fonts/font_liberation_mono_17x30.c
diff --git a/components/display/display/tarablessd1306/fonts/font_liberation_mono_9x15.c b/components/display/tarablessd1306/fonts/font_liberation_mono_9x15.c
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/font_liberation_mono_9x15.c
rename to components/display/tarablessd1306/fonts/font_liberation_mono_9x15.c
diff --git a/components/display/display/tarablessd1306/fonts/font_tarable7seg_16x32.c b/components/display/tarablessd1306/fonts/font_tarable7seg_16x32.c
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/font_tarable7seg_16x32.c
rename to components/display/tarablessd1306/fonts/font_tarable7seg_16x32.c
diff --git a/components/display/display/tarablessd1306/fonts/font_tarable7seg_32x64.c b/components/display/tarablessd1306/fonts/font_tarable7seg_32x64.c
similarity index 100%
rename from components/display/display/tarablessd1306/fonts/font_tarable7seg_32x64.c
rename to components/display/tarablessd1306/fonts/font_tarable7seg_32x64.c
diff --git a/components/display/display/tarablessd1306/ifaces/default_if_i2c.c b/components/display/tarablessd1306/ifaces/default_if_i2c.c
similarity index 100%
rename from components/display/display/tarablessd1306/ifaces/default_if_i2c.c
rename to components/display/tarablessd1306/ifaces/default_if_i2c.c
diff --git a/components/display/display/tarablessd1306/ifaces/default_if_spi.c b/components/display/tarablessd1306/ifaces/default_if_spi.c
similarity index 100%
rename from components/display/display/tarablessd1306/ifaces/default_if_spi.c
rename to components/display/tarablessd1306/ifaces/default_if_spi.c
diff --git a/components/display/display/tarablessd1306/ssd1306.c b/components/display/tarablessd1306/ssd1306.c
similarity index 100%
rename from components/display/display/tarablessd1306/ssd1306.c
rename to components/display/tarablessd1306/ssd1306.c
diff --git a/components/display/display/tarablessd1306/ssd1306.h b/components/display/tarablessd1306/ssd1306.h
similarity index 100%
rename from components/display/display/tarablessd1306/ssd1306.h
rename to components/display/tarablessd1306/ssd1306.h
diff --git a/components/display/display/tarablessd1306/ssd1306_default_if.h b/components/display/tarablessd1306/ssd1306_default_if.h
similarity index 100%
rename from components/display/display/tarablessd1306/ssd1306_default_if.h
rename to components/display/tarablessd1306/ssd1306_default_if.h
diff --git a/components/display/display/tarablessd1306/ssd1306_draw.c b/components/display/tarablessd1306/ssd1306_draw.c
similarity index 100%
rename from components/display/display/tarablessd1306/ssd1306_draw.c
rename to components/display/tarablessd1306/ssd1306_draw.c
diff --git a/components/display/display/tarablessd1306/ssd1306_draw.h b/components/display/tarablessd1306/ssd1306_draw.h
similarity index 100%
rename from components/display/display/tarablessd1306/ssd1306_draw.h
rename to components/display/tarablessd1306/ssd1306_draw.h
diff --git a/components/display/display/tarablessd1306/ssd1306_err.h b/components/display/tarablessd1306/ssd1306_err.h
similarity index 100%
rename from components/display/display/tarablessd1306/ssd1306_err.h
rename to components/display/tarablessd1306/ssd1306_err.h
diff --git a/components/display/display/tarablessd1306/ssd1306_font.c b/components/display/tarablessd1306/ssd1306_font.c
similarity index 100%
rename from components/display/display/tarablessd1306/ssd1306_font.c
rename to components/display/tarablessd1306/ssd1306_font.c
diff --git a/components/display/display/tarablessd1306/ssd1306_font.h b/components/display/tarablessd1306/ssd1306_font.h
similarity index 100%
rename from components/display/display/tarablessd1306/ssd1306_font.h
rename to components/display/tarablessd1306/ssd1306_font.h