diff --git a/Tools/ecl_ekf/drag_fusion_tuning/pcoef_tuning.py b/src/modules/ekf2/EKF/python/tuning_tools/baro_static_pressure_compensation/baro_static_pressure_compensation_tuning.py
similarity index 97%
rename from Tools/ecl_ekf/drag_fusion_tuning/pcoef_tuning.py
rename to src/modules/ekf2/EKF/python/tuning_tools/baro_static_pressure_compensation/baro_static_pressure_compensation_tuning.py
index 5e49fee304..7ca6b8f733 100644
--- a/Tools/ecl_ekf/drag_fusion_tuning/pcoef_tuning.py
+++ b/src/modules/ekf2/EKF/python/tuning_tools/baro_static_pressure_compensation/baro_static_pressure_compensation_tuning.py
@@ -29,10 +29,12 @@
     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 
-File: pcoef_tuning.py
+File: baro_static_pressure_compensation_tuning.py
 Author: Mathieu Bresciani <mathieu@auterion.com>
 License: BSD 3-Clause
 Description:
+    Tune the coefficients used to compensate for
+    dynamic pressure disturbances on the barometer
     NOTE: this script currently assumes no wind.
 """
 
@@ -188,7 +190,7 @@ def run(logfile):
 
     # Plot data
     plt.figure(1)
-    plt.suptitle(f"Report of pcoef_tuning.py {logfile.split('/')[-1]}")
+    plt.suptitle(f"Report of baro_static_pressure_compensation.py {logfile.split('/')[-1]}")
     ax1 = plt.subplot(3, 1, 1)
     ax1.set_title(f"PCoef_xn = {pcoef_xn:.3f}, PCoef_xp = {pcoef_xp:.3f}\nPCoef_yn = {pcoef_yn:.3f}, PCoef_yp = {pcoef_yp:.3f}, PCoef_z = {pcoef_z:.3f}")
     ax1.plot(t, baro-baro[0])
diff --git a/src/modules/ekf2/EKF/python/tuning_tools/baro_static_pressure_compensation/requirements.txt b/src/modules/ekf2/EKF/python/tuning_tools/baro_static_pressure_compensation/requirements.txt
new file mode 100644
index 0000000000..34ac465f48
--- /dev/null
+++ b/src/modules/ekf2/EKF/python/tuning_tools/baro_static_pressure_compensation/requirements.txt
@@ -0,0 +1,5 @@
+matplotlib==3.5.1
+numpy==1.22.2
+pyulog==0.9.0
+quaternion==3.5.2.post4
+scipy==1.8.0
diff --git a/Tools/ecl_ekf/drag_fusion_tuning/drag_fusion_symbolic.py b/src/modules/ekf2/EKF/python/tuning_tools/mc_wind_estimator/drag_fusion_symbolic.py
similarity index 100%
rename from Tools/ecl_ekf/drag_fusion_tuning/drag_fusion_symbolic.py
rename to src/modules/ekf2/EKF/python/tuning_tools/mc_wind_estimator/drag_fusion_symbolic.py
diff --git a/Tools/ecl_ekf/drag_fusion_tuning/mc_wind_estimator_tuning.py b/src/modules/ekf2/EKF/python/tuning_tools/mc_wind_estimator/mc_wind_estimator_tuning.py
similarity index 100%
rename from Tools/ecl_ekf/drag_fusion_tuning/mc_wind_estimator_tuning.py
rename to src/modules/ekf2/EKF/python/tuning_tools/mc_wind_estimator/mc_wind_estimator_tuning.py
diff --git a/Tools/ecl_ekf/drag_fusion_tuning/readme.md b/src/modules/ekf2/EKF/python/tuning_tools/mc_wind_estimator/readme.md
similarity index 100%
rename from Tools/ecl_ekf/drag_fusion_tuning/readme.md
rename to src/modules/ekf2/EKF/python/tuning_tools/mc_wind_estimator/readme.md
diff --git a/Tools/ecl_ekf/drag_fusion_tuning/requirements.txt b/src/modules/ekf2/EKF/python/tuning_tools/mc_wind_estimator/requirements.txt
similarity index 100%
rename from Tools/ecl_ekf/drag_fusion_tuning/requirements.txt
rename to src/modules/ekf2/EKF/python/tuning_tools/mc_wind_estimator/requirements.txt