diff --git a/libraries/AP_NavEKF/examples/AP_NavEKF/LogReader.cpp b/Tools/Replay/LogReader.cpp
similarity index 100%
rename from libraries/AP_NavEKF/examples/AP_NavEKF/LogReader.cpp
rename to Tools/Replay/LogReader.cpp
diff --git a/libraries/AP_NavEKF/examples/AP_NavEKF/LogReader.h b/Tools/Replay/LogReader.h
similarity index 100%
rename from libraries/AP_NavEKF/examples/AP_NavEKF/LogReader.h
rename to Tools/Replay/LogReader.h
diff --git a/Tools/Replay/Makefile b/Tools/Replay/Makefile
new file mode 100644
index 0000000000..3959a1654b
--- /dev/null
+++ b/Tools/Replay/Makefile
@@ -0,0 +1 @@
+include ../../mk/apm.mk
diff --git a/libraries/AP_NavEKF/examples/AP_NavEKF/AP_NavEKF.pde b/Tools/Replay/Replay.pde
similarity index 100%
rename from libraries/AP_NavEKF/examples/AP_NavEKF/AP_NavEKF.pde
rename to Tools/Replay/Replay.pde
diff --git a/libraries/AP_NavEKF/examples/AP_NavEKF/plotit.sh b/Tools/Replay/plotit.sh
similarity index 100%
rename from libraries/AP_NavEKF/examples/AP_NavEKF/plotit.sh
rename to Tools/Replay/plotit.sh
diff --git a/libraries/AP_NavEKF/examples/AP_NavEKF/Makefile b/libraries/AP_NavEKF/examples/AP_NavEKF/Makefile
deleted file mode 100644
index f5daf25151..0000000000
--- a/libraries/AP_NavEKF/examples/AP_NavEKF/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../../../../mk/apm.mk
diff --git a/libraries/AP_NavEKF/examples/AP_NavEKF/nobuild.txt b/libraries/AP_NavEKF/examples/AP_NavEKF/nobuild.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libraries/AP_NavEKF/examples/AP_NavEKF/pitch.gnu b/libraries/AP_NavEKF/examples/AP_NavEKF/pitch.gnu
deleted file mode 100644
index 8c0371d827..0000000000
--- a/libraries/AP_NavEKF/examples/AP_NavEKF/pitch.gnu
+++ /dev/null
@@ -1,3 +0,0 @@
-set style data lines
-plot "plot.dat" using "SIM.Pitch", "" using "DCM.Pitch", "" using "EKF.Pitch"
-pause -1 "hit return to exit"
diff --git a/libraries/AP_NavEKF/examples/AP_NavEKF/roll.gnu b/libraries/AP_NavEKF/examples/AP_NavEKF/roll.gnu
deleted file mode 100644
index 7a27f7a271..0000000000
--- a/libraries/AP_NavEKF/examples/AP_NavEKF/roll.gnu
+++ /dev/null
@@ -1,3 +0,0 @@
-set style data lines
-plot 'plot.dat' using "SIM.Roll", "" using "DCM.Roll", "" using "EKF.Roll"
-pause -1 "hit return to exit"