diff --git a/src/modules/events/CMakeLists.txt b/src/modules/events/CMakeLists.txt
index fc4f92e086..1050916d5a 100644
--- a/src/modules/events/CMakeLists.txt
+++ b/src/modules/events/CMakeLists.txt
@@ -38,9 +38,9 @@ px4_add_module(
 	COMPILE_FLAGS
 	SRCS
 		send_event.cpp
-		temperature_gyro_calibration.cpp
-		temperature_accel_calibration.cpp
-		temperature_baro_calibration.cpp
+		temperature_calibration/gyro.cpp
+		temperature_calibration/accel.cpp
+		temperature_calibration/baro.cpp
 	DEPENDS
 		platforms__common
 		modules__uORB
diff --git a/src/modules/events/send_event.cpp b/src/modules/events/send_event.cpp
index 5016860f6e..c5df13c3b3 100644
--- a/src/modules/events/send_event.cpp
+++ b/src/modules/events/send_event.cpp
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 #include "send_event.h"
-#include "temperature_calibration.h"
+#include "temperature_calibration/temperature_calibration.h"
 
 #include <px4_log.h>
 #include <drivers/drv_hrt.h>
@@ -129,7 +129,9 @@ void SendEvent::process_commands()
 			} else {
 				answer_command(cmd, vehicle_command_s::VEHICLE_CMD_RESULT_FAILED);
 			}
-		} else if  ((int)(cmd.param1) == 3) { //TODO: this needs to be specified in mavlink (and adjust commander accordingly)...
+
+		} else if ((int)(cmd.param1) ==
+			   3) {  //TODO: this needs to be specified in mavlink (and adjust commander accordingly)...
 
 			if (run_temperature_accel_calibration() == 0) {
 				answer_command(cmd, vehicle_command_s::VEHICLE_CMD_RESULT_ACCEPTED);
@@ -137,7 +139,9 @@ void SendEvent::process_commands()
 			} else {
 				answer_command(cmd, vehicle_command_s::VEHICLE_CMD_RESULT_FAILED);
 			}
-		} else if  ((int)(cmd.param1) == 4) { //TODO: this needs to be specified in mavlink (and adjust commander accordingly)...
+
+		} else if ((int)(cmd.param1) ==
+			   4) {  //TODO: this needs to be specified in mavlink (and adjust commander accordingly)...
 
 			if (run_temperature_baro_calibration() == 0) {
 				answer_command(cmd, vehicle_command_s::VEHICLE_CMD_RESULT_ACCEPTED);
diff --git a/src/modules/events/temperature_accel_calibration.cpp b/src/modules/events/temperature_calibration/accel.cpp
similarity index 100%
rename from src/modules/events/temperature_accel_calibration.cpp
rename to src/modules/events/temperature_calibration/accel.cpp
diff --git a/src/modules/events/temperature_baro_calibration.cpp b/src/modules/events/temperature_calibration/baro.cpp
similarity index 100%
rename from src/modules/events/temperature_baro_calibration.cpp
rename to src/modules/events/temperature_calibration/baro.cpp
diff --git a/src/modules/events/temperature_gyro_calibration.cpp b/src/modules/events/temperature_calibration/gyro.cpp
similarity index 100%
rename from src/modules/events/temperature_gyro_calibration.cpp
rename to src/modules/events/temperature_calibration/gyro.cpp
diff --git a/src/modules/events/polyfit.hpp b/src/modules/events/temperature_calibration/polyfit.hpp
similarity index 100%
rename from src/modules/events/polyfit.hpp
rename to src/modules/events/temperature_calibration/polyfit.hpp
diff --git a/src/modules/events/temperature_calibration.h b/src/modules/events/temperature_calibration/temperature_calibration.h
similarity index 100%
rename from src/modules/events/temperature_calibration.h
rename to src/modules/events/temperature_calibration/temperature_calibration.h