diff --git a/apps/drivers/boards/px4fmuv2/Makefile b/apps/drivers/boards/px4fmuv2/Makefile
deleted file mode 100644
index 9c04a8c42a..0000000000
--- a/apps/drivers/boards/px4fmuv2/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2012 PX4 Development Team. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name PX4 nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-#
-# Board-specific startup code for the PX4FMUv2
-#
-
-INCLUDES	 = $(TOPDIR)/arch/arm/src/stm32 $(TOPDIR)/arch/arm/src/common
-LIBNAME		 = brd_px4fmuv2
-
-include $(APPDIR)/mk/app.mk
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk
index 39b47d8174..1a6c91b269 100644
--- a/makefiles/config_px4fmu_default.mk
+++ b/makefiles/config_px4fmu_default.mk
@@ -10,7 +10,7 @@ ROMFS_ROOT	 = $(PX4_BASE)/ROMFS/px4fmu_common
 #
 # Board support modules
 #
-MODULES		+= device/px4fmu
+MODULES		+= drivers/px4fmu
 
 #
 # Transitional support - add commands from the NuttX export archive.
diff --git a/makefiles/config_px4fmuv2_default.mk b/makefiles/config_px4fmuv2_default.mk
index 11ca5227e9..d296c5379c 100644
--- a/makefiles/config_px4fmuv2_default.mk
+++ b/makefiles/config_px4fmuv2_default.mk
@@ -10,9 +10,10 @@ ROMFS_ROOT	 = $(PX4_BASE)/ROMFS/px4fmu_common
 #
 # Board support modules
 #
-MODULES		+= device/lsm303d
-MODULES		+= device/px4fmu
-MODULES		+= device/rgbled
+MODULES		+= drivers/boards/px4fmuv2
+MODULES		+= drivers/lsm303d
+MODULES		+= drivers/px4fmu
+MODULES		+= drivers/rgbled
 
 #
 # Transitional support - add commands from the NuttX export archive.
diff --git a/src/drivers/boards/px4fmuv2/module.mk b/src/drivers/boards/px4fmuv2/module.mk
new file mode 100644
index 0000000000..eb8841e4d1
--- /dev/null
+++ b/src/drivers/boards/px4fmuv2/module.mk
@@ -0,0 +1,9 @@
+#
+# Board-specific startup code for the PX4FMUv2
+#
+
+SRCS		 = px4fmu_can.c \
+		   px4fmu_init.c \
+		   px4fmu_pwm_servo.c \
+		   px4fmu_spi.c \
+		   px4fmu_usb.c
diff --git a/apps/drivers/boards/px4fmuv2/px4fmu_can.c b/src/drivers/boards/px4fmuv2/px4fmu_can.c
similarity index 100%
rename from apps/drivers/boards/px4fmuv2/px4fmu_can.c
rename to src/drivers/boards/px4fmuv2/px4fmu_can.c
diff --git a/apps/drivers/boards/px4fmuv2/px4fmu_init.c b/src/drivers/boards/px4fmuv2/px4fmu_init.c
similarity index 100%
rename from apps/drivers/boards/px4fmuv2/px4fmu_init.c
rename to src/drivers/boards/px4fmuv2/px4fmu_init.c
diff --git a/apps/drivers/boards/px4fmuv2/px4fmu_internal.h b/src/drivers/boards/px4fmuv2/px4fmu_internal.h
similarity index 100%
rename from apps/drivers/boards/px4fmuv2/px4fmu_internal.h
rename to src/drivers/boards/px4fmuv2/px4fmu_internal.h
diff --git a/apps/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c b/src/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c
similarity index 100%
rename from apps/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c
rename to src/drivers/boards/px4fmuv2/px4fmu_pwm_servo.c
diff --git a/apps/drivers/boards/px4fmuv2/px4fmu_spi.c b/src/drivers/boards/px4fmuv2/px4fmu_spi.c
similarity index 100%
rename from apps/drivers/boards/px4fmuv2/px4fmu_spi.c
rename to src/drivers/boards/px4fmuv2/px4fmu_spi.c
diff --git a/apps/drivers/boards/px4fmuv2/px4fmu_usb.c b/src/drivers/boards/px4fmuv2/px4fmu_usb.c
similarity index 100%
rename from apps/drivers/boards/px4fmuv2/px4fmu_usb.c
rename to src/drivers/boards/px4fmuv2/px4fmu_usb.c
diff --git a/src/device/lsm303d/lsm303d.cpp b/src/drivers/lsm303d/lsm303d.cpp
similarity index 100%
rename from src/device/lsm303d/lsm303d.cpp
rename to src/drivers/lsm303d/lsm303d.cpp
diff --git a/src/device/lsm303d/module.mk b/src/drivers/lsm303d/module.mk
similarity index 100%
rename from src/device/lsm303d/module.mk
rename to src/drivers/lsm303d/module.mk
diff --git a/src/device/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp
similarity index 100%
rename from src/device/px4fmu/fmu.cpp
rename to src/drivers/px4fmu/fmu.cpp
diff --git a/src/device/px4fmu/module.mk b/src/drivers/px4fmu/module.mk
similarity index 100%
rename from src/device/px4fmu/module.mk
rename to src/drivers/px4fmu/module.mk
diff --git a/src/device/rgbled/module.mk b/src/drivers/rgbled/module.mk
similarity index 100%
rename from src/device/rgbled/module.mk
rename to src/drivers/rgbled/module.mk
diff --git a/src/device/rgbled/rgbled.cpp b/src/drivers/rgbled/rgbled.cpp
similarity index 100%
rename from src/device/rgbled/rgbled.cpp
rename to src/drivers/rgbled/rgbled.cpp