diff --git a/apps/px4/px4io/driver/Makefile b/apps/drivers/px4io/Makefile
similarity index 100%
rename from apps/px4/px4io/driver/Makefile
rename to apps/drivers/px4io/Makefile
diff --git a/apps/px4/px4io/driver/px4io.cpp b/apps/drivers/px4io/px4io.cpp
similarity index 100%
rename from apps/px4/px4io/driver/px4io.cpp
rename to apps/drivers/px4io/px4io.cpp
diff --git a/apps/px4/px4io/driver/uploader.cpp b/apps/drivers/px4io/uploader.cpp
similarity index 100%
rename from apps/px4/px4io/driver/uploader.cpp
rename to apps/drivers/px4io/uploader.cpp
diff --git a/apps/px4/px4io/driver/uploader.h b/apps/drivers/px4io/uploader.h
similarity index 100%
rename from apps/px4/px4io/driver/uploader.h
rename to apps/drivers/px4io/uploader.h
diff --git a/apps/px4/px4io/driver/.context b/apps/px4/px4io/driver/.context
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig
index 629d9877fd..a1228bba0f 100644
--- a/nuttx/configs/px4fmu/nsh/appconfig
+++ b/nuttx/configs/px4fmu/nsh/appconfig
@@ -93,8 +93,8 @@ CONFIGURED_APPS += drivers/hmc5883
 CONFIGURED_APPS += drivers/mpu6000
 CONFIGURED_APPS += drivers/bma180
 CONFIGURED_APPS += drivers/l3gd20
+CONFIGURED_APPS	+= drivers/px4io
 CONFIGURED_APPS += drivers/stm32/tone_alarm
-CONFIGURED_APPS	+= px4/px4io/driver
 CONFIGURED_APPS += px4/fmu
 
 # Testing stuff