diff --git a/Trajectories/draw_segments.py b/Trajectories/Analysis/draw_segments.py
similarity index 100%
rename from Trajectories/draw_segments.py
rename to Trajectories/Analysis/draw_segments.py
diff --git a/Trajectories/Analysis/edgelist_to_Graphviz.py b/Trajectories/Analysis/edgelist_to_Graphviz.py
new file mode 120000
index 0000000000000000000000000000000000000000..63e79f9cffca40b88cad71b932a402d2b8dd61ec
--- /dev/null
+++ b/Trajectories/Analysis/edgelist_to_Graphviz.py
@@ -0,0 +1 @@
+../../Overlap/Analysis/edgelist_to_Graphviz.py
\ No newline at end of file
diff --git a/Trajectories/extract_traj.py b/Trajectories/Analysis/extract_traj.py
similarity index 100%
rename from Trajectories/extract_traj.py
rename to Trajectories/Analysis/extract_traj.py
diff --git a/Trajectories/filter_traj.py b/Trajectories/Analysis/filter_traj.py
similarity index 100%
rename from Trajectories/filter_traj.py
rename to Trajectories/Analysis/filter_traj.py
diff --git a/Trajectories/graphtool_to_edgelist.py b/Trajectories/Analysis/graphtool_to_edgelist.py
similarity index 100%
rename from Trajectories/graphtool_to_edgelist.py
rename to Trajectories/Analysis/graphtool_to_edgelist.py
diff --git a/Trajectories/plot_traj.py b/Trajectories/Analysis/plot_traj.py
similarity index 100%
rename from Trajectories/plot_traj.py
rename to Trajectories/Analysis/plot_traj.py
diff --git a/Trajectories/search_segment.py b/Trajectories/Analysis/search_segment.py
similarity index 100%
rename from Trajectories/search_segment.py
rename to Trajectories/Analysis/search_segment.py
diff --git a/Trajectories/search_traj.py b/Trajectories/Analysis/search_traj.py
similarity index 100%
rename from Trajectories/search_traj.py
rename to Trajectories/Analysis/search_traj.py
diff --git a/Trajectories/Analysis/util_eddies.py b/Trajectories/Analysis/util_eddies.py
new file mode 120000
index 0000000000000000000000000000000000000000..d1f6b9611abbd324333b7e79ac1c96605ecbcd6a
--- /dev/null
+++ b/Trajectories/Analysis/util_eddies.py
@@ -0,0 +1 @@
+../../Common/util_eddies.py
\ No newline at end of file
diff --git a/Trajectories/Tests/tests.json b/Trajectories/Tests/tests.json
index 39e3d1254f7e0dc200be2ae169e69ce66bd0cadc..3bcd18886cdca4ae2d09831b1e292a37c055cdbc 100644
--- a/Trajectories/Tests/tests.json
+++ b/Trajectories/Tests/tests.json
@@ -102,7 +102,7 @@
     {
 	"command":
 	[
-            "$src_dir/Trajectories/draw_segments.py",
+            "$src_dir/Trajectories/Analysis/draw_segments.py",
             "$my_data_dir/Eurec4A/Graph_anti/segments_cost.gt",
             "segments.gv",
             "-t", "$my_data_dir/Eurec4A/Graph_anti/traj_segm.json"
@@ -110,7 +110,7 @@
     },
     "Plot_traj": {
 	"command": [
-            "$src_dir/Trajectories/plot_traj.py",
+            "$src_dir/Trajectories/Analysis/plot_traj.py",
             "$tests_old_dir/Trajectories/expanded_traj.json",
             "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
             "--save=png",
@@ -119,7 +119,7 @@
     },
     "Plot_traj_Greece": {
 	"command": [
-            "$src_dir/Trajectories/plot_traj.py",
+            "$src_dir/Trajectories/Analysis/plot_traj.py",
             "$tests_old_dir/Greece_trajectories/expanded_traj.json",
             "$tests_old_dir/Greece/SHPC",
             "--save=png",
@@ -149,7 +149,7 @@
 	"description": "draw_segments.py from a graph containing an extracted component.",
 	"command":
 	[
-            "$src_dir/Trajectories/draw_segments.py",
+            "$src_dir/Trajectories/Analysis/draw_segments.py",
             "$tests_old_dir/Extract_component/component_1980897.graphml",
             "component_1980897.gv",
             "-t", "$my_data_dir/Eurec4A/Graph_anti/traj_segm.json"
@@ -160,7 +160,7 @@
 	"description": "draw_segments.py without the option -t.",
 	"command":
 	[
-            "$src_dir/Trajectories/draw_segments.py",
+            "$src_dir/Trajectories/Analysis/draw_segments.py",
             "$tests_old_dir/Cost_function_no_debug/segments_cost_functions.graphml",
             "segments.gv"
 	]
diff --git a/Trajectories/edgelist_to_Graphviz.py b/Trajectories/edgelist_to_Graphviz.py
deleted file mode 120000
index c56d701a4d1d47aa80abd295de38b4b2f1ac2a34..0000000000000000000000000000000000000000
--- a/Trajectories/edgelist_to_Graphviz.py
+++ /dev/null
@@ -1 +0,0 @@
-../Overlap/Analysis/edgelist_to_Graphviz.py
\ No newline at end of file