diff --git a/project/ampcontrol-f103.files b/project/ampcontrol-f103.files
index 2fed7b8f..875fdc75 100644
--- a/project/ampcontrol-f103.files
+++ b/project/ampcontrol-f103.files
@@ -1,8 +1,8 @@
-../src/.astylerc
 ../src/action.h
 ../src/amp.c
 ../src/amp.h
 ../src/amp_main.c
+../src/.astylerc
 ../src/audio/audio.c
 ../src/audio/audiodefs.h
 ../src/audio/audio.h
@@ -26,6 +26,38 @@
 ../src/display/dispconf.h
 ../src/display/dispdrv.c
 ../src/display/dispdrv.h
+../src/display/dispdrv/hx8340.c
+../src/display/dispdrv/hx8347a.c
+../src/display/dispdrv/hx8347d.c
+../src/display/dispdrv/hx8357c.c
+../src/display/dispdrv/ili9163.c
+../src/display/dispdrv/ili9225.c
+../src/display/dispdrv/ili9320.c
+../src/display/dispdrv/ili9327.c
+../src/display/dispdrv/ili9341.c
+../src/display/dispdrv/ili9481.c
+../src/display/dispdrv/ili9486.c
+../src/display/dispdrv/l2f50126.c
+../src/display/dispdrv/lgdp4524.c
+../src/display/dispdrv/lph9157.c
+../src/display/dispdrv/ls020.c
+../src/display/dispdrv/mc2pa8201.c
+../src/display/dispdrv/r61581.c
+../src/display/dispdrv/rm68140.c
+../src/display/dispdrv/s6d0129.c
+../src/display/dispdrv/s6d0139.c
+../src/display/dispdrv/s6d0144.c
+../src/display/dispdrv/s6d0164.c
+../src/display/dispdrv/s6d04d1.c
+../src/display/dispdrv/spfd5408.c
+../src/display/dispdrv/ssd1283a.c
+../src/display/dispdrv/ssd1286a.c
+../src/display/dispdrv/ssd1289.c
+../src/display/dispdrv/ssd2119.c
+../src/display/dispdrv/st7735.c
+../src/display/dispdrv/st7793.c
+../src/display/dispdrv/st7796s.c
+../src/display/fonts/fonts.h
 ../src/display/fonts/font-terminus-12.c
 ../src/display/fonts/font-terminus-14b.c
 ../src/display/fonts/font-terminus-14.c
@@ -43,38 +75,6 @@
 ../src/display/fonts/font-terminus-28.c
 ../src/display/fonts/font-terminus-32b.c
 ../src/display/fonts/font-terminus-32.c
-../src/display/fonts/fonts.h
-../src/display/gc130x130/ssd1283a.c
-../src/display/gc160x128/ili9163.c
-../src/display/gc160x128/s6d0144.c
-../src/display/gc160x128/st7735.c
-../src/display/gc176x132/l2f50126.c
-../src/display/gc176x132/lph9157.c
-../src/display/gc176x132/ls020.c
-../src/display/gc176x132/ssd1286a.c
-../src/display/gc220x176/hx8340.c
-../src/display/gc220x176/ili9225.c
-../src/display/gc220x176/lgdp4524.c
-../src/display/gc220x176/s6d0164.c
-../src/display/gc320x240/hx8347a.c
-../src/display/gc320x240/hx8347d.c
-../src/display/gc320x240/ili9320.c
-../src/display/gc320x240/ili9341.c
-../src/display/gc320x240/mc2pa8201.c
-../src/display/gc320x240/s6d0129.c
-../src/display/gc320x240/s6d0139.c
-../src/display/gc320x240/spfd5408.c
-../src/display/gc320x240/ssd1289.c
-../src/display/gc320x240/ssd2119.c
-../src/display/gc400x240/ili9327.c
-../src/display/gc400x240/s6d04d1.c
-../src/display/gc400x240/st7793.c
-../src/display/gc480x320/hx8357c.c
-../src/display/gc480x320/ili9481.c
-../src/display/gc480x320/ili9486.c
-../src/display/gc480x320/r61581.c
-../src/display/gc480x320/rm68140.c
-../src/display/gc480x320/st7796s.c
 ../src/display/glcd.c
 ../src/display/glcd.h
 ../src/display/hw/stm32f1.h
@@ -237,10 +237,10 @@
 ../src/system/system_stm32f3xx.c
 ../src/timers.c
 ../src/timers.h
-../src/tr/labels.c
-../src/tr/labels.h
 ../src/tr/labels_by.c
+../src/tr/labels.c
 ../src/tr/labels_en.c
+../src/tr/labels.h
 ../src/tr/labels_ru.c
 ../src/tr/labels_tr.c
 ../src/tr/labels_ua.c
diff --git a/src/Makefile b/src/Makefile
index 9011a2cb..00af024a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -84,27 +84,21 @@ ifneq (,$(filter $(DISPLAY), \
   ST7735    \
 ))
   DISPSIZE = 160x128
-endif
-
-ifneq (,$(filter $(DISPLAY), \
+else ifneq (,$(filter $(DISPLAY), \
   L2F50126  \
   LPH9157   \
   LS020     \
   SSD1286A  \
 ))
   DISPSIZE = 176x132
-endif
-
-ifneq (,$(filter $(DISPLAY), \
+else ifneq (,$(filter $(DISPLAY), \
   HX8340    \
   ILI9225   \
   LGDP4524  \
   S6D0164   \
 ))
   DISPSIZE = 220x176
-endif
-
-ifneq (,$(filter $(DISPLAY), \
+else ifneq (,$(filter $(DISPLAY), \
   HX8347A   \
   HX8347D   \
   ILI9320   \
@@ -117,17 +111,13 @@ ifneq (,$(filter $(DISPLAY), \
   SSD2119   \
 ))
   DISPSIZE = 320x240
-endif
-
-ifneq (,$(filter $(DISPLAY), \
+else ifneq (,$(filter $(DISPLAY), \
   ILI9327   \
   S6D04D1   \
   ST7793    \
 ))
   DISPSIZE = 400x240
-endif
-
-ifneq (,$(filter $(DISPLAY), \
+else ifneq (,$(filter $(DISPLAY), \
   HX8357C   \
   ILI9481   \
   ILI9486   \
@@ -138,7 +128,7 @@ ifneq (,$(filter $(DISPLAY), \
   DISPSIZE = 480x320
 endif
 
-C_SOURCES += display/gc$(DISPSIZE)/$(call lc,$(DISPLAY)).c
+C_SOURCES += display/dispdrv/$(call lc,$(DISPLAY)).c
 C_SOURCES += display/dispdrv.c
 C_SOURCES += display/glcd.c
 C_DEFS += -D_$(DISPLAY)
diff --git a/src/display/gc220x176/hx8340.c b/src/display/dispdrv/hx8340.c
similarity index 100%
rename from src/display/gc220x176/hx8340.c
rename to src/display/dispdrv/hx8340.c
diff --git a/src/display/gc320x240/hx8347a.c b/src/display/dispdrv/hx8347a.c
similarity index 100%
rename from src/display/gc320x240/hx8347a.c
rename to src/display/dispdrv/hx8347a.c
diff --git a/src/display/gc320x240/hx8347d.c b/src/display/dispdrv/hx8347d.c
similarity index 100%
rename from src/display/gc320x240/hx8347d.c
rename to src/display/dispdrv/hx8347d.c
diff --git a/src/display/gc480x320/hx8357c.c b/src/display/dispdrv/hx8357c.c
similarity index 100%
rename from src/display/gc480x320/hx8357c.c
rename to src/display/dispdrv/hx8357c.c
diff --git a/src/display/gc160x128/ili9163.c b/src/display/dispdrv/ili9163.c
similarity index 100%
rename from src/display/gc160x128/ili9163.c
rename to src/display/dispdrv/ili9163.c
diff --git a/src/display/gc220x176/ili9225.c b/src/display/dispdrv/ili9225.c
similarity index 100%
rename from src/display/gc220x176/ili9225.c
rename to src/display/dispdrv/ili9225.c
diff --git a/src/display/gc320x240/ili9320.c b/src/display/dispdrv/ili9320.c
similarity index 100%
rename from src/display/gc320x240/ili9320.c
rename to src/display/dispdrv/ili9320.c
diff --git a/src/display/gc400x240/ili9327.c b/src/display/dispdrv/ili9327.c
similarity index 100%
rename from src/display/gc400x240/ili9327.c
rename to src/display/dispdrv/ili9327.c
diff --git a/src/display/gc320x240/ili9341.c b/src/display/dispdrv/ili9341.c
similarity index 100%
rename from src/display/gc320x240/ili9341.c
rename to src/display/dispdrv/ili9341.c
diff --git a/src/display/gc480x320/ili9481.c b/src/display/dispdrv/ili9481.c
similarity index 100%
rename from src/display/gc480x320/ili9481.c
rename to src/display/dispdrv/ili9481.c
diff --git a/src/display/gc480x320/ili9486.c b/src/display/dispdrv/ili9486.c
similarity index 100%
rename from src/display/gc480x320/ili9486.c
rename to src/display/dispdrv/ili9486.c
diff --git a/src/display/gc176x132/l2f50126.c b/src/display/dispdrv/l2f50126.c
similarity index 100%
rename from src/display/gc176x132/l2f50126.c
rename to src/display/dispdrv/l2f50126.c
diff --git a/src/display/gc220x176/lgdp4524.c b/src/display/dispdrv/lgdp4524.c
similarity index 100%
rename from src/display/gc220x176/lgdp4524.c
rename to src/display/dispdrv/lgdp4524.c
diff --git a/src/display/gc176x132/lph9157.c b/src/display/dispdrv/lph9157.c
similarity index 100%
rename from src/display/gc176x132/lph9157.c
rename to src/display/dispdrv/lph9157.c
diff --git a/src/display/gc176x132/ls020.c b/src/display/dispdrv/ls020.c
similarity index 100%
rename from src/display/gc176x132/ls020.c
rename to src/display/dispdrv/ls020.c
diff --git a/src/display/gc320x240/mc2pa8201.c b/src/display/dispdrv/mc2pa8201.c
similarity index 100%
rename from src/display/gc320x240/mc2pa8201.c
rename to src/display/dispdrv/mc2pa8201.c
diff --git a/src/display/gc480x320/r61581.c b/src/display/dispdrv/r61581.c
similarity index 100%
rename from src/display/gc480x320/r61581.c
rename to src/display/dispdrv/r61581.c
diff --git a/src/display/gc480x320/rm68140.c b/src/display/dispdrv/rm68140.c
similarity index 100%
rename from src/display/gc480x320/rm68140.c
rename to src/display/dispdrv/rm68140.c
diff --git a/src/display/gc320x240/s6d0129.c b/src/display/dispdrv/s6d0129.c
similarity index 100%
rename from src/display/gc320x240/s6d0129.c
rename to src/display/dispdrv/s6d0129.c
diff --git a/src/display/gc320x240/s6d0139.c b/src/display/dispdrv/s6d0139.c
similarity index 100%
rename from src/display/gc320x240/s6d0139.c
rename to src/display/dispdrv/s6d0139.c
diff --git a/src/display/gc160x128/s6d0144.c b/src/display/dispdrv/s6d0144.c
similarity index 100%
rename from src/display/gc160x128/s6d0144.c
rename to src/display/dispdrv/s6d0144.c
diff --git a/src/display/gc220x176/s6d0164.c b/src/display/dispdrv/s6d0164.c
similarity index 100%
rename from src/display/gc220x176/s6d0164.c
rename to src/display/dispdrv/s6d0164.c
diff --git a/src/display/gc400x240/s6d04d1.c b/src/display/dispdrv/s6d04d1.c
similarity index 100%
rename from src/display/gc400x240/s6d04d1.c
rename to src/display/dispdrv/s6d04d1.c
diff --git a/src/display/gc320x240/spfd5408.c b/src/display/dispdrv/spfd5408.c
similarity index 100%
rename from src/display/gc320x240/spfd5408.c
rename to src/display/dispdrv/spfd5408.c
diff --git a/src/display/gc130x130/ssd1283a.c b/src/display/dispdrv/ssd1283a.c
similarity index 100%
rename from src/display/gc130x130/ssd1283a.c
rename to src/display/dispdrv/ssd1283a.c
diff --git a/src/display/gc176x132/ssd1286a.c b/src/display/dispdrv/ssd1286a.c
similarity index 100%
rename from src/display/gc176x132/ssd1286a.c
rename to src/display/dispdrv/ssd1286a.c
diff --git a/src/display/gc320x240/ssd1289.c b/src/display/dispdrv/ssd1289.c
similarity index 100%
rename from src/display/gc320x240/ssd1289.c
rename to src/display/dispdrv/ssd1289.c
diff --git a/src/display/gg256x64/ssd1322.c b/src/display/dispdrv/ssd1322.c
similarity index 100%
rename from src/display/gg256x64/ssd1322.c
rename to src/display/dispdrv/ssd1322.c
diff --git a/src/display/gc320x240/ssd2119.c b/src/display/dispdrv/ssd2119.c
similarity index 100%
rename from src/display/gc320x240/ssd2119.c
rename to src/display/dispdrv/ssd2119.c
diff --git a/src/display/gc160x128/st7735.c b/src/display/dispdrv/st7735.c
similarity index 100%
rename from src/display/gc160x128/st7735.c
rename to src/display/dispdrv/st7735.c
diff --git a/src/display/gc400x240/st7793.c b/src/display/dispdrv/st7793.c
similarity index 100%
rename from src/display/gc400x240/st7793.c
rename to src/display/dispdrv/st7793.c
diff --git a/src/display/gc480x320/st7796s.c b/src/display/dispdrv/st7796s.c
similarity index 100%
rename from src/display/gc480x320/st7796s.c
rename to src/display/dispdrv/st7796s.c