diff --git a/docs/usage.txt b/docs/usage.txt
index e2d33c18..52222ddc 100644
--- a/docs/usage.txt
+++ b/docs/usage.txt
@@ -9,7 +9,7 @@ To include any of these functions/drivers in your project...
 
 	4/ In your project Makefile add the makefiles for any specific drivers you want e.g
 		include $(LCDLIB)/halext/drivers/touchpad/touchpadXPT2046/touchpad_lld.mk
-		include $(LCDLIB)/halext/drivers/gdisp/gdispNokia6610/gdisp_lld.mk
+		include $(LCDLIB)/halext/drivers/gdisp/Nokia6610/gdisp_lld.mk
 
 	5/ In your project halconf.h turn on the support you want eg.
 		/**
diff --git a/drivers/gdisp/gdispNokia6610/GE12.h b/drivers/gdisp/Nokia6610/GE12.h
similarity index 100%
rename from drivers/gdisp/gdispNokia6610/GE12.h
rename to drivers/gdisp/Nokia6610/GE12.h
diff --git a/drivers/gdisp/gdispNokia6610/GE8.h b/drivers/gdisp/Nokia6610/GE8.h
similarity index 100%
rename from drivers/gdisp/gdispNokia6610/GE8.h
rename to drivers/gdisp/Nokia6610/GE8.h
diff --git a/drivers/gdisp/gdispNokia6610/gdisp_lld.c b/drivers/gdisp/Nokia6610/gdisp_lld.c
similarity index 100%
rename from drivers/gdisp/gdispNokia6610/gdisp_lld.c
rename to drivers/gdisp/Nokia6610/gdisp_lld.c
diff --git a/drivers/gdisp/Nokia6610/gdisp_lld.mk b/drivers/gdisp/Nokia6610/gdisp_lld.mk
new file mode 100644
index 00000000..0f09ec0f
--- /dev/null
+++ b/drivers/gdisp/Nokia6610/gdisp_lld.mk
@@ -0,0 +1,5 @@
+# List the required driver.
+LCDSRC += $(LCDLIB)/drivers/gdisp/Nokia6610/gdisp_lld.c
+
+# Required include directories
+LCDINC += $(LCDLIB)/drivers/gdisp/Nokia6610
diff --git a/drivers/gdisp/gdispNokia6610/gdisp_lld_board_example.h b/drivers/gdisp/Nokia6610/gdisp_lld_board_example.h
similarity index 100%
rename from drivers/gdisp/gdispNokia6610/gdisp_lld_board_example.h
rename to drivers/gdisp/Nokia6610/gdisp_lld_board_example.h
diff --git a/drivers/gdisp/gdispNokia6610/gdisp_lld_board_olimexsam7ex256.h b/drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h
similarity index 100%
rename from drivers/gdisp/gdispNokia6610/gdisp_lld_board_olimexsam7ex256.h
rename to drivers/gdisp/Nokia6610/gdisp_lld_board_olimexsam7ex256.h
diff --git a/drivers/gdisp/gdispNokia6610/gdisp_lld_config.h b/drivers/gdisp/Nokia6610/gdisp_lld_config.h
similarity index 100%
rename from drivers/gdisp/gdispNokia6610/gdisp_lld_config.h
rename to drivers/gdisp/Nokia6610/gdisp_lld_config.h
diff --git a/drivers/gdisp/gdispNokia6610/readme.txt b/drivers/gdisp/Nokia6610/readme.txt
similarity index 100%
rename from drivers/gdisp/gdispNokia6610/readme.txt
rename to drivers/gdisp/Nokia6610/readme.txt
diff --git a/drivers/gdisp/gdispS6d1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c
similarity index 100%
rename from drivers/gdisp/gdispS6d1121/gdisp_lld.c
rename to drivers/gdisp/S6D1121/gdisp_lld.c
diff --git a/drivers/gdisp/S6D1121/gdisp_lld.mk b/drivers/gdisp/S6D1121/gdisp_lld.mk
new file mode 100644
index 00000000..79f5c2a9
--- /dev/null
+++ b/drivers/gdisp/S6D1121/gdisp_lld.mk
@@ -0,0 +1,5 @@
+# List the required driver.
+LCDSRC += $(LCDLIB)/drivers/gdisp/S6D1121/gdisp_lld.c
+
+# Required include directories
+LCDINC += $(LCDLIB)/drivers/gdisp/S6D1121
diff --git a/drivers/gdisp/gdispS6d1121/gdisp_lld_config.h b/drivers/gdisp/S6D1121/gdisp_lld_config.h
similarity index 100%
rename from drivers/gdisp/gdispS6d1121/gdisp_lld_config.h
rename to drivers/gdisp/S6D1121/gdisp_lld_config.h
diff --git a/drivers/gdisp/gdispS6d1121/readme.txt b/drivers/gdisp/S6D1121/readme.txt
similarity index 100%
rename from drivers/gdisp/gdispS6d1121/readme.txt
rename to drivers/gdisp/S6D1121/readme.txt
diff --git a/drivers/gdisp/gdispS6d1121/s6d1121_lld.c.h b/drivers/gdisp/S6D1121/s6d1121_lld.c.h
similarity index 100%
rename from drivers/gdisp/gdispS6d1121/s6d1121_lld.c.h
rename to drivers/gdisp/S6D1121/s6d1121_lld.c.h
diff --git a/drivers/gdisp/gdispSsd1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c
similarity index 100%
rename from drivers/gdisp/gdispSsd1289/gdisp_lld.c
rename to drivers/gdisp/SSD1289/gdisp_lld.c
diff --git a/drivers/gdisp/SSD1289/gdisp_lld.mk b/drivers/gdisp/SSD1289/gdisp_lld.mk
new file mode 100644
index 00000000..247f3ef7
--- /dev/null
+++ b/drivers/gdisp/SSD1289/gdisp_lld.mk
@@ -0,0 +1,5 @@
+# List the required driver.
+LCDSRC += $(LCDLIB)/drivers/gdisp/SSD1289/gdisp_lld.c
+
+# Required include directories
+LCDINC += $(LCDLIB)/drivers/gdisp/SSD1289
diff --git a/drivers/gdisp/gdispSsd1289/gdisp_lld_config.h b/drivers/gdisp/SSD1289/gdisp_lld_config.h
similarity index 100%
rename from drivers/gdisp/gdispSsd1289/gdisp_lld_config.h
rename to drivers/gdisp/SSD1289/gdisp_lld_config.h
diff --git a/drivers/gdisp/gdispSsd1289/readme.txt b/drivers/gdisp/SSD1289/readme.txt
similarity index 100%
rename from drivers/gdisp/gdispSsd1289/readme.txt
rename to drivers/gdisp/SSD1289/readme.txt
diff --git a/drivers/gdisp/gdispSsd1289/ssd1289_lld.c.h b/drivers/gdisp/SSD1289/ssd1289_lld.c.h
similarity index 100%
rename from drivers/gdisp/gdispSsd1289/ssd1289_lld.c.h
rename to drivers/gdisp/SSD1289/ssd1289_lld.c.h
diff --git a/drivers/gdisp/gdispTestStub/gdisp_lld.c b/drivers/gdisp/TestStub/gdisp_lld.c
similarity index 100%
rename from drivers/gdisp/gdispTestStub/gdisp_lld.c
rename to drivers/gdisp/TestStub/gdisp_lld.c
diff --git a/drivers/gdisp/TestStub/gdisp_lld.mk b/drivers/gdisp/TestStub/gdisp_lld.mk
new file mode 100644
index 00000000..84c8ba7d
--- /dev/null
+++ b/drivers/gdisp/TestStub/gdisp_lld.mk
@@ -0,0 +1,5 @@
+# List the required driver.
+LCDSRC += $(LCDLIB)/drivers/gdisp/TestStub/gdisp_lld.c
+
+# Required include directories
+LCDINC += $(LCDLIB)/drivers/gdisp/TestStub
diff --git a/drivers/gdisp/gdispTestStub/gdisp_lld_config.h b/drivers/gdisp/TestStub/gdisp_lld_config.h
similarity index 100%
rename from drivers/gdisp/gdispTestStub/gdisp_lld_config.h
rename to drivers/gdisp/TestStub/gdisp_lld_config.h
diff --git a/drivers/gdisp/gdispTestStub/readme.txt b/drivers/gdisp/TestStub/readme.txt
similarity index 100%
rename from drivers/gdisp/gdispTestStub/readme.txt
rename to drivers/gdisp/TestStub/readme.txt
diff --git a/drivers/gdisp/gdispVMT/gdisp_lld.c b/drivers/gdisp/VMT/gdisp_lld.c
similarity index 100%
rename from drivers/gdisp/gdispVMT/gdisp_lld.c
rename to drivers/gdisp/VMT/gdisp_lld.c
diff --git a/drivers/gdisp/VMT/gdisp_lld.mk b/drivers/gdisp/VMT/gdisp_lld.mk
new file mode 100644
index 00000000..d4cf90be
--- /dev/null
+++ b/drivers/gdisp/VMT/gdisp_lld.mk
@@ -0,0 +1,7 @@
+# List the required driver.
+LCDSRC += 	$(LCDLIB)/drivers/gdisp/VMT/gdisp_lld.c \
+			$(LCDLIB)/drivers/gdisp/VMT/gdisp_lld_driver1.c \
+			$(LCDLIB)//drivers/gdisp/VMT/gdisp_lld_driver2.c
+
+# Required include directories
+LCDINC += 	$(LCDLIB)/drivers/gdisp/VMT
diff --git a/drivers/gdisp/gdispVMT/gdisp_lld_config.h b/drivers/gdisp/VMT/gdisp_lld_config.h
similarity index 100%
rename from drivers/gdisp/gdispVMT/gdisp_lld_config.h
rename to drivers/gdisp/VMT/gdisp_lld_config.h
diff --git a/drivers/gdisp/gdispVMT/gdisp_lld_driver1.c b/drivers/gdisp/VMT/gdisp_lld_driver1.c
similarity index 100%
rename from drivers/gdisp/gdispVMT/gdisp_lld_driver1.c
rename to drivers/gdisp/VMT/gdisp_lld_driver1.c
diff --git a/drivers/gdisp/gdispVMT/gdisp_lld_driver2.c b/drivers/gdisp/VMT/gdisp_lld_driver2.c
similarity index 100%
rename from drivers/gdisp/gdispVMT/gdisp_lld_driver2.c
rename to drivers/gdisp/VMT/gdisp_lld_driver2.c
diff --git a/drivers/gdisp/gdispVMT/readme.txt b/drivers/gdisp/VMT/readme.txt
similarity index 100%
rename from drivers/gdisp/gdispVMT/readme.txt
rename to drivers/gdisp/VMT/readme.txt
diff --git a/drivers/gdisp/gdispNokia6610/gdisp_lld.mk b/drivers/gdisp/gdispNokia6610/gdisp_lld.mk
deleted file mode 100644
index 4c980c3c..00000000
--- a/drivers/gdisp/gdispNokia6610/gdisp_lld.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# List the required driver.
-LCDSRC += $(LCDLIB)/drivers/gdisp/gdispNokia6610/gdisp_lld.c
-
-# Required include directories
-LCDINC += $(LCDLIB)/drivers/gdisp/gdispNokia6610
diff --git a/drivers/gdisp/gdispS6d1121/gdisp_lld.mk b/drivers/gdisp/gdispS6d1121/gdisp_lld.mk
deleted file mode 100644
index 1f9f093a..00000000
--- a/drivers/gdisp/gdispS6d1121/gdisp_lld.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# List the required driver.
-LCDSRC += $(LCDLIB)/drivers/gdisp/gdispS6d1121/gdisp_lld.c
-
-# Required include directories
-LCDINC += $(LCDLIB)/drivers/gdisp/gdispS6d1121
diff --git a/drivers/gdisp/gdispSsd1289/gdisp_lld.mk b/drivers/gdisp/gdispSsd1289/gdisp_lld.mk
deleted file mode 100644
index 8167cbfb..00000000
--- a/drivers/gdisp/gdispSsd1289/gdisp_lld.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# List the required driver.
-LCDSRC += $(LCDLIB)/drivers/gdisp/gdispSsd1289/gdisp_lld.c
-
-# Required include directories
-LCDINC += $(LCDLIB)/drivers/gdisp/gdispSsd1289
diff --git a/drivers/gdisp/gdispTestStub/gdisp_lld.mk b/drivers/gdisp/gdispTestStub/gdisp_lld.mk
deleted file mode 100644
index 9c5d02ea..00000000
--- a/drivers/gdisp/gdispTestStub/gdisp_lld.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# List the required driver.
-LCDSRC += $(LCDLIB)/drivers/gdisp/gdispTestStub/gdisp_lld.c
-
-# Required include directories
-LCDINC += $(LCDLIB)/drivers/gdisp/gdispTestStub
diff --git a/drivers/gdisp/gdispVMT/gdisp_lld.mk b/drivers/gdisp/gdispVMT/gdisp_lld.mk
deleted file mode 100644
index 71d75f14..00000000
--- a/drivers/gdisp/gdispVMT/gdisp_lld.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# List the required driver.
-LCDSRC += 	$(LCDLIB)/drivers/gdisp/gdispVMT/gdisp_lld.c \
-			$(LCDLIB)/os/halext/drivers/gdisp/gdispVMT/gdisp_lld_driver1.c \
-			$(LCDLIB)/os/halext/drivers/gdisp/gdispVMT/gdisp_lld_driver2.c
-
-# Required include directories
-LCDINC += 	$(LCDLIB)/drivers/gdisp/gdispVMT