diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk
index 80c34d5dd9..aae7e9b0e1 100644
--- a/makefiles/config_px4fmu_default.mk
+++ b/makefiles/config_px4fmu_default.mk
@@ -15,8 +15,7 @@ MODULES		+= drivers/boards/px4fmu
 MODULES		+= drivers/l3gd20
 MODULES		+= drivers/ardrone_interface
 MODULES		+= drivers/px4io
-# sensors app is WIP
-#MODULES		+= modules/sensors
+MODULES		+= modules/sensors
 
 #
 # System commands
diff --git a/apps/sensors/.context b/src/modules/sensors/.context
similarity index 100%
rename from apps/sensors/.context
rename to src/modules/sensors/.context
diff --git a/apps/sensors/Makefile b/src/modules/sensors/module.mk
similarity index 88%
rename from apps/sensors/Makefile
rename to src/modules/sensors/module.mk
index 526fb0164f..ebbc580e10 100644
--- a/apps/sensors/Makefile
+++ b/src/modules/sensors/module.mk
@@ -1,6 +1,6 @@
 ############################################################################
 #
-#   Copyright (C) 2012 PX4 Development Team. All rights reserved.
+#   Copyright (c) 2012, 2013 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
@@ -35,11 +35,8 @@
 # Makefile to build the sensor data collector
 #
 
-APPNAME		= sensors
-PRIORITY	= SCHED_PRIORITY_MAX-5
-STACKSIZE	= 4096
+MODULE_COMMAND	= sensors
+MODULE_PRIORITY	= "SCHED_PRIORITY_MAX-5"
 
-CXXSRCS		= sensors.cpp
-CSRCS		= sensor_params.c
-
-include $(APPDIR)/mk/app.mk
+SRCS		= sensors.cpp \
+		  sensor_params.c
diff --git a/apps/sensors/sensor_params.c b/src/modules/sensors/sensor_params.c
similarity index 100%
rename from apps/sensors/sensor_params.c
rename to src/modules/sensors/sensor_params.c
diff --git a/apps/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp
similarity index 100%
rename from apps/sensors/sensors.cpp
rename to src/modules/sensors/sensors.cpp