diff --git a/apps/commander/accelerometer_calibration.c b/src/modules/commander/accelerometer_calibration.c
similarity index 100%
rename from apps/commander/accelerometer_calibration.c
rename to src/modules/commander/accelerometer_calibration.c
diff --git a/apps/commander/accelerometer_calibration.h b/src/modules/commander/accelerometer_calibration.h
similarity index 100%
rename from apps/commander/accelerometer_calibration.h
rename to src/modules/commander/accelerometer_calibration.h
diff --git a/src/modules/commander/module.mk b/src/modules/commander/module.mk
index 556d5c2df6..fe44e955ad 100644
--- a/src/modules/commander/module.mk
+++ b/src/modules/commander/module.mk
@@ -35,7 +35,9 @@
 # Main system state machine
 #
 
-MODULE_COMMAND	 = commander
-SRCS		 = commander.c \
-			   state_machine_helper.c \
-			   calibration_routines.c
+MODULE_COMMAND	 	= commander
+SRCS		 	= commander.c \
+			state_machine_helper.c \
+			calibration_routines.c \
+			accelerometer_calibration.c
+