diff --git a/demo/DEMO.md b/docs/fibertube/DEMO.md
similarity index 100%
rename from demo/DEMO.md
rename to docs/fibertube/DEMO.md
diff --git a/demo/centerlines.trk b/docs/fibertube/centerlines.trk
similarity index 100%
rename from demo/centerlines.trk
rename to docs/fibertube/centerlines.trk
diff --git a/demo/centerlines_resampled.trk b/docs/fibertube/centerlines_resampled.trk
similarity index 100%
rename from demo/centerlines_resampled.trk
rename to docs/fibertube/centerlines_resampled.trk
diff --git a/demo/diameters.txt b/docs/fibertube/diameters.txt
similarity index 100%
rename from demo/diameters.txt
rename to docs/fibertube/diameters.txt
diff --git a/scilpy/image/volume_space_management.py b/scilpy/image/volume_space_management.py
index cf54b51bb..cf136b2ab 100644
--- a/scilpy/image/volume_space_management.py
+++ b/scilpy/image/volume_space_management.py
@@ -3,9 +3,9 @@
 
 from numba_kdtree import KDTree
 from numba import njit
-from scilpy.tracking.fibertube import (streamlines_to_segments,
-                                       point_in_cylinder,
-                                       sphere_cylinder_intersection)
+from scilpy.tracking.fibertube_utils import (streamlines_to_segments,
+                                             point_in_cylinder,
+                                             sphere_cylinder_intersection)
 from scilpy.tractograms.streamline_operations import \
     get_streamlines_as_fixed_array
 from dipy.core.interpolation import trilinear_interpolate4d, \
diff --git a/scilpy/tracking/fibertube.py b/scilpy/tracking/fibertube_utils.py
similarity index 100%
rename from scilpy/tracking/fibertube.py
rename to scilpy/tracking/fibertube_utils.py
diff --git a/scilpy/tracking/seed.py b/scilpy/tracking/seed.py
index c7ea56ac8..0d0c07002 100644
--- a/scilpy/tracking/seed.py
+++ b/scilpy/tracking/seed.py
@@ -2,7 +2,7 @@
 import numpy as np
 
 from dipy.io.stateful_tractogram import Space, Origin
-from scilpy.tracking.fibertube import sample_cylinder
+from scilpy.tracking.fibertube_utils import sample_cylinder
 
 
 class SeedGenerator:
diff --git a/scilpy/tractanalysis/fibertube_scoring.py b/scilpy/tractanalysis/fibertube_scoring.py
index 2e89c6ab7..9585ffa2f 100644
--- a/scilpy/tractanalysis/fibertube_scoring.py
+++ b/scilpy/tractanalysis/fibertube_scoring.py
@@ -6,11 +6,11 @@
 from numba_kdtree import KDTree as nbKDTree
 from scipy.spatial import KDTree
 from scipy.spatial.transform import Rotation
-from scilpy.tracking.fibertube import (streamlines_to_segments,
-                                       point_in_cylinder,
-                                       dist_segment_segment,
-                                       dist_point_segment,
-                                       sphere_cylinder_intersection)
+from scilpy.tracking.fibertube_utils import (streamlines_to_segments,
+                                             point_in_cylinder,
+                                             dist_segment_segment,
+                                             dist_point_segment,
+                                             sphere_cylinder_intersection)
 from scilpy.tracking.utils import tqdm_if_verbose
 
 
diff --git a/scilpy/tractograms/intersection_finder.py b/scilpy/tractograms/intersection_finder.py
index 336029cb6..9d1b0cdfb 100644
--- a/scilpy/tractograms/intersection_finder.py
+++ b/scilpy/tractograms/intersection_finder.py
@@ -4,8 +4,8 @@
 import numpy as np
 
 from scipy.spatial import KDTree
-from scilpy.tracking.fibertube import (streamlines_to_segments,
-                                       dist_segment_segment)
+from scilpy.tracking.fibertube_utils import (streamlines_to_segments,
+                                             dist_segment_segment)
 from dipy.io.stateful_tractogram import StatefulTractogram
 from scilpy.tracking.utils import tqdm_if_verbose
 
diff --git a/scripts/scil_ft_reconstruction_metrics.py b/scripts/scil_fibertube_score_tractogram.py
similarity index 100%
rename from scripts/scil_ft_reconstruction_metrics.py
rename to scripts/scil_fibertube_score_tractogram.py
diff --git a/scripts/scil_ft_tracking.py b/scripts/scil_fibertube_tracking.py
similarity index 100%
rename from scripts/scil_ft_tracking.py
rename to scripts/scil_fibertube_tracking.py
diff --git a/scripts/scil_ft_visualize_collisions.py b/scripts/scil_viz_tractogram_collisions.py
similarity index 100%
rename from scripts/scil_ft_visualize_collisions.py
rename to scripts/scil_viz_tractogram_collisions.py