diff --git a/repos/os/recipes/src/imx53_qsb_drivers/content.mk b/repos/os/recipes/src/imx53_qsb_drivers/content.mk
index 22340ee968..69a8e2a6a1 100644
--- a/repos/os/recipes/src/imx53_qsb_drivers/content.mk
+++ b/repos/os/recipes/src/imx53_qsb_drivers/content.mk
@@ -7,8 +7,8 @@ include/gpio:
 	cp -r $(REP_DIR)/include/gpio $@
 
 src/drivers:
-	mkdir -p $@/framebuffer $@/gpio/spec
-	cp -r $(REP_DIR)/src/drivers/gpio/spec/imx $@/gpio/spec/
-	cp -r $(REP_DIR)/src/drivers/gpio/spec/imx53 $@/gpio/spec/
+	mkdir -p $@/framebuffer $@/gpio
+	cp -r $(REP_DIR)/src/drivers/gpio/imx $@/gpio/
+	cp -r $(REP_DIR)/src/drivers/gpio/imx53 $@/gpio/
 	cp -r $(REP_DIR)/src/drivers/framebuffer/imx53 $@/framebuffer/
 	cp -r $(REP_DIR)/include/spec/imx53/imx_framebuffer_session $@/framebuffer/imx53/
diff --git a/repos/os/src/drivers/gpio/spec/imx/driver.h b/repos/os/src/drivers/gpio/imx/driver.h
similarity index 100%
rename from repos/os/src/drivers/gpio/spec/imx/driver.h
rename to repos/os/src/drivers/gpio/imx/driver.h
diff --git a/repos/os/src/drivers/gpio/spec/imx/gpio.h b/repos/os/src/drivers/gpio/imx/gpio.h
similarity index 100%
rename from repos/os/src/drivers/gpio/spec/imx/gpio.h
rename to repos/os/src/drivers/gpio/imx/gpio.h
diff --git a/repos/os/src/drivers/gpio/spec/imx/main.cc b/repos/os/src/drivers/gpio/imx/main.cc
similarity index 100%
rename from repos/os/src/drivers/gpio/spec/imx/main.cc
rename to repos/os/src/drivers/gpio/imx/main.cc
diff --git a/repos/os/src/drivers/gpio/spec/imx53/board.h b/repos/os/src/drivers/gpio/imx53/board.h
similarity index 100%
rename from repos/os/src/drivers/gpio/spec/imx53/board.h
rename to repos/os/src/drivers/gpio/imx53/board.h
diff --git a/repos/os/src/drivers/gpio/imx53/target.mk b/repos/os/src/drivers/gpio/imx53/target.mk
new file mode 100644
index 0000000000..7a1472d274
--- /dev/null
+++ b/repos/os/src/drivers/gpio/imx53/target.mk
@@ -0,0 +1,7 @@
+TARGET   = imx53_gpio_drv
+REQUIRES = arm_v7
+SRC_CC   = main.cc
+LIBS     = base
+INC_DIR += $(PRG_DIR) $(REP_DIR)/src/drivers/gpio/imx
+
+vpath main.cc $(REP_DIR)/src/drivers/gpio/imx
diff --git a/repos/os/src/drivers/gpio/spec/imx6/board.h b/repos/os/src/drivers/gpio/imx6/board.h
similarity index 100%
rename from repos/os/src/drivers/gpio/spec/imx6/board.h
rename to repos/os/src/drivers/gpio/imx6/board.h
diff --git a/repos/os/src/drivers/gpio/imx6/target.mk b/repos/os/src/drivers/gpio/imx6/target.mk
new file mode 100644
index 0000000000..9309358456
--- /dev/null
+++ b/repos/os/src/drivers/gpio/imx6/target.mk
@@ -0,0 +1,7 @@
+TARGET   = imx6_gpio_drv
+REQUIRES = arm_v7
+SRC_CC   = main.cc
+LIBS     = base
+INC_DIR += $(PRG_DIR) $(REP_DIR)/src/drivers/gpio/imx
+
+vpath main.cc $(REP_DIR)/src/drivers/gpio/imx
diff --git a/repos/os/src/drivers/gpio/spec/rpi/driver.h b/repos/os/src/drivers/gpio/rpi/driver.h
similarity index 100%
rename from repos/os/src/drivers/gpio/spec/rpi/driver.h
rename to repos/os/src/drivers/gpio/rpi/driver.h
diff --git a/repos/os/src/drivers/gpio/spec/rpi/empty.cc b/repos/os/src/drivers/gpio/rpi/empty.cc
similarity index 100%
rename from repos/os/src/drivers/gpio/spec/rpi/empty.cc
rename to repos/os/src/drivers/gpio/rpi/empty.cc
diff --git a/repos/os/src/drivers/gpio/spec/rpi/gpio.h b/repos/os/src/drivers/gpio/rpi/gpio.h
similarity index 100%
rename from repos/os/src/drivers/gpio/spec/rpi/gpio.h
rename to repos/os/src/drivers/gpio/rpi/gpio.h
diff --git a/repos/os/src/drivers/gpio/spec/rpi/main.cc b/repos/os/src/drivers/gpio/rpi/main.cc
similarity index 100%
rename from repos/os/src/drivers/gpio/spec/rpi/main.cc
rename to repos/os/src/drivers/gpio/rpi/main.cc
diff --git a/repos/os/src/drivers/gpio/spec/rpi/target.mk b/repos/os/src/drivers/gpio/rpi/target.mk
similarity index 100%
rename from repos/os/src/drivers/gpio/spec/rpi/target.mk
rename to repos/os/src/drivers/gpio/rpi/target.mk
diff --git a/repos/os/src/drivers/gpio/spec/imx53/target.mk b/repos/os/src/drivers/gpio/spec/imx53/target.mk
deleted file mode 100644
index b06311ea9a..0000000000
--- a/repos/os/src/drivers/gpio/spec/imx53/target.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET   = imx53_gpio_drv
-REQUIRES = arm_v7
-SRC_CC   = main.cc
-LIBS     = base
-INC_DIR += $(PRG_DIR) $(REP_DIR)/src/drivers/gpio/spec/imx
-
-vpath main.cc $(REP_DIR)/src/drivers/gpio/spec/imx
diff --git a/repos/os/src/drivers/gpio/spec/imx6/target.mk b/repos/os/src/drivers/gpio/spec/imx6/target.mk
deleted file mode 100644
index 8e2a242322..0000000000
--- a/repos/os/src/drivers/gpio/spec/imx6/target.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET   = imx6_gpio_drv
-REQUIRES = arm_v7
-SRC_CC   = main.cc
-LIBS     = base
-INC_DIR += $(PRG_DIR) $(REP_DIR)/src/drivers/gpio/spec/imx
-
-vpath main.cc $(REP_DIR)/src/drivers/gpio/spec/imx