diff --git a/conf/modules/cv_opticflow.xml b/conf/modules/cv_opticflow.xml
index cb43273ac2..09f0cec153 100644
--- a/conf/modules/cv_opticflow.xml
+++ b/conf/modules/cv_opticflow.xml
@@ -90,11 +90,10 @@
     <file name="pprz_algebra_float.c" dir="math"/>
     <file name="pprz_matrix_decomp_float.c" dir="math"/>
 
-    <file name="edge_flow.c" dir="modules/computer_vision/opticflow"/>
-
     <!-- Main vision calculations -->
     <file name="fast_rosten.c" dir="modules/computer_vision/lib/vision"/>
     <file name="lucas_kanade.c" dir="modules/computer_vision/lib/vision"/>
+    <file name="edge_flow.c" dir="modules/computer_vision/lib/vision"/>
 
   <raw>
       include $(CFG_SHARED)/udp.makefile
diff --git a/sw/airborne/modules/computer_vision/opticflow/edge_flow.c b/sw/airborne/modules/computer_vision/lib/vision/edge_flow.c
similarity index 99%
rename from sw/airborne/modules/computer_vision/opticflow/edge_flow.c
rename to sw/airborne/modules/computer_vision/lib/vision/edge_flow.c
index bc2e39f91c..60a88b8df1 100644
--- a/sw/airborne/modules/computer_vision/opticflow/edge_flow.c
+++ b/sw/airborne/modules/computer_vision/lib/vision/edge_flow.c
@@ -4,7 +4,7 @@
  *  Created on: Feb 22, 2016
  *      Author: knmcguire
  */
-#include <opticflow/edge_flow.h>
+#include <lib/vision/edge_flow.h>
 
 
 /**
diff --git a/sw/airborne/modules/computer_vision/opticflow/edge_flow.h b/sw/airborne/modules/computer_vision/lib/vision/edge_flow.h
similarity index 100%
rename from sw/airborne/modules/computer_vision/opticflow/edge_flow.h
rename to sw/airborne/modules/computer_vision/lib/vision/edge_flow.h
diff --git a/sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.c b/sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.c
index 0ad910ea67..24bbf8c890 100644
--- a/sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.c
+++ b/sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.c
@@ -40,7 +40,7 @@
 #include "lib/vision/image.h"
 #include "lib/vision/lucas_kanade.h"
 #include "lib/vision/fast_rosten.h"
-#include "edge_flow.h"
+#include "lib/vision/edge_flow.h"
 #include "size_divergence.h"
 #include "linear_flow_fit.h"
 
diff --git a/sw/airborne/modules/computer_vision/opticflow_module.h b/sw/airborne/modules/computer_vision/opticflow_module.h
index bf350de5b4..8ed930a51a 100644
--- a/sw/airborne/modules/computer_vision/opticflow_module.h
+++ b/sw/airborne/modules/computer_vision/opticflow_module.h
@@ -29,7 +29,6 @@
 
 // Include opticflow calculator
 #include "opticflow/opticflow_calculator.h"
-#include "opticflow/edge_flow.h"
 
 // Needed for settings
 extern struct opticflow_t opticflow;