diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1b52dca57f5b1..fc51eef735c8c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -168,7 +168,7 @@ if(ROOT_opengl_FOUND)
     configure_file(stressGraphics.ref stressGraphics.ref COPYONLY)
   endif()
   configure_file(stressGraphics_web.ref stressGraphics_web.ref COPYONLY)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../tutorials/graphics/earth.dat earth.dat COPYONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../tutorials/visualisation/graphics/earth.dat earth.dat COPYONLY)
   ROOT_ADD_TEST(test-stressgraphics
                 ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}
                 COMMAND stressGraphics -b -k -p=sge
diff --git a/test/stressGraphics.cxx b/test/stressGraphics.cxx
index 4ee4b9ce4538f..2d6671e4c074e 100644
--- a/test/stressGraphics.cxx
+++ b/test/stressGraphics.cxx
@@ -1969,7 +1969,7 @@ void earth()
    TH2F *h3 = new TH2F("h03","Sinusoidal",50, -180, 180, 50, -90.5, 90.5);
    TH2F *h4 = new TH2F("h04","Parabolic", 50, -180, 180, 50, -90.5, 90.5);
    std::ifstream in;
-   in.open("../tutorials/graphics/earth.dat");
+   in.open("../tutorials/visualisation/graphics/earth.dat");
    if (!in) {
       in.clear();
       in.open("earth.dat");
diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
index ea9040e5bb386..48023724d672f 100644
--- a/tutorials/CMakeLists.txt
+++ b/tutorials/CMakeLists.txt
@@ -101,7 +101,7 @@ if (NOT dataframe)
     # RDataFrame
     list(APPEND dataframe_veto dataframe/*.C dataframe/*.py)
     # RDataFrame tutorial in graphs
-    list(APPEND dataframe_veto data_visualisation/graphs/timeSeriesFromCSV_TDF.C)
+    list(APPEND dataframe_veto visualisation/graphs/timeSeriesFromCSV_TDF.C)
     # TMVA tutorials dependent on RDataFrame
     list(APPEND dataframe_veto tmva/tmva*.C)
     list(APPEND dataframe_veto tmva/TMVA_SOFIE_RDataFrame*.C)
@@ -131,7 +131,7 @@ if(MACOSX_VERSION VERSION_EQUAL 10.13)
 endif()
 
 if(NOT geom)
-  set(geom_veto data_visualisation/geom/*.C)
+  set(geom_veto visualisation/geom/*.C)
 endif()
 
 if(NOT ROOT_proof_FOUND)
@@ -139,7 +139,7 @@ if(NOT ROOT_proof_FOUND)
 endif()
 
 if(NOT ROOT_spectrum_FOUND)
-   set(spectrum_veto data_visualisation/spectrum/*.C)
+   set(spectrum_veto legacy/spectrum/*.C)
 endif()
 
 if(NOT ROOT_roofit_FOUND)
@@ -240,11 +240,11 @@ endif()
 
 if(NOT ROOT_opengl_FOUND)
   set(opengl_veto tree/staff.C
-                  data_visualisation/gl/*.C)
+                  visualisation/gl/*.C)
 endif()
 
 if(NOT GRAPHVIZ_FOUND)
-  set(gviz_veto data_visualisation/graphs/graphstruct.C)
+  set(gviz_veto visualisation/graphs/graphstruct.C)
 endif()
 
 if(NOT TBB_FOUND AND NOT builtin_tbb)
@@ -264,30 +264,30 @@ if(ROOT_CLASSIC_BUILD)
 endif()
 
 if(NOT gdml)
-  set(gdml_veto data_visualisation/geom/gdml/testoptical.C)
+  set(gdml_veto visualisation/geom/gdml/testoptical.C)
 endif()
 
 #---These ones requires a display to run-----------------------------
 set(gui_veto fit/fitpanel_playback.C
-             data_visualisation/cocoa/*.C
-             data_visualisation/geom/building.C data_visualisation/geom/cheongwadae.C data_visualisation/geom/geom*.C data_visualisation/geom/lego.C data_visualisation/geom/robot.C data_visualisation/geom/south_gate.C data_visualisation/geom/station*.C data_visualisation/geom/tank.C data_visualisation/geom/webdemo.C data_visualisation/geom/web_cms.cxx
-             data_visualisation/gl/glViewerExercise.C data_visualisation/gl/glViewerLOD.C data_visualisation/gl/gviz3d.C data_visualisation/gl/nucleus.C data_visualisation/gl/viewer3DLocal.C data_visualisation/gl/viewer3DMaster.C
-             data_visualisation/gui/*.C
+             visualisation/cocoa/*.C
+             visualisation/geom/building.C visualisation/geom/cheongwadae.C visualisation/geom/geom*.C visualisation/geom/lego.C visualisation/geom/robot.C visualisation/geom/south_gate.C visualisation/geom/station*.C visualisation/geom/tank.C visualisation/geom/webdemo.C visualisation/geom/web_cms.cxx
+             visualisation/gl/glViewerExercise.C visualisation/gl/glViewerLOD.C visualisation/gl/gviz3d.C visualisation/gl/nucleus.C visualisation/gl/viewer3DLocal.C visualisation/gl/viewer3DMaster.C
+             visualisation/gui/*.C
              hist/exec1.C
              hist/exec2.C
              hist/tprofile2polyRealistic.C
              hist/tprofile2polyRealisticModuleError.C
-             data_visualisation/image/*.C
-             data_visualisation/graphics/psview.C graphics/gtime.C
-             data_visualisation/graphics/graph_edit_playback.C
+             visualisation/image/*.C
+             visualisation/graphics/psview.C visualisation/graphics/gtime.C
+             visualisation/graphics/graph_edit_playback.C
              roostats/ModelInspector.C
              tree/tvdemo.C
-             data_visualisation/eve/*.C
-             data_visualisation/webgui/geom/geom_threejs.cxx
-             data_visualisation/webgui/panel/webpanel.cxx
-             data_visualisation/webgui/webwindow/webwindow.cxx)
+             visualisation/eve7/eve/*.C
+             visualisation/webgui/geom/geom_threejs.cxx
+             visualisation/webgui/panel/webpanel.cxx
+             visualisation/webgui/webwindow/webwindow.cxx)
 if (NOT webgui)
-  list(APPEND gui_veto data_visualisation/graphics/save_batch.C rcanvas/df104.py rcanvas/df105.py)
+  list(APPEND gui_veto visualisation/graphics/save_batch.C rcanvas/df104.py rcanvas/df105.py)
 endif()
 
 if (NOT ROOT_tmva_FOUND)
@@ -352,7 +352,7 @@ else()
 endif()
 
 if (NOT ROOT_vecgeom_FOUND)
-  set(vecgeom_veto data_visualisation/geom/tessellatedNav.C)
+  set(vecgeom_veto visualisation/geom/tessellatedNav.C)
 endif()
 
 if(root7)
@@ -416,7 +416,7 @@ set(extra_veto
   tree/h1analysis*.C # these are not a tutorial but classes used in run_h1analysis.C
   tree/h1chain.C
   http/*.C
-  eve7/*.C
+  visualisation/eve7/*.C
   r/rootlogon.C)
 
 if(MSVC AND NOT llvm13_broken_tests)
@@ -433,14 +433,14 @@ if(MSVC AND NOT llvm13_broken_tests)
   if(CMAKE_SIZEOF_VOID_P EQUAL 4)
     list(APPEND extra_veto
          dataframe/df007_snapshot.C
-         data_visualisation/graphics/earth.C
-         data_visualisation/graphs/motorcycle.C
+         visualisation/graphics/earth.C
+         visualisation/graphs/motorcycle.C
          v7/ntuple/ntpl001_staff.C)
   endif()
 endif()
 
 set(all_veto hsimple.C
-             data_visualisation/geom/geometry.C
+             visualisation/geom/geometry.C
              ${extra_veto}
              ${gdml_veto}
              ${gui_veto}
@@ -474,8 +474,8 @@ set(all_veto hsimple.C
 
 file(GLOB_RECURSE tutorials RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.C)
 if(webgui)
-  file(GLOB_RECURSE data_visualisation/tutorials_webcanv RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} data_visualisation/webcanv/*.cxx)
-  list(APPEND tutorials ${data_visualisation/tutorials_webcanv})
+  file(GLOB_RECURSE visualisation/tutorials_webcanv RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} visualisation/webcanv/*.cxx)
+  list(APPEND tutorials ${visualisation/tutorials_webcanv})
 endif()
 if(root7 AND webgui)
   file(GLOB_RECURSE tutorials_v7 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} v7/*.cxx)
@@ -501,11 +501,11 @@ endif()
 
 #---Special return code------------------------------------------------
 set(returncode_1 fit/fit2a.C
-                 data_visualisation/graphics/earth.C
-                 data_visualisation/graphics/pavetext.C
-                 data_visualisation/graphics/tmathtext.C graphics/tmathtext2.C
-                 data_visualisation/graphs/exclusiongraph.C
-                 data_visualisation/graphs/graphstruct.C
+                 visualisation/graphics/earth.C
+                 visualisation/graphics/pavetext.C
+                 visualisation/graphics/tmathtext.C visualisation/graphics/tmathtext2.C
+                 visualisation/graphs/exclusiongraph.C
+                 visualisation/graphs/graphstruct.C
                  hist/ContourList.C
                  hist/hbars.C
                  hist/th2polyBoxes.C
@@ -538,13 +538,13 @@ set(benchmarks-depends tutorial-hsimple
                        tutorial-fit-myfit
                        tutorial-hist-h1ReadAndDraw
                        tutorial-hist-FirstContour
-                       tutorial-geom-na49view
+                       tutorial-visualisation-geom-na49view
                        tutorial-tree-ntuple1
                        tutorial-tree-spider
                        tutorial-io-hadd
                        tutorial-io-loopdir
                        tutorial-io-copyFiles)
-set(geom-na49view-depends tutorial-geom-geometry)
+set(visualisation-geom-na49view-depends tutorial-visualisation-geom-geometry)
 set(multicore-mt102_readNtuplesFillHistosAndFit-depends tutorial-multicore-mt101_fillNtuples)
 set(multicore-mp102_readNtuplesFillHistosAndFit-depends tutorial-multicore-mp101_fillNtuples)
 set(multicore-mp105_processEntryList-depends tutorial-multicore-mp104_processH1)
@@ -632,7 +632,7 @@ file(GLOB multithreaded RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${multithreaded})
 ROOT_ADD_TEST(tutorial-hsimple COMMAND ${ROOT_root_CMD} -b -l -n -q ${CMAKE_CURRENT_SOURCE_DIR}/hsimple.C
     PASSRC 255 FAILREGEX "Error in" "error:" "warning: Failed to call" LABELS tutorial ENVIRONMENT ${TUTORIAL_ENV})
 if(ROOT_geom_FOUND)
-  ROOT_ADD_TEST(tutorial-geom-geometry COMMAND ${ROOT_root_CMD} -b -l -n -q ${CMAKE_CURRENT_SOURCE_DIR}/data_visualisation/geom/geometry.C
+  ROOT_ADD_TEST(tutorial-visualisation-geom-geometry COMMAND ${ROOT_root_CMD} -b -l -n -q ${CMAKE_CURRENT_SOURCE_DIR}/visualisation/geom/geometry.C
                 FAILREGEX "Error in" "error:" "warning: Failed to call" LABELS tutorial ENVIRONMENT ${TUTORIAL_ENV})
 endif()
 # define Python GNN parsing tutorial needed to run before
@@ -745,7 +745,7 @@ if(ROOT_pyroot_FOUND)
              pyroot/numberEntry.py  # requires GUI
              legacy/pyroot/*py      # legacy ...
              histfactory/makeQuickModel.py # not a tutorial
-             data_visualisation/eve/lineset.py         # requires GUI
+             visualisation/eve7/eve/lineset.py         # requires GUI
              sql/sqlcreatedb.py     # same as the C++ case
              sql/sqlfilldb.py       # same as the C++ case
              sql/sqlselect.py       # same as the C++ case
diff --git a/tutorials/index.md b/tutorials/index.md
index fee384e6aa019..d3ac2f29ca5f5 100644
--- a/tutorials/index.md
+++ b/tutorials/index.md
@@ -46,7 +46,7 @@ The `$ROOTSYS/tutorials` directory includes several sub-directories:
 \ingroup Tutorials
 \brief These examples show various features of [RDataFrame](classROOT_1_1RDataFrame.html): ROOT's declarative analysis interface.
 
-\defgroup tutorial_data_vis Data visualisation tutorials
+\defgroup tutorial_visualisation Visualisation tutorials
 \ingroup Tutorials
 \brief All examples related to visually representing the data, including graphs, event displays, web graphics, GUIs and more. 
 
diff --git a/tutorials/legacy/index.md b/tutorials/legacy/index.md
index 236a88a4ecc55..d621de9975ab4 100644
--- a/tutorials/legacy/index.md
+++ b/tutorials/legacy/index.md
@@ -6,3 +6,11 @@ Some of ROOT's tutorials demonstrate interfaces that are not recommended anymore
 ROOT or C++ itself now offer superior ones. These have been moved here "for the record".
 
 @}
+
+\defgroup tutorial_spectrum Spectrum tutorials
+\ingroup tutorial_legacy
+\brief Examples showing the TSpectrum and TSpectrumPainter usage.
+
+\defgroup tutorial_splot TSPlot tutorials
+\ingroup tutorial_legacy
+\brief This tutorial illustrates the use of class TSPlot.
\ No newline at end of file
diff --git a/tutorials/data_visualisation/spectrum/Background_compton.C b/tutorials/legacy/spectrum/Background_compton.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Background_compton.C
rename to tutorials/legacy/spectrum/Background_compton.C
diff --git a/tutorials/data_visualisation/spectrum/Background_decr.C b/tutorials/legacy/spectrum/Background_decr.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Background_decr.C
rename to tutorials/legacy/spectrum/Background_decr.C
diff --git a/tutorials/data_visualisation/spectrum/Background_gamma256.C b/tutorials/legacy/spectrum/Background_gamma256.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Background_gamma256.C
rename to tutorials/legacy/spectrum/Background_gamma256.C
diff --git a/tutorials/data_visualisation/spectrum/Background_gamma64.C b/tutorials/legacy/spectrum/Background_gamma64.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Background_gamma64.C
rename to tutorials/legacy/spectrum/Background_gamma64.C
diff --git a/tutorials/data_visualisation/spectrum/Background_incr.C b/tutorials/legacy/spectrum/Background_incr.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Background_incr.C
rename to tutorials/legacy/spectrum/Background_incr.C
diff --git a/tutorials/data_visualisation/spectrum/Background_order.C b/tutorials/legacy/spectrum/Background_order.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Background_order.C
rename to tutorials/legacy/spectrum/Background_order.C
diff --git a/tutorials/data_visualisation/spectrum/Background_smooth.C b/tutorials/legacy/spectrum/Background_smooth.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Background_smooth.C
rename to tutorials/legacy/spectrum/Background_smooth.C
diff --git a/tutorials/data_visualisation/spectrum/Background_synt256.C b/tutorials/legacy/spectrum/Background_synt256.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Background_synt256.C
rename to tutorials/legacy/spectrum/Background_synt256.C
diff --git a/tutorials/data_visualisation/spectrum/Background_width.C b/tutorials/legacy/spectrum/Background_width.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Background_width.C
rename to tutorials/legacy/spectrum/Background_width.C
diff --git a/tutorials/data_visualisation/spectrum/Background_width2.C b/tutorials/legacy/spectrum/Background_width2.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Background_width2.C
rename to tutorials/legacy/spectrum/Background_width2.C
diff --git a/tutorials/data_visualisation/spectrum/Deconvolution.C b/tutorials/legacy/spectrum/Deconvolution.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Deconvolution.C
rename to tutorials/legacy/spectrum/Deconvolution.C
diff --git a/tutorials/data_visualisation/spectrum/Deconvolution2_1.C b/tutorials/legacy/spectrum/Deconvolution2_1.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Deconvolution2_1.C
rename to tutorials/legacy/spectrum/Deconvolution2_1.C
diff --git a/tutorials/data_visualisation/spectrum/Deconvolution2_2.C b/tutorials/legacy/spectrum/Deconvolution2_2.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Deconvolution2_2.C
rename to tutorials/legacy/spectrum/Deconvolution2_2.C
diff --git a/tutorials/data_visualisation/spectrum/Deconvolution2_HR.C b/tutorials/legacy/spectrum/Deconvolution2_HR.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Deconvolution2_HR.C
rename to tutorials/legacy/spectrum/Deconvolution2_HR.C
diff --git a/tutorials/data_visualisation/spectrum/DeconvolutionRL_wide.C b/tutorials/legacy/spectrum/DeconvolutionRL_wide.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/DeconvolutionRL_wide.C
rename to tutorials/legacy/spectrum/DeconvolutionRL_wide.C
diff --git a/tutorials/data_visualisation/spectrum/DeconvolutionRL_wide_boost.C b/tutorials/legacy/spectrum/DeconvolutionRL_wide_boost.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/DeconvolutionRL_wide_boost.C
rename to tutorials/legacy/spectrum/DeconvolutionRL_wide_boost.C
diff --git a/tutorials/data_visualisation/spectrum/Deconvolution_wide.C b/tutorials/legacy/spectrum/Deconvolution_wide.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Deconvolution_wide.C
rename to tutorials/legacy/spectrum/Deconvolution_wide.C
diff --git a/tutorials/data_visualisation/spectrum/Deconvolution_wide_boost.C b/tutorials/legacy/spectrum/Deconvolution_wide_boost.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Deconvolution_wide_boost.C
rename to tutorials/legacy/spectrum/Deconvolution_wide_boost.C
diff --git a/tutorials/data_visualisation/spectrum/FitAwmi.C b/tutorials/legacy/spectrum/FitAwmi.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/FitAwmi.C
rename to tutorials/legacy/spectrum/FitAwmi.C
diff --git a/tutorials/data_visualisation/spectrum/SearchHR1.C b/tutorials/legacy/spectrum/SearchHR1.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/SearchHR1.C
rename to tutorials/legacy/spectrum/SearchHR1.C
diff --git a/tutorials/data_visualisation/spectrum/SearchHR3.C b/tutorials/legacy/spectrum/SearchHR3.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/SearchHR3.C
rename to tutorials/legacy/spectrum/SearchHR3.C
diff --git a/tutorials/data_visualisation/spectrum/Smooth.C b/tutorials/legacy/spectrum/Smooth.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Smooth.C
rename to tutorials/legacy/spectrum/Smooth.C
diff --git a/tutorials/data_visualisation/spectrum/Smoothing.C b/tutorials/legacy/spectrum/Smoothing.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Smoothing.C
rename to tutorials/legacy/spectrum/Smoothing.C
diff --git a/tutorials/data_visualisation/spectrum/Src.C b/tutorials/legacy/spectrum/Src.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Src.C
rename to tutorials/legacy/spectrum/Src.C
diff --git a/tutorials/data_visualisation/spectrum/Src2.C b/tutorials/legacy/spectrum/Src2.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Src2.C
rename to tutorials/legacy/spectrum/Src2.C
diff --git a/tutorials/data_visualisation/spectrum/Src3.C b/tutorials/legacy/spectrum/Src3.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Src3.C
rename to tutorials/legacy/spectrum/Src3.C
diff --git a/tutorials/data_visualisation/spectrum/Src4.C b/tutorials/legacy/spectrum/Src4.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Src4.C
rename to tutorials/legacy/spectrum/Src4.C
diff --git a/tutorials/data_visualisation/spectrum/Src5.C b/tutorials/legacy/spectrum/Src5.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/Src5.C
rename to tutorials/legacy/spectrum/Src5.C
diff --git a/tutorials/data_visualisation/spectrum/TSpectrum.root b/tutorials/legacy/spectrum/TSpectrum.root
similarity index 100%
rename from tutorials/data_visualisation/spectrum/TSpectrum.root
rename to tutorials/legacy/spectrum/TSpectrum.root
diff --git a/tutorials/data_visualisation/spectrum/TSpectrum2.root b/tutorials/legacy/spectrum/TSpectrum2.root
similarity index 100%
rename from tutorials/data_visualisation/spectrum/TSpectrum2.root
rename to tutorials/legacy/spectrum/TSpectrum2.root
diff --git a/tutorials/data_visualisation/spectrum/peaks.C b/tutorials/legacy/spectrum/peaks.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/peaks.C
rename to tutorials/legacy/spectrum/peaks.C
diff --git a/tutorials/data_visualisation/spectrum/peaks2.C b/tutorials/legacy/spectrum/peaks2.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/peaks2.C
rename to tutorials/legacy/spectrum/peaks2.C
diff --git a/tutorials/data_visualisation/spectrum/spectrumpainter.C b/tutorials/legacy/spectrum/spectrumpainter.C
similarity index 100%
rename from tutorials/data_visualisation/spectrum/spectrumpainter.C
rename to tutorials/legacy/spectrum/spectrumpainter.C
diff --git a/tutorials/data_visualisation/splot/TestSPlot.C b/tutorials/legacy/splot/TestSPlot.C
similarity index 100%
rename from tutorials/data_visualisation/splot/TestSPlot.C
rename to tutorials/legacy/splot/TestSPlot.C
diff --git a/tutorials/data_visualisation/splot/TestSPlot_toyMC.dat b/tutorials/legacy/splot/TestSPlot_toyMC.dat
similarity index 100%
rename from tutorials/data_visualisation/splot/TestSPlot_toyMC.dat
rename to tutorials/legacy/splot/TestSPlot_toyMC.dat
diff --git a/tutorials/data_visualisation/cocoa/customcolor.h b/tutorials/visualisation/cocoa/customcolor.h
similarity index 100%
rename from tutorials/data_visualisation/cocoa/customcolor.h
rename to tutorials/visualisation/cocoa/customcolor.h
diff --git a/tutorials/data_visualisation/cocoa/flower.C b/tutorials/visualisation/cocoa/flower.C
similarity index 100%
rename from tutorials/data_visualisation/cocoa/flower.C
rename to tutorials/visualisation/cocoa/flower.C
diff --git a/tutorials/data_visualisation/cocoa/grad.C b/tutorials/visualisation/cocoa/grad.C
similarity index 100%
rename from tutorials/data_visualisation/cocoa/grad.C
rename to tutorials/visualisation/cocoa/grad.C
diff --git a/tutorials/data_visualisation/cocoa/grad2.C b/tutorials/visualisation/cocoa/grad2.C
similarity index 100%
rename from tutorials/data_visualisation/cocoa/grad2.C
rename to tutorials/visualisation/cocoa/grad2.C
diff --git a/tutorials/data_visualisation/cocoa/gradients.C b/tutorials/visualisation/cocoa/gradients.C
similarity index 100%
rename from tutorials/data_visualisation/cocoa/gradients.C
rename to tutorials/visualisation/cocoa/gradients.C
diff --git a/tutorials/data_visualisation/cocoa/index.md b/tutorials/visualisation/cocoa/index.md
similarity index 100%
rename from tutorials/data_visualisation/cocoa/index.md
rename to tutorials/visualisation/cocoa/index.md
diff --git a/tutorials/data_visualisation/cocoa/parallelcoordtrans.C b/tutorials/visualisation/cocoa/parallelcoordtrans.C
similarity index 100%
rename from tutorials/data_visualisation/cocoa/parallelcoordtrans.C
rename to tutorials/visualisation/cocoa/parallelcoordtrans.C
diff --git a/tutorials/data_visualisation/cocoa/radialgradients.C b/tutorials/visualisation/cocoa/radialgradients.C
similarity index 100%
rename from tutorials/data_visualisation/cocoa/radialgradients.C
rename to tutorials/visualisation/cocoa/radialgradients.C
diff --git a/tutorials/data_visualisation/cocoa/transp.C b/tutorials/visualisation/cocoa/transp.C
similarity index 100%
rename from tutorials/data_visualisation/cocoa/transp.C
rename to tutorials/visualisation/cocoa/transp.C
diff --git a/tutorials/data_visualisation/cocoa/transp_text.C b/tutorials/visualisation/cocoa/transp_text.C
similarity index 100%
rename from tutorials/data_visualisation/cocoa/transp_text.C
rename to tutorials/visualisation/cocoa/transp_text.C
diff --git a/tutorials/data_visualisation/cocoa/transparentpad.C b/tutorials/visualisation/cocoa/transparentpad.C
similarity index 100%
rename from tutorials/data_visualisation/cocoa/transparentpad.C
rename to tutorials/visualisation/cocoa/transparentpad.C
diff --git a/tutorials/eve7/box.C b/tutorials/visualisation/eve7/box.C
similarity index 100%
rename from tutorials/eve7/box.C
rename to tutorials/visualisation/eve7/box.C
diff --git a/tutorials/eve7/boxset.C b/tutorials/visualisation/eve7/boxset.C
similarity index 100%
rename from tutorials/eve7/boxset.C
rename to tutorials/visualisation/eve7/boxset.C
diff --git a/tutorials/eve7/boxset_cones.C b/tutorials/visualisation/eve7/boxset_cones.C
similarity index 100%
rename from tutorials/eve7/boxset_cones.C
rename to tutorials/visualisation/eve7/boxset_cones.C
diff --git a/tutorials/eve7/calorimeters.C b/tutorials/visualisation/eve7/calorimeters.C
similarity index 100%
rename from tutorials/eve7/calorimeters.C
rename to tutorials/visualisation/eve7/calorimeters.C
diff --git a/tutorials/eve7/collection_proxies.C b/tutorials/visualisation/eve7/collection_proxies.C
similarity index 100%
rename from tutorials/eve7/collection_proxies.C
rename to tutorials/visualisation/eve7/collection_proxies.C
diff --git a/tutorials/eve7/compound.C b/tutorials/visualisation/eve7/compound.C
similarity index 100%
rename from tutorials/eve7/compound.C
rename to tutorials/visualisation/eve7/compound.C
diff --git a/tutorials/eve7/csgdemo.C b/tutorials/visualisation/eve7/csgdemo.C
similarity index 100%
rename from tutorials/eve7/csgdemo.C
rename to tutorials/visualisation/eve7/csgdemo.C
diff --git a/tutorials/eve7/error_ellipse.C b/tutorials/visualisation/eve7/error_ellipse.C
similarity index 100%
rename from tutorials/eve7/error_ellipse.C
rename to tutorials/visualisation/eve7/error_ellipse.C
diff --git a/tutorials/data_visualisation/eve/Default.png b/tutorials/visualisation/eve7/eve/Default.png
similarity index 100%
rename from tutorials/data_visualisation/eve/Default.png
rename to tutorials/visualisation/eve7/eve/Default.png
diff --git a/tutorials/data_visualisation/eve/MultiView.C b/tutorials/visualisation/eve7/eve/MultiView.C
similarity index 100%
rename from tutorials/data_visualisation/eve/MultiView.C
rename to tutorials/visualisation/eve7/eve/MultiView.C
diff --git a/tutorials/data_visualisation/eve/SplitGLView.C b/tutorials/visualisation/eve7/eve/SplitGLView.C
similarity index 100%
rename from tutorials/data_visualisation/eve/SplitGLView.C
rename to tutorials/visualisation/eve7/eve/SplitGLView.C
diff --git a/tutorials/data_visualisation/eve/alice_esd.C b/tutorials/visualisation/eve7/eve/alice_esd.C
similarity index 100%
rename from tutorials/data_visualisation/eve/alice_esd.C
rename to tutorials/visualisation/eve7/eve/alice_esd.C
diff --git a/tutorials/data_visualisation/eve/alice_esd_html_summary.C b/tutorials/visualisation/eve7/eve/alice_esd_html_summary.C
similarity index 100%
rename from tutorials/data_visualisation/eve/alice_esd_html_summary.C
rename to tutorials/visualisation/eve7/eve/alice_esd_html_summary.C
diff --git a/tutorials/data_visualisation/eve/alice_esd_split.C b/tutorials/visualisation/eve7/eve/alice_esd_split.C
similarity index 100%
rename from tutorials/data_visualisation/eve/alice_esd_split.C
rename to tutorials/visualisation/eve7/eve/alice_esd_split.C
diff --git a/tutorials/data_visualisation/eve/alice_vsd.C b/tutorials/visualisation/eve7/eve/alice_vsd.C
similarity index 100%
rename from tutorials/data_visualisation/eve/alice_vsd.C
rename to tutorials/visualisation/eve7/eve/alice_vsd.C
diff --git a/tutorials/data_visualisation/eve/annotation.C b/tutorials/visualisation/eve7/eve/annotation.C
similarity index 100%
rename from tutorials/data_visualisation/eve/annotation.C
rename to tutorials/visualisation/eve7/eve/annotation.C
diff --git a/tutorials/data_visualisation/eve/arrow.C b/tutorials/visualisation/eve7/eve/arrow.C
similarity index 100%
rename from tutorials/data_visualisation/eve/arrow.C
rename to tutorials/visualisation/eve7/eve/arrow.C
diff --git a/tutorials/data_visualisation/eve/arrow_standalone.C b/tutorials/visualisation/eve7/eve/arrow_standalone.C
similarity index 100%
rename from tutorials/data_visualisation/eve/arrow_standalone.C
rename to tutorials/visualisation/eve7/eve/arrow_standalone.C
diff --git a/tutorials/data_visualisation/eve/assembly.C b/tutorials/visualisation/eve7/eve/assembly.C
similarity index 100%
rename from tutorials/data_visualisation/eve/assembly.C
rename to tutorials/visualisation/eve7/eve/assembly.C
diff --git a/tutorials/data_visualisation/eve/box.C b/tutorials/visualisation/eve7/eve/box.C
similarity index 100%
rename from tutorials/data_visualisation/eve/box.C
rename to tutorials/visualisation/eve7/eve/box.C
diff --git a/tutorials/data_visualisation/eve/boxset.C b/tutorials/visualisation/eve7/eve/boxset.C
similarity index 100%
rename from tutorials/data_visualisation/eve/boxset.C
rename to tutorials/visualisation/eve7/eve/boxset.C
diff --git a/tutorials/data_visualisation/eve/boxset_cones.C b/tutorials/visualisation/eve7/eve/boxset_cones.C
similarity index 100%
rename from tutorials/data_visualisation/eve/boxset_cones.C
rename to tutorials/visualisation/eve7/eve/boxset_cones.C
diff --git a/tutorials/data_visualisation/eve/broken_torus.tring b/tutorials/visualisation/eve7/eve/broken_torus.tring
similarity index 100%
rename from tutorials/data_visualisation/eve/broken_torus.tring
rename to tutorials/visualisation/eve7/eve/broken_torus.tring
diff --git a/tutorials/data_visualisation/eve/calo_detail.C b/tutorials/visualisation/eve7/eve/calo_detail.C
similarity index 100%
rename from tutorials/data_visualisation/eve/calo_detail.C
rename to tutorials/visualisation/eve7/eve/calo_detail.C
diff --git a/tutorials/data_visualisation/eve/calorimeters.C b/tutorials/visualisation/eve7/eve/calorimeters.C
similarity index 100%
rename from tutorials/data_visualisation/eve/calorimeters.C
rename to tutorials/visualisation/eve7/eve/calorimeters.C
diff --git a/tutorials/data_visualisation/eve/camera_restore.C b/tutorials/visualisation/eve7/eve/camera_restore.C
similarity index 100%
rename from tutorials/data_visualisation/eve/camera_restore.C
rename to tutorials/visualisation/eve7/eve/camera_restore.C
diff --git a/tutorials/data_visualisation/eve/compound.C b/tutorials/visualisation/eve7/eve/compound.C
similarity index 100%
rename from tutorials/data_visualisation/eve/compound.C
rename to tutorials/visualisation/eve7/eve/compound.C
diff --git a/tutorials/data_visualisation/eve/csgdemo.C b/tutorials/visualisation/eve7/eve/csgdemo.C
similarity index 100%
rename from tutorials/data_visualisation/eve/csgdemo.C
rename to tutorials/visualisation/eve7/eve/csgdemo.C
diff --git a/tutorials/data_visualisation/eve/geom_alias.C b/tutorials/visualisation/eve7/eve/geom_alias.C
similarity index 100%
rename from tutorials/data_visualisation/eve/geom_alias.C
rename to tutorials/visualisation/eve7/eve/geom_alias.C
diff --git a/tutorials/data_visualisation/eve/geom_alice_its.C b/tutorials/visualisation/eve7/eve/geom_alice_its.C
similarity index 100%
rename from tutorials/data_visualisation/eve/geom_alice_its.C
rename to tutorials/visualisation/eve7/eve/geom_alice_its.C
diff --git a/tutorials/data_visualisation/eve/geom_alice_tpc.C b/tutorials/visualisation/eve7/eve/geom_alice_tpc.C
similarity index 100%
rename from tutorials/data_visualisation/eve/geom_alice_tpc.C
rename to tutorials/visualisation/eve7/eve/geom_alice_tpc.C
diff --git a/tutorials/data_visualisation/eve/geom_atlas.C b/tutorials/visualisation/eve7/eve/geom_atlas.C
similarity index 100%
rename from tutorials/data_visualisation/eve/geom_atlas.C
rename to tutorials/visualisation/eve7/eve/geom_atlas.C
diff --git a/tutorials/data_visualisation/eve/geom_atlas_playback.C b/tutorials/visualisation/eve7/eve/geom_atlas_playback.C
similarity index 100%
rename from tutorials/data_visualisation/eve/geom_atlas_playback.C
rename to tutorials/visualisation/eve7/eve/geom_atlas_playback.C
diff --git a/tutorials/data_visualisation/eve/geom_cms.C b/tutorials/visualisation/eve7/eve/geom_cms.C
similarity index 100%
rename from tutorials/data_visualisation/eve/geom_cms.C
rename to tutorials/visualisation/eve7/eve/geom_cms.C
diff --git a/tutorials/data_visualisation/eve/geom_cms_playback.C b/tutorials/visualisation/eve7/eve/geom_cms_playback.C
similarity index 100%
rename from tutorials/data_visualisation/eve/geom_cms_playback.C
rename to tutorials/visualisation/eve7/eve/geom_cms_playback.C
diff --git a/tutorials/data_visualisation/eve/geom_cms_stereo.C b/tutorials/visualisation/eve7/eve/geom_cms_stereo.C
similarity index 100%
rename from tutorials/data_visualisation/eve/geom_cms_stereo.C
rename to tutorials/visualisation/eve7/eve/geom_cms_stereo.C
diff --git a/tutorials/data_visualisation/eve/geom_default.C b/tutorials/visualisation/eve7/eve/geom_default.C
similarity index 100%
rename from tutorials/data_visualisation/eve/geom_default.C
rename to tutorials/visualisation/eve7/eve/geom_default.C
diff --git a/tutorials/data_visualisation/eve/geom_lhcb.C b/tutorials/visualisation/eve7/eve/geom_lhcb.C
similarity index 100%
rename from tutorials/data_visualisation/eve/geom_lhcb.C
rename to tutorials/visualisation/eve7/eve/geom_lhcb.C
diff --git a/tutorials/data_visualisation/eve/glplot.C b/tutorials/visualisation/eve7/eve/glplot.C
similarity index 100%
rename from tutorials/data_visualisation/eve/glplot.C
rename to tutorials/visualisation/eve7/eve/glplot.C
diff --git a/tutorials/data_visualisation/eve/glplot_geom.C b/tutorials/visualisation/eve7/eve/glplot_geom.C
similarity index 100%
rename from tutorials/data_visualisation/eve/glplot_geom.C
rename to tutorials/visualisation/eve7/eve/glplot_geom.C
diff --git a/tutorials/data_visualisation/eve/hierarchical_scene.C b/tutorials/visualisation/eve7/eve/hierarchical_scene.C
similarity index 100%
rename from tutorials/data_visualisation/eve/hierarchical_scene.C
rename to tutorials/visualisation/eve7/eve/hierarchical_scene.C
diff --git a/tutorials/data_visualisation/eve/histobrowser.C b/tutorials/visualisation/eve7/eve/histobrowser.C
similarity index 100%
rename from tutorials/data_visualisation/eve/histobrowser.C
rename to tutorials/visualisation/eve7/eve/histobrowser.C
diff --git a/tutorials/data_visualisation/eve/jetcone.C b/tutorials/visualisation/eve7/eve/jetcone.C
similarity index 100%
rename from tutorials/data_visualisation/eve/jetcone.C
rename to tutorials/visualisation/eve7/eve/jetcone.C
diff --git a/tutorials/data_visualisation/eve/lineset.C b/tutorials/visualisation/eve7/eve/lineset.C
similarity index 100%
rename from tutorials/data_visualisation/eve/lineset.C
rename to tutorials/visualisation/eve7/eve/lineset.C
diff --git a/tutorials/data_visualisation/eve/lineset.py b/tutorials/visualisation/eve7/eve/lineset.py
similarity index 100%
rename from tutorials/data_visualisation/eve/lineset.py
rename to tutorials/visualisation/eve7/eve/lineset.py
diff --git a/tutorials/data_visualisation/eve/nasashuttle.3ds b/tutorials/visualisation/eve7/eve/nasashuttle.3ds
similarity index 100%
rename from tutorials/data_visualisation/eve/nasashuttle.3ds
rename to tutorials/visualisation/eve7/eve/nasashuttle.3ds
diff --git a/tutorials/data_visualisation/eve/overlay_palette.C b/tutorials/visualisation/eve7/eve/overlay_palette.C
similarity index 100%
rename from tutorials/data_visualisation/eve/overlay_palette.C
rename to tutorials/visualisation/eve7/eve/overlay_palette.C
diff --git a/tutorials/data_visualisation/eve/pack.C b/tutorials/visualisation/eve7/eve/pack.C
similarity index 100%
rename from tutorials/data_visualisation/eve/pack.C
rename to tutorials/visualisation/eve7/eve/pack.C
diff --git a/tutorials/data_visualisation/eve/paramlist.C b/tutorials/visualisation/eve7/eve/paramlist.C
similarity index 100%
rename from tutorials/data_visualisation/eve/paramlist.C
rename to tutorials/visualisation/eve7/eve/paramlist.C
diff --git a/tutorials/data_visualisation/eve/pointset.C b/tutorials/visualisation/eve7/eve/pointset.C
similarity index 100%
rename from tutorials/data_visualisation/eve/pointset.C
rename to tutorials/visualisation/eve7/eve/pointset.C
diff --git a/tutorials/data_visualisation/eve/projection.C b/tutorials/visualisation/eve7/eve/projection.C
similarity index 100%
rename from tutorials/data_visualisation/eve/projection.C
rename to tutorials/visualisation/eve7/eve/projection.C
diff --git a/tutorials/data_visualisation/eve/projection_prescale.C b/tutorials/visualisation/eve7/eve/projection_prescale.C
similarity index 100%
rename from tutorials/data_visualisation/eve/projection_prescale.C
rename to tutorials/visualisation/eve7/eve/projection_prescale.C
diff --git a/tutorials/data_visualisation/eve/pythia_display.C b/tutorials/visualisation/eve7/eve/pythia_display.C
similarity index 100%
rename from tutorials/data_visualisation/eve/pythia_display.C
rename to tutorials/visualisation/eve7/eve/pythia_display.C
diff --git a/tutorials/data_visualisation/eve/quadset.C b/tutorials/visualisation/eve7/eve/quadset.C
similarity index 100%
rename from tutorials/data_visualisation/eve/quadset.C
rename to tutorials/visualisation/eve7/eve/quadset.C
diff --git a/tutorials/data_visualisation/eve/run_alice_esd.C b/tutorials/visualisation/eve7/eve/run_alice_esd.C
similarity index 100%
rename from tutorials/data_visualisation/eve/run_alice_esd.C
rename to tutorials/visualisation/eve7/eve/run_alice_esd.C
diff --git a/tutorials/data_visualisation/eve/run_alice_esd_split.C b/tutorials/visualisation/eve7/eve/run_alice_esd_split.C
similarity index 100%
rename from tutorials/data_visualisation/eve/run_alice_esd_split.C
rename to tutorials/visualisation/eve7/eve/run_alice_esd_split.C
diff --git a/tutorials/data_visualisation/eve/selection_sigs.C b/tutorials/visualisation/eve7/eve/selection_sigs.C
similarity index 100%
rename from tutorials/data_visualisation/eve/selection_sigs.C
rename to tutorials/visualisation/eve7/eve/selection_sigs.C
diff --git a/tutorials/data_visualisation/eve/show_extract.C b/tutorials/visualisation/eve7/eve/show_extract.C
similarity index 100%
rename from tutorials/data_visualisation/eve/show_extract.C
rename to tutorials/visualisation/eve7/eve/show_extract.C
diff --git a/tutorials/data_visualisation/eve/swap.png b/tutorials/visualisation/eve7/eve/swap.png
similarity index 100%
rename from tutorials/data_visualisation/eve/swap.png
rename to tutorials/visualisation/eve7/eve/swap.png
diff --git a/tutorials/data_visualisation/eve/text.C b/tutorials/visualisation/eve7/eve/text.C
similarity index 100%
rename from tutorials/data_visualisation/eve/text.C
rename to tutorials/visualisation/eve7/eve/text.C
diff --git a/tutorials/data_visualisation/eve/track.C b/tutorials/visualisation/eve7/eve/track.C
similarity index 100%
rename from tutorials/data_visualisation/eve/track.C
rename to tutorials/visualisation/eve7/eve/track.C
diff --git a/tutorials/data_visualisation/eve/triangleset.C b/tutorials/visualisation/eve7/eve/triangleset.C
similarity index 100%
rename from tutorials/data_visualisation/eve/triangleset.C
rename to tutorials/visualisation/eve7/eve/triangleset.C
diff --git a/tutorials/data_visualisation/eve/view3ds.C b/tutorials/visualisation/eve7/eve/view3ds.C
similarity index 100%
rename from tutorials/data_visualisation/eve/view3ds.C
rename to tutorials/visualisation/eve7/eve/view3ds.C
diff --git a/tutorials/data_visualisation/eve/window_manager.C b/tutorials/visualisation/eve7/eve/window_manager.C
similarity index 100%
rename from tutorials/data_visualisation/eve/window_manager.C
rename to tutorials/visualisation/eve7/eve/window_manager.C
diff --git a/tutorials/eve7/eveGeoBrowser.C b/tutorials/visualisation/eve7/eveGeoBrowser.C
similarity index 100%
rename from tutorials/eve7/eveGeoBrowser.C
rename to tutorials/visualisation/eve7/eveGeoBrowser.C
diff --git a/tutorials/eve7/event_demo.C b/tutorials/visualisation/eve7/event_demo.C
similarity index 100%
rename from tutorials/eve7/event_demo.C
rename to tutorials/visualisation/eve7/event_demo.C
diff --git a/tutorials/eve7/geoTopNode.C b/tutorials/visualisation/eve7/geoTopNode.C
similarity index 100%
rename from tutorials/eve7/geoTopNode.C
rename to tutorials/visualisation/eve7/geoTopNode.C
diff --git a/tutorials/eve7/geom_cms.C b/tutorials/visualisation/eve7/geom_cms.C
similarity index 100%
rename from tutorials/eve7/geom_cms.C
rename to tutorials/visualisation/eve7/geom_cms.C
diff --git a/tutorials/visualisation/eve7/index.md b/tutorials/visualisation/eve7/index.md
new file mode 100644
index 0000000000000..d8893c5268bb4
--- /dev/null
+++ b/tutorials/visualisation/eve7/index.md
@@ -0,0 +1,5 @@
+\addtogroup tutorial_eve
+
+\defgroup tutorial_eve_old Old event display tutorials
+\ingroup tutorial_eve
+\brief Examples showing the usage of the old (but not obsolete) event display classes.
\ No newline at end of file
diff --git a/tutorials/eve7/jets.C b/tutorials/visualisation/eve7/jets.C
similarity index 100%
rename from tutorials/eve7/jets.C
rename to tutorials/visualisation/eve7/jets.C
diff --git a/tutorials/eve7/lego.C b/tutorials/visualisation/eve7/lego.C
similarity index 100%
rename from tutorials/eve7/lego.C
rename to tutorials/visualisation/eve7/lego.C
diff --git a/tutorials/eve7/lineset.C b/tutorials/visualisation/eve7/lineset.C
similarity index 100%
rename from tutorials/eve7/lineset.C
rename to tutorials/visualisation/eve7/lineset.C
diff --git a/tutorials/eve7/overlay_test.C b/tutorials/visualisation/eve7/overlay_test.C
similarity index 100%
rename from tutorials/eve7/overlay_test.C
rename to tutorials/visualisation/eve7/overlay_test.C
diff --git a/tutorials/eve7/points.C b/tutorials/visualisation/eve7/points.C
similarity index 100%
rename from tutorials/eve7/points.C
rename to tutorials/visualisation/eve7/points.C
diff --git a/tutorials/eve7/projection_prescale.C b/tutorials/visualisation/eve7/projection_prescale.C
similarity index 100%
rename from tutorials/eve7/projection_prescale.C
rename to tutorials/visualisation/eve7/projection_prescale.C
diff --git a/tutorials/eve7/show_extract.C b/tutorials/visualisation/eve7/show_extract.C
similarity index 100%
rename from tutorials/eve7/show_extract.C
rename to tutorials/visualisation/eve7/show_extract.C
diff --git a/tutorials/eve7/texts.C b/tutorials/visualisation/eve7/texts.C
similarity index 100%
rename from tutorials/eve7/texts.C
rename to tutorials/visualisation/eve7/texts.C
diff --git a/tutorials/eve7/tracks.C b/tutorials/visualisation/eve7/tracks.C
similarity index 100%
rename from tutorials/eve7/tracks.C
rename to tutorials/visualisation/eve7/tracks.C
diff --git a/tutorials/data_visualisation/geom/RadioNuclides.C b/tutorials/visualisation/geom/RadioNuclides.C
similarity index 100%
rename from tutorials/data_visualisation/geom/RadioNuclides.C
rename to tutorials/visualisation/geom/RadioNuclides.C
diff --git a/tutorials/data_visualisation/geom/assembly.C b/tutorials/visualisation/geom/assembly.C
similarity index 100%
rename from tutorials/data_visualisation/geom/assembly.C
rename to tutorials/visualisation/geom/assembly.C
diff --git a/tutorials/data_visualisation/geom/building.C b/tutorials/visualisation/geom/building.C
similarity index 100%
rename from tutorials/data_visualisation/geom/building.C
rename to tutorials/visualisation/geom/building.C
diff --git a/tutorials/data_visualisation/geom/cheongwadae.C b/tutorials/visualisation/geom/cheongwadae.C
similarity index 100%
rename from tutorials/data_visualisation/geom/cheongwadae.C
rename to tutorials/visualisation/geom/cheongwadae.C
diff --git a/tutorials/data_visualisation/geom/csgdemo.C b/tutorials/visualisation/geom/csgdemo.C
similarity index 100%
rename from tutorials/data_visualisation/geom/csgdemo.C
rename to tutorials/visualisation/geom/csgdemo.C
diff --git a/tutorials/data_visualisation/geom/gdml/opticalsurfaces.gdml b/tutorials/visualisation/geom/gdml/opticalsurfaces.gdml
similarity index 100%
rename from tutorials/data_visualisation/geom/gdml/opticalsurfaces.gdml
rename to tutorials/visualisation/geom/gdml/opticalsurfaces.gdml
diff --git a/tutorials/data_visualisation/geom/gdml/testoptical.C b/tutorials/visualisation/geom/gdml/testoptical.C
similarity index 100%
rename from tutorials/data_visualisation/geom/gdml/testoptical.C
rename to tutorials/visualisation/geom/gdml/testoptical.C
diff --git a/tutorials/data_visualisation/geom/geodemo.C b/tutorials/visualisation/geom/geodemo.C
similarity index 100%
rename from tutorials/data_visualisation/geom/geodemo.C
rename to tutorials/visualisation/geom/geodemo.C
diff --git a/tutorials/data_visualisation/geom/geomAlice.C b/tutorials/visualisation/geom/geomAlice.C
similarity index 100%
rename from tutorials/data_visualisation/geom/geomAlice.C
rename to tutorials/visualisation/geom/geomAlice.C
diff --git a/tutorials/data_visualisation/geom/geomAlice_itsv.C b/tutorials/visualisation/geom/geomAlice_itsv.C
similarity index 100%
rename from tutorials/data_visualisation/geom/geomAlice_itsv.C
rename to tutorials/visualisation/geom/geomAlice_itsv.C
diff --git a/tutorials/data_visualisation/geom/geomAtlas.C b/tutorials/visualisation/geom/geomAtlas.C
similarity index 100%
rename from tutorials/data_visualisation/geom/geomAtlas.C
rename to tutorials/visualisation/geom/geomAtlas.C
diff --git a/tutorials/data_visualisation/geom/geomBrahms.C b/tutorials/visualisation/geom/geomBrahms.C
similarity index 100%
rename from tutorials/data_visualisation/geom/geomBrahms.C
rename to tutorials/visualisation/geom/geomBrahms.C
diff --git a/tutorials/data_visualisation/geom/geomD0.C b/tutorials/visualisation/geom/geomD0.C
similarity index 100%
rename from tutorials/data_visualisation/geom/geomD0.C
rename to tutorials/visualisation/geom/geomD0.C
diff --git a/tutorials/data_visualisation/geom/geometry.C b/tutorials/visualisation/geom/geometry.C
similarity index 100%
rename from tutorials/data_visualisation/geom/geometry.C
rename to tutorials/visualisation/geom/geometry.C
diff --git a/tutorials/data_visualisation/geom/iterplugin.cxx b/tutorials/visualisation/geom/iterplugin.cxx
similarity index 100%
rename from tutorials/data_visualisation/geom/iterplugin.cxx
rename to tutorials/visualisation/geom/iterplugin.cxx
diff --git a/tutorials/data_visualisation/geom/lego.C b/tutorials/visualisation/geom/lego.C
similarity index 100%
rename from tutorials/data_visualisation/geom/lego.C
rename to tutorials/visualisation/geom/lego.C
diff --git a/tutorials/data_visualisation/geom/mp3player.C b/tutorials/visualisation/geom/mp3player.C
similarity index 100%
rename from tutorials/data_visualisation/geom/mp3player.C
rename to tutorials/visualisation/geom/mp3player.C
diff --git a/tutorials/data_visualisation/geom/na49.C b/tutorials/visualisation/geom/na49.C
similarity index 100%
rename from tutorials/data_visualisation/geom/na49.C
rename to tutorials/visualisation/geom/na49.C
diff --git a/tutorials/data_visualisation/geom/na49geomfile.C b/tutorials/visualisation/geom/na49geomfile.C
similarity index 100%
rename from tutorials/data_visualisation/geom/na49geomfile.C
rename to tutorials/visualisation/geom/na49geomfile.C
diff --git a/tutorials/data_visualisation/geom/na49view.C b/tutorials/visualisation/geom/na49view.C
similarity index 100%
rename from tutorials/data_visualisation/geom/na49view.C
rename to tutorials/visualisation/geom/na49view.C
diff --git a/tutorials/data_visualisation/geom/parallel_world.C b/tutorials/visualisation/geom/parallel_world.C
similarity index 100%
rename from tutorials/data_visualisation/geom/parallel_world.C
rename to tutorials/visualisation/geom/parallel_world.C
diff --git a/tutorials/data_visualisation/geom/robot.C b/tutorials/visualisation/geom/robot.C
similarity index 100%
rename from tutorials/data_visualisation/geom/robot.C
rename to tutorials/visualisation/geom/robot.C
diff --git a/tutorials/data_visualisation/geom/rootgeom.C b/tutorials/visualisation/geom/rootgeom.C
similarity index 100%
rename from tutorials/data_visualisation/geom/rootgeom.C
rename to tutorials/visualisation/geom/rootgeom.C
diff --git a/tutorials/data_visualisation/geom/runplugin.C b/tutorials/visualisation/geom/runplugin.C
similarity index 100%
rename from tutorials/data_visualisation/geom/runplugin.C
rename to tutorials/visualisation/geom/runplugin.C
diff --git a/tutorials/data_visualisation/geom/shapes.C b/tutorials/visualisation/geom/shapes.C
similarity index 100%
rename from tutorials/data_visualisation/geom/shapes.C
rename to tutorials/visualisation/geom/shapes.C
diff --git a/tutorials/data_visualisation/geom/shapesAnim.C b/tutorials/visualisation/geom/shapesAnim.C
similarity index 100%
rename from tutorials/data_visualisation/geom/shapesAnim.C
rename to tutorials/visualisation/geom/shapesAnim.C
diff --git a/tutorials/data_visualisation/geom/south_gate.C b/tutorials/visualisation/geom/south_gate.C
similarity index 100%
rename from tutorials/data_visualisation/geom/south_gate.C
rename to tutorials/visualisation/geom/south_gate.C
diff --git a/tutorials/data_visualisation/geom/station1.C b/tutorials/visualisation/geom/station1.C
similarity index 100%
rename from tutorials/data_visualisation/geom/station1.C
rename to tutorials/visualisation/geom/station1.C
diff --git a/tutorials/data_visualisation/geom/station2.C b/tutorials/visualisation/geom/station2.C
similarity index 100%
rename from tutorials/data_visualisation/geom/station2.C
rename to tutorials/visualisation/geom/station2.C
diff --git a/tutorials/data_visualisation/geom/tank.C b/tutorials/visualisation/geom/tank.C
similarity index 100%
rename from tutorials/data_visualisation/geom/tank.C
rename to tutorials/visualisation/geom/tank.C
diff --git a/tutorials/data_visualisation/geom/teddy.obj b/tutorials/visualisation/geom/teddy.obj
similarity index 100%
rename from tutorials/data_visualisation/geom/teddy.obj
rename to tutorials/visualisation/geom/teddy.obj
diff --git a/tutorials/data_visualisation/geom/tessellatedNav.C b/tutorials/visualisation/geom/tessellatedNav.C
similarity index 100%
rename from tutorials/data_visualisation/geom/tessellatedNav.C
rename to tutorials/visualisation/geom/tessellatedNav.C
diff --git a/tutorials/data_visualisation/geom/visualizeWavefrontObj.C b/tutorials/visualisation/geom/visualizeWavefrontObj.C
similarity index 100%
rename from tutorials/data_visualisation/geom/visualizeWavefrontObj.C
rename to tutorials/visualisation/geom/visualizeWavefrontObj.C
diff --git a/tutorials/data_visualisation/geom/web_cms.cxx b/tutorials/visualisation/geom/web_cms.cxx
similarity index 100%
rename from tutorials/data_visualisation/geom/web_cms.cxx
rename to tutorials/visualisation/geom/web_cms.cxx
diff --git a/tutorials/data_visualisation/geom/xtruDraw.C b/tutorials/visualisation/geom/xtruDraw.C
similarity index 100%
rename from tutorials/data_visualisation/geom/xtruDraw.C
rename to tutorials/visualisation/geom/xtruDraw.C
diff --git a/tutorials/data_visualisation/geom/xtruSamples.C b/tutorials/visualisation/geom/xtruSamples.C
similarity index 100%
rename from tutorials/data_visualisation/geom/xtruSamples.C
rename to tutorials/visualisation/geom/xtruSamples.C
diff --git a/tutorials/data_visualisation/gl/glViewerExercise.C b/tutorials/visualisation/gl/glViewerExercise.C
similarity index 100%
rename from tutorials/data_visualisation/gl/glViewerExercise.C
rename to tutorials/visualisation/gl/glViewerExercise.C
diff --git a/tutorials/data_visualisation/gl/glViewerLOD.C b/tutorials/visualisation/gl/glViewerLOD.C
similarity index 100%
rename from tutorials/data_visualisation/gl/glViewerLOD.C
rename to tutorials/visualisation/gl/glViewerLOD.C
diff --git a/tutorials/data_visualisation/gl/glbox.C b/tutorials/visualisation/gl/glbox.C
similarity index 100%
rename from tutorials/data_visualisation/gl/glbox.C
rename to tutorials/visualisation/gl/glbox.C
diff --git a/tutorials/data_visualisation/gl/gldemos.C b/tutorials/visualisation/gl/gldemos.C
similarity index 100%
rename from tutorials/data_visualisation/gl/gldemos.C
rename to tutorials/visualisation/gl/gldemos.C
diff --git a/tutorials/data_visualisation/gl/glh3c.C b/tutorials/visualisation/gl/glh3c.C
similarity index 100%
rename from tutorials/data_visualisation/gl/glh3c.C
rename to tutorials/visualisation/gl/glh3c.C
diff --git a/tutorials/data_visualisation/gl/glparametric.C b/tutorials/visualisation/gl/glparametric.C
similarity index 100%
rename from tutorials/data_visualisation/gl/glparametric.C
rename to tutorials/visualisation/gl/glparametric.C
diff --git a/tutorials/data_visualisation/gl/glparametrics2.C b/tutorials/visualisation/gl/glparametrics2.C
similarity index 100%
rename from tutorials/data_visualisation/gl/glparametrics2.C
rename to tutorials/visualisation/gl/glparametrics2.C
diff --git a/tutorials/data_visualisation/gl/glrose.C b/tutorials/visualisation/gl/glrose.C
similarity index 100%
rename from tutorials/data_visualisation/gl/glrose.C
rename to tutorials/visualisation/gl/glrose.C
diff --git a/tutorials/data_visualisation/gl/glsurfaces.C b/tutorials/visualisation/gl/glsurfaces.C
similarity index 100%
rename from tutorials/data_visualisation/gl/glsurfaces.C
rename to tutorials/visualisation/gl/glsurfaces.C
diff --git a/tutorials/data_visualisation/gl/gltf3.C b/tutorials/visualisation/gl/gltf3.C
similarity index 100%
rename from tutorials/data_visualisation/gl/gltf3.C
rename to tutorials/visualisation/gl/gltf3.C
diff --git a/tutorials/data_visualisation/gl/glvox1.C b/tutorials/visualisation/gl/glvox1.C
similarity index 100%
rename from tutorials/data_visualisation/gl/glvox1.C
rename to tutorials/visualisation/gl/glvox1.C
diff --git a/tutorials/data_visualisation/gl/glvox2.C b/tutorials/visualisation/gl/glvox2.C
similarity index 100%
rename from tutorials/data_visualisation/gl/glvox2.C
rename to tutorials/visualisation/gl/glvox2.C
diff --git a/tutorials/data_visualisation/gl/grad.C b/tutorials/visualisation/gl/grad.C
similarity index 100%
rename from tutorials/data_visualisation/gl/grad.C
rename to tutorials/visualisation/gl/grad.C
diff --git a/tutorials/data_visualisation/gl/grad2.C b/tutorials/visualisation/gl/grad2.C
similarity index 100%
rename from tutorials/data_visualisation/gl/grad2.C
rename to tutorials/visualisation/gl/grad2.C
diff --git a/tutorials/data_visualisation/gl/gradients.C b/tutorials/visualisation/gl/gradients.C
similarity index 100%
rename from tutorials/data_visualisation/gl/gradients.C
rename to tutorials/visualisation/gl/gradients.C
diff --git a/tutorials/data_visualisation/gl/gviz3d.C b/tutorials/visualisation/gl/gviz3d.C
similarity index 100%
rename from tutorials/data_visualisation/gl/gviz3d.C
rename to tutorials/visualisation/gl/gviz3d.C
diff --git a/tutorials/data_visualisation/gl/nucleus.C b/tutorials/visualisation/gl/nucleus.C
similarity index 100%
rename from tutorials/data_visualisation/gl/nucleus.C
rename to tutorials/visualisation/gl/nucleus.C
diff --git a/tutorials/data_visualisation/gl/parallelcoordtrans.C b/tutorials/visualisation/gl/parallelcoordtrans.C
similarity index 100%
rename from tutorials/data_visualisation/gl/parallelcoordtrans.C
rename to tutorials/visualisation/gl/parallelcoordtrans.C
diff --git a/tutorials/data_visualisation/gl/radialgradients.C b/tutorials/visualisation/gl/radialgradients.C
similarity index 100%
rename from tutorials/data_visualisation/gl/radialgradients.C
rename to tutorials/visualisation/gl/radialgradients.C
diff --git a/tutorials/data_visualisation/gl/transp.C b/tutorials/visualisation/gl/transp.C
similarity index 100%
rename from tutorials/data_visualisation/gl/transp.C
rename to tutorials/visualisation/gl/transp.C
diff --git a/tutorials/data_visualisation/gl/transp_text.C b/tutorials/visualisation/gl/transp_text.C
similarity index 100%
rename from tutorials/data_visualisation/gl/transp_text.C
rename to tutorials/visualisation/gl/transp_text.C
diff --git a/tutorials/data_visualisation/gl/transparentpad.C b/tutorials/visualisation/gl/transparentpad.C
similarity index 100%
rename from tutorials/data_visualisation/gl/transparentpad.C
rename to tutorials/visualisation/gl/transparentpad.C
diff --git a/tutorials/data_visualisation/gl/viewer3DLocal.C b/tutorials/visualisation/gl/viewer3DLocal.C
similarity index 100%
rename from tutorials/data_visualisation/gl/viewer3DLocal.C
rename to tutorials/visualisation/gl/viewer3DLocal.C
diff --git a/tutorials/data_visualisation/gl/viewer3DMaster.C b/tutorials/visualisation/gl/viewer3DMaster.C
similarity index 100%
rename from tutorials/data_visualisation/gl/viewer3DMaster.C
rename to tutorials/visualisation/gl/viewer3DMaster.C
diff --git a/tutorials/data_visualisation/graphics/AtlasExample.C b/tutorials/visualisation/graphics/AtlasExample.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/AtlasExample.C
rename to tutorials/visualisation/graphics/AtlasExample.C
diff --git a/tutorials/data_visualisation/graphics/accessiblecolorschemes.C b/tutorials/visualisation/graphics/accessiblecolorschemes.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/accessiblecolorschemes.C
rename to tutorials/visualisation/graphics/accessiblecolorschemes.C
diff --git a/tutorials/data_visualisation/graphics/analyze.C b/tutorials/visualisation/graphics/analyze.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/analyze.C
rename to tutorials/visualisation/graphics/analyze.C
diff --git a/tutorials/data_visualisation/graphics/anim.C b/tutorials/visualisation/graphics/anim.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/anim.C
rename to tutorials/visualisation/graphics/anim.C
diff --git a/tutorials/data_visualisation/graphics/archi.C b/tutorials/visualisation/graphics/archi.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/archi.C
rename to tutorials/visualisation/graphics/archi.C
diff --git a/tutorials/data_visualisation/graphics/arrows.C b/tutorials/visualisation/graphics/arrows.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/arrows.C
rename to tutorials/visualisation/graphics/arrows.C
diff --git a/tutorials/data_visualisation/graphics/basic3d.C b/tutorials/visualisation/graphics/basic3d.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/basic3d.C
rename to tutorials/visualisation/graphics/basic3d.C
diff --git a/tutorials/data_visualisation/graphics/canvas.C b/tutorials/visualisation/graphics/canvas.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/canvas.C
rename to tutorials/visualisation/graphics/canvas.C
diff --git a/tutorials/data_visualisation/graphics/canvas2.C b/tutorials/visualisation/graphics/canvas2.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/canvas2.C
rename to tutorials/visualisation/graphics/canvas2.C
diff --git a/tutorials/data_visualisation/graphics/compile.C b/tutorials/visualisation/graphics/compile.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/compile.C
rename to tutorials/visualisation/graphics/compile.C
diff --git a/tutorials/data_visualisation/graphics/crown.C b/tutorials/visualisation/graphics/crown.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/crown.C
rename to tutorials/visualisation/graphics/crown.C
diff --git a/tutorials/data_visualisation/graphics/diamond.C b/tutorials/visualisation/graphics/diamond.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/diamond.C
rename to tutorials/visualisation/graphics/diamond.C
diff --git a/tutorials/data_visualisation/graphics/earth.C b/tutorials/visualisation/graphics/earth.C
similarity index 96%
rename from tutorials/data_visualisation/graphics/earth.C
rename to tutorials/visualisation/graphics/earth.C
index 7fd0309e29704..4d42a22db13a0 100644
--- a/tutorials/data_visualisation/graphics/earth.C
+++ b/tutorials/visualisation/graphics/earth.C
@@ -29,7 +29,7 @@ TCanvas *earth(){
    TH2F *hw = new TH2F("hw","Mollweide", 180, -180, 180, 181, -90.5, 90.5);
 
    TString dat = gROOT->GetTutorialDir();
-   dat.Append("/graphics/earth.dat");
+   dat.Append("/visualisation/graphics/earth.dat");
    dat.ReplaceAll("/./","/");
 
    ifstream in;
diff --git a/tutorials/data_visualisation/graphics/earth.dat b/tutorials/visualisation/graphics/earth.dat
similarity index 100%
rename from tutorials/data_visualisation/graphics/earth.dat
rename to tutorials/visualisation/graphics/earth.dat
diff --git a/tutorials/data_visualisation/graphics/ellipse.C b/tutorials/visualisation/graphics/ellipse.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/ellipse.C
rename to tutorials/visualisation/graphics/ellipse.C
diff --git a/tutorials/data_visualisation/graphics/eval.C b/tutorials/visualisation/graphics/eval.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/eval.C
rename to tutorials/visualisation/graphics/eval.C
diff --git a/tutorials/data_visualisation/graphics/event.C b/tutorials/visualisation/graphics/event.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/event.C
rename to tutorials/visualisation/graphics/event.C
diff --git a/tutorials/data_visualisation/graphics/feynman.C b/tutorials/visualisation/graphics/feynman.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/feynman.C
rename to tutorials/visualisation/graphics/feynman.C
diff --git a/tutorials/data_visualisation/graphics/first.C b/tutorials/visualisation/graphics/first.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/first.C
rename to tutorials/visualisation/graphics/first.C
diff --git a/tutorials/data_visualisation/graphics/formula1.C b/tutorials/visualisation/graphics/formula1.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/formula1.C
rename to tutorials/visualisation/graphics/formula1.C
diff --git a/tutorials/data_visualisation/graphics/framework.C b/tutorials/visualisation/graphics/framework.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/framework.C
rename to tutorials/visualisation/graphics/framework.C
diff --git a/tutorials/data_visualisation/graphics/gaxis.C b/tutorials/visualisation/graphics/gaxis.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/gaxis.C
rename to tutorials/visualisation/graphics/gaxis.C
diff --git a/tutorials/data_visualisation/graphics/gaxis2.C b/tutorials/visualisation/graphics/gaxis2.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/gaxis2.C
rename to tutorials/visualisation/graphics/gaxis2.C
diff --git a/tutorials/data_visualisation/graphics/gaxis3.C b/tutorials/visualisation/graphics/gaxis3.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/gaxis3.C
rename to tutorials/visualisation/graphics/gaxis3.C
diff --git a/tutorials/data_visualisation/graphics/graph_edit_playback.C b/tutorials/visualisation/graphics/graph_edit_playback.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/graph_edit_playback.C
rename to tutorials/visualisation/graphics/graph_edit_playback.C
diff --git a/tutorials/data_visualisation/graphics/greyscale.C b/tutorials/visualisation/graphics/greyscale.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/greyscale.C
rename to tutorials/visualisation/graphics/greyscale.C
diff --git a/tutorials/data_visualisation/graphics/gtime.C b/tutorials/visualisation/graphics/gtime.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/gtime.C
rename to tutorials/visualisation/graphics/gtime.C
diff --git a/tutorials/data_visualisation/graphics/inside.C b/tutorials/visualisation/graphics/inside.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/inside.C
rename to tutorials/visualisation/graphics/inside.C
diff --git a/tutorials/data_visualisation/graphics/latex.C b/tutorials/visualisation/graphics/latex.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/latex.C
rename to tutorials/visualisation/graphics/latex.C
diff --git a/tutorials/data_visualisation/graphics/latex2.C b/tutorials/visualisation/graphics/latex2.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/latex2.C
rename to tutorials/visualisation/graphics/latex2.C
diff --git a/tutorials/data_visualisation/graphics/latex3.C b/tutorials/visualisation/graphics/latex3.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/latex3.C
rename to tutorials/visualisation/graphics/latex3.C
diff --git a/tutorials/data_visualisation/graphics/latex4.C b/tutorials/visualisation/graphics/latex4.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/latex4.C
rename to tutorials/visualisation/graphics/latex4.C
diff --git a/tutorials/data_visualisation/graphics/latex5.C b/tutorials/visualisation/graphics/latex5.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/latex5.C
rename to tutorials/visualisation/graphics/latex5.C
diff --git a/tutorials/data_visualisation/graphics/mandelbrot.C b/tutorials/visualisation/graphics/mandelbrot.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/mandelbrot.C
rename to tutorials/visualisation/graphics/mandelbrot.C
diff --git a/tutorials/data_visualisation/graphics/markerwarning.C b/tutorials/visualisation/graphics/markerwarning.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/markerwarning.C
rename to tutorials/visualisation/graphics/markerwarning.C
diff --git a/tutorials/data_visualisation/graphics/mass_spectrum.C b/tutorials/visualisation/graphics/mass_spectrum.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/mass_spectrum.C
rename to tutorials/visualisation/graphics/mass_spectrum.C
diff --git a/tutorials/data_visualisation/graphics/palettes.C b/tutorials/visualisation/graphics/palettes.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/palettes.C
rename to tutorials/visualisation/graphics/palettes.C
diff --git a/tutorials/data_visualisation/graphics/pavetext.C b/tutorials/visualisation/graphics/pavetext.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/pavetext.C
rename to tutorials/visualisation/graphics/pavetext.C
diff --git a/tutorials/data_visualisation/graphics/perceptualcolormap.C b/tutorials/visualisation/graphics/perceptualcolormap.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/perceptualcolormap.C
rename to tutorials/visualisation/graphics/perceptualcolormap.C
diff --git a/tutorials/data_visualisation/graphics/piechart.C b/tutorials/visualisation/graphics/piechart.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/piechart.C
rename to tutorials/visualisation/graphics/piechart.C
diff --git a/tutorials/data_visualisation/graphics/polytest1.C b/tutorials/visualisation/graphics/polytest1.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/polytest1.C
rename to tutorials/visualisation/graphics/polytest1.C
diff --git a/tutorials/data_visualisation/graphics/polytest2.C b/tutorials/visualisation/graphics/polytest2.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/polytest2.C
rename to tutorials/visualisation/graphics/polytest2.C
diff --git a/tutorials/data_visualisation/graphics/pstable.C b/tutorials/visualisation/graphics/pstable.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/pstable.C
rename to tutorials/visualisation/graphics/pstable.C
diff --git a/tutorials/data_visualisation/graphics/psview.C b/tutorials/visualisation/graphics/psview.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/psview.C
rename to tutorials/visualisation/graphics/psview.C
diff --git a/tutorials/data_visualisation/graphics/quarks.C b/tutorials/visualisation/graphics/quarks.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/quarks.C
rename to tutorials/visualisation/graphics/quarks.C
diff --git a/tutorials/data_visualisation/graphics/save_batch.C b/tutorials/visualisation/graphics/save_batch.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/save_batch.C
rename to tutorials/visualisation/graphics/save_batch.C
diff --git a/tutorials/data_visualisation/graphics/saveall.C b/tutorials/visualisation/graphics/saveall.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/saveall.C
rename to tutorials/visualisation/graphics/saveall.C
diff --git a/tutorials/data_visualisation/graphics/schroedinger_hydrogen.C b/tutorials/visualisation/graphics/schroedinger_hydrogen.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/schroedinger_hydrogen.C
rename to tutorials/visualisation/graphics/schroedinger_hydrogen.C
diff --git a/tutorials/data_visualisation/graphics/tmathtext.C b/tutorials/visualisation/graphics/tmathtext.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/tmathtext.C
rename to tutorials/visualisation/graphics/tmathtext.C
diff --git a/tutorials/data_visualisation/graphics/tmathtext2.C b/tutorials/visualisation/graphics/tmathtext2.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/tmathtext2.C
rename to tutorials/visualisation/graphics/tmathtext2.C
diff --git a/tutorials/data_visualisation/graphics/tornado.C b/tutorials/visualisation/graphics/tornado.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/tornado.C
rename to tutorials/visualisation/graphics/tornado.C
diff --git a/tutorials/data_visualisation/graphics/transparency.C b/tutorials/visualisation/graphics/transparency.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/transparency.C
rename to tutorials/visualisation/graphics/transparency.C
diff --git a/tutorials/data_visualisation/graphics/triangles.C b/tutorials/visualisation/graphics/triangles.C
similarity index 100%
rename from tutorials/data_visualisation/graphics/triangles.C
rename to tutorials/visualisation/graphics/triangles.C
diff --git a/tutorials/data_visualisation/graphs/SWAN2017.dat b/tutorials/visualisation/graphs/SWAN2017.dat
similarity index 100%
rename from tutorials/data_visualisation/graphs/SWAN2017.dat
rename to tutorials/visualisation/graphs/SWAN2017.dat
diff --git a/tutorials/data_visualisation/graphs/annotation3d.C b/tutorials/visualisation/graphs/annotation3d.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/annotation3d.C
rename to tutorials/visualisation/graphs/annotation3d.C
diff --git a/tutorials/data_visualisation/graphs/approx.C b/tutorials/visualisation/graphs/approx.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/approx.C
rename to tutorials/visualisation/graphs/approx.C
diff --git a/tutorials/data_visualisation/graphs/bent.C b/tutorials/visualisation/graphs/bent.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/bent.C
rename to tutorials/visualisation/graphs/bent.C
diff --git a/tutorials/data_visualisation/graphs/bent.py b/tutorials/visualisation/graphs/bent.py
similarity index 100%
rename from tutorials/data_visualisation/graphs/bent.py
rename to tutorials/visualisation/graphs/bent.py
diff --git a/tutorials/data_visualisation/graphs/exclusiongraph.C b/tutorials/visualisation/graphs/exclusiongraph.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/exclusiongraph.C
rename to tutorials/visualisation/graphs/exclusiongraph.C
diff --git a/tutorials/data_visualisation/graphs/exclusiongraph2.C b/tutorials/visualisation/graphs/exclusiongraph2.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/exclusiongraph2.C
rename to tutorials/visualisation/graphs/exclusiongraph2.C
diff --git a/tutorials/data_visualisation/graphs/gerrors.C b/tutorials/visualisation/graphs/gerrors.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/gerrors.C
rename to tutorials/visualisation/graphs/gerrors.C
diff --git a/tutorials/data_visualisation/graphs/gerrors2.C b/tutorials/visualisation/graphs/gerrors2.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/gerrors2.C
rename to tutorials/visualisation/graphs/gerrors2.C
diff --git a/tutorials/data_visualisation/graphs/gmultierrors.C b/tutorials/visualisation/graphs/gmultierrors.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/gmultierrors.C
rename to tutorials/visualisation/graphs/gmultierrors.C
diff --git a/tutorials/data_visualisation/graphs/graph.C b/tutorials/visualisation/graphs/graph.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/graph.C
rename to tutorials/visualisation/graphs/graph.C
diff --git a/tutorials/data_visualisation/graphs/graph2derrorsfit.C b/tutorials/visualisation/graphs/graph2derrorsfit.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/graph2derrorsfit.C
rename to tutorials/visualisation/graphs/graph2derrorsfit.C
diff --git a/tutorials/data_visualisation/graphs/graphApply.C b/tutorials/visualisation/graphs/graphApply.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/graphApply.C
rename to tutorials/visualisation/graphs/graphApply.C
diff --git a/tutorials/data_visualisation/graphs/graphShade.C b/tutorials/visualisation/graphs/graphShade.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/graphShade.C
rename to tutorials/visualisation/graphs/graphShade.C
diff --git a/tutorials/data_visualisation/graphs/graphpalettecolor.C b/tutorials/visualisation/graphs/graphpalettecolor.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/graphpalettecolor.C
rename to tutorials/visualisation/graphs/graphpalettecolor.C
diff --git a/tutorials/data_visualisation/graphs/graphpolar.C b/tutorials/visualisation/graphs/graphpolar.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/graphpolar.C
rename to tutorials/visualisation/graphs/graphpolar.C
diff --git a/tutorials/data_visualisation/graphs/graphpolar2.C b/tutorials/visualisation/graphs/graphpolar2.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/graphpolar2.C
rename to tutorials/visualisation/graphs/graphpolar2.C
diff --git a/tutorials/data_visualisation/graphs/graphpolar3.C b/tutorials/visualisation/graphs/graphpolar3.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/graphpolar3.C
rename to tutorials/visualisation/graphs/graphpolar3.C
diff --git a/tutorials/data_visualisation/graphs/graphreverse.C b/tutorials/visualisation/graphs/graphreverse.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/graphreverse.C
rename to tutorials/visualisation/graphs/graphreverse.C
diff --git a/tutorials/data_visualisation/graphs/graphstruct.C b/tutorials/visualisation/graphs/graphstruct.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/graphstruct.C
rename to tutorials/visualisation/graphs/graphstruct.C
diff --git a/tutorials/data_visualisation/graphs/graphtext.C b/tutorials/visualisation/graphs/graphtext.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/graphtext.C
rename to tutorials/visualisation/graphs/graphtext.C
diff --git a/tutorials/data_visualisation/graphs/gtime.C b/tutorials/visualisation/graphs/gtime.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/gtime.C
rename to tutorials/visualisation/graphs/gtime.C
diff --git a/tutorials/data_visualisation/graphs/gtime2.C b/tutorials/visualisation/graphs/gtime2.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/gtime2.C
rename to tutorials/visualisation/graphs/gtime2.C
diff --git a/tutorials/data_visualisation/graphs/hlGraph1.C b/tutorials/visualisation/graphs/hlGraph1.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/hlGraph1.C
rename to tutorials/visualisation/graphs/hlGraph1.C
diff --git a/tutorials/data_visualisation/graphs/hlGraph2.C b/tutorials/visualisation/graphs/hlGraph2.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/hlGraph2.C
rename to tutorials/visualisation/graphs/hlGraph2.C
diff --git a/tutorials/data_visualisation/graphs/labels1.C b/tutorials/visualisation/graphs/labels1.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/labels1.C
rename to tutorials/visualisation/graphs/labels1.C
diff --git a/tutorials/data_visualisation/graphs/labels2.C b/tutorials/visualisation/graphs/labels2.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/labels2.C
rename to tutorials/visualisation/graphs/labels2.C
diff --git a/tutorials/data_visualisation/graphs/motorcycle.C b/tutorials/visualisation/graphs/motorcycle.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/motorcycle.C
rename to tutorials/visualisation/graphs/motorcycle.C
diff --git a/tutorials/data_visualisation/graphs/motorcycle.dat b/tutorials/visualisation/graphs/motorcycle.dat
similarity index 100%
rename from tutorials/data_visualisation/graphs/motorcycle.dat
rename to tutorials/visualisation/graphs/motorcycle.dat
diff --git a/tutorials/data_visualisation/graphs/multigraph.C b/tutorials/visualisation/graphs/multigraph.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/multigraph.C
rename to tutorials/visualisation/graphs/multigraph.C
diff --git a/tutorials/data_visualisation/graphs/multigraphpalettecolor.C b/tutorials/visualisation/graphs/multigraphpalettecolor.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/multigraphpalettecolor.C
rename to tutorials/visualisation/graphs/multigraphpalettecolor.C
diff --git a/tutorials/data_visualisation/graphs/multipalette.C b/tutorials/visualisation/graphs/multipalette.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/multipalette.C
rename to tutorials/visualisation/graphs/multipalette.C
diff --git a/tutorials/data_visualisation/graphs/scatter.C b/tutorials/visualisation/graphs/scatter.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/scatter.C
rename to tutorials/visualisation/graphs/scatter.C
diff --git a/tutorials/data_visualisation/graphs/seism.C b/tutorials/visualisation/graphs/seism.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/seism.C
rename to tutorials/visualisation/graphs/seism.C
diff --git a/tutorials/data_visualisation/graphs/splines_test.C b/tutorials/visualisation/graphs/splines_test.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/splines_test.C
rename to tutorials/visualisation/graphs/splines_test.C
diff --git a/tutorials/data_visualisation/graphs/surfaces.C b/tutorials/visualisation/graphs/surfaces.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/surfaces.C
rename to tutorials/visualisation/graphs/surfaces.C
diff --git a/tutorials/data_visualisation/graphs/timeSeriesFromCSV.C b/tutorials/visualisation/graphs/timeSeriesFromCSV.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/timeSeriesFromCSV.C
rename to tutorials/visualisation/graphs/timeSeriesFromCSV.C
diff --git a/tutorials/data_visualisation/graphs/timeSeriesFromCSV.py b/tutorials/visualisation/graphs/timeSeriesFromCSV.py
similarity index 100%
rename from tutorials/data_visualisation/graphs/timeSeriesFromCSV.py
rename to tutorials/visualisation/graphs/timeSeriesFromCSV.py
diff --git a/tutorials/data_visualisation/graphs/timeSeriesFromCSV_TDF.C b/tutorials/visualisation/graphs/timeSeriesFromCSV_TDF.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/timeSeriesFromCSV_TDF.C
rename to tutorials/visualisation/graphs/timeSeriesFromCSV_TDF.C
diff --git a/tutorials/data_visualisation/graphs/timeonaxis.C b/tutorials/visualisation/graphs/timeonaxis.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/timeonaxis.C
rename to tutorials/visualisation/graphs/timeonaxis.C
diff --git a/tutorials/data_visualisation/graphs/timeonaxis2.C b/tutorials/visualisation/graphs/timeonaxis2.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/timeonaxis2.C
rename to tutorials/visualisation/graphs/timeonaxis2.C
diff --git a/tutorials/data_visualisation/graphs/timeonaxis3.C b/tutorials/visualisation/graphs/timeonaxis3.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/timeonaxis3.C
rename to tutorials/visualisation/graphs/timeonaxis3.C
diff --git a/tutorials/data_visualisation/graphs/waves.C b/tutorials/visualisation/graphs/waves.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/waves.C
rename to tutorials/visualisation/graphs/waves.C
diff --git a/tutorials/data_visualisation/graphs/zdemo.C b/tutorials/visualisation/graphs/zdemo.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/zdemo.C
rename to tutorials/visualisation/graphs/zdemo.C
diff --git a/tutorials/data_visualisation/graphs/zones.C b/tutorials/visualisation/graphs/zones.C
similarity index 100%
rename from tutorials/data_visualisation/graphs/zones.C
rename to tutorials/visualisation/graphs/zones.C
diff --git a/tutorials/data_visualisation/graphs/zones.py b/tutorials/visualisation/graphs/zones.py
similarity index 100%
rename from tutorials/data_visualisation/graphs/zones.py
rename to tutorials/visualisation/graphs/zones.py
diff --git a/tutorials/data_visualisation/gui/CPUMeter.C b/tutorials/visualisation/gui/CPUMeter.C
similarity index 100%
rename from tutorials/data_visualisation/gui/CPUMeter.C
rename to tutorials/visualisation/gui/CPUMeter.C
diff --git a/tutorials/data_visualisation/gui/Slider3Demo.C b/tutorials/visualisation/gui/Slider3Demo.C
similarity index 100%
rename from tutorials/data_visualisation/gui/Slider3Demo.C
rename to tutorials/visualisation/gui/Slider3Demo.C
diff --git a/tutorials/data_visualisation/gui/WorldMap.C b/tutorials/visualisation/gui/WorldMap.C
similarity index 100%
rename from tutorials/data_visualisation/gui/WorldMap.C
rename to tutorials/visualisation/gui/WorldMap.C
diff --git a/tutorials/data_visualisation/gui/buttonChangelabel.C b/tutorials/visualisation/gui/buttonChangelabel.C
similarity index 100%
rename from tutorials/data_visualisation/gui/buttonChangelabel.C
rename to tutorials/visualisation/gui/buttonChangelabel.C
diff --git a/tutorials/data_visualisation/gui/buttonTest.C b/tutorials/visualisation/gui/buttonTest.C
similarity index 100%
rename from tutorials/data_visualisation/gui/buttonTest.C
rename to tutorials/visualisation/gui/buttonTest.C
diff --git a/tutorials/data_visualisation/gui/buttongroupState.C b/tutorials/visualisation/gui/buttongroupState.C
similarity index 100%
rename from tutorials/data_visualisation/gui/buttongroupState.C
rename to tutorials/visualisation/gui/buttongroupState.C
diff --git a/tutorials/data_visualisation/gui/buttonsLayout.C b/tutorials/visualisation/gui/buttonsLayout.C
similarity index 100%
rename from tutorials/data_visualisation/gui/buttonsLayout.C
rename to tutorials/visualisation/gui/buttonsLayout.C
diff --git a/tutorials/data_visualisation/gui/calendar.C b/tutorials/visualisation/gui/calendar.C
similarity index 100%
rename from tutorials/data_visualisation/gui/calendar.C
rename to tutorials/visualisation/gui/calendar.C
diff --git a/tutorials/data_visualisation/gui/customContextMenu.C b/tutorials/visualisation/gui/customContextMenu.C
similarity index 100%
rename from tutorials/data_visualisation/gui/customContextMenu.C
rename to tutorials/visualisation/gui/customContextMenu.C
diff --git a/tutorials/data_visualisation/gui/customTH1Fmenu.C b/tutorials/visualisation/gui/customTH1Fmenu.C
similarity index 100%
rename from tutorials/data_visualisation/gui/customTH1Fmenu.C
rename to tutorials/visualisation/gui/customTH1Fmenu.C
diff --git a/tutorials/data_visualisation/gui/drag_and_drop.C b/tutorials/visualisation/gui/drag_and_drop.C
similarity index 100%
rename from tutorials/data_visualisation/gui/drag_and_drop.C
rename to tutorials/visualisation/gui/drag_and_drop.C
diff --git a/tutorials/data_visualisation/gui/exec3.C b/tutorials/visualisation/gui/exec3.C
similarity index 100%
rename from tutorials/data_visualisation/gui/exec3.C
rename to tutorials/visualisation/gui/exec3.C
diff --git a/tutorials/data_visualisation/gui/exec_macro.C b/tutorials/visualisation/gui/exec_macro.C
similarity index 100%
rename from tutorials/data_visualisation/gui/exec_macro.C
rename to tutorials/visualisation/gui/exec_macro.C
diff --git a/tutorials/data_visualisation/gui/games.C b/tutorials/visualisation/gui/games.C
similarity index 100%
rename from tutorials/data_visualisation/gui/games.C
rename to tutorials/visualisation/gui/games.C
diff --git a/tutorials/data_visualisation/gui/gtreeTableTest.C b/tutorials/visualisation/gui/gtreeTableTest.C
similarity index 100%
rename from tutorials/data_visualisation/gui/gtreeTableTest.C
rename to tutorials/visualisation/gui/gtreeTableTest.C
diff --git a/tutorials/data_visualisation/gui/guiWithCLING.C b/tutorials/visualisation/gui/guiWithCLING.C
similarity index 100%
rename from tutorials/data_visualisation/gui/guiWithCLING.C
rename to tutorials/visualisation/gui/guiWithCLING.C
diff --git a/tutorials/data_visualisation/gui/guilabels.C b/tutorials/visualisation/gui/guilabels.C
similarity index 100%
rename from tutorials/data_visualisation/gui/guilabels.C
rename to tutorials/visualisation/gui/guilabels.C
diff --git a/tutorials/data_visualisation/gui/guitest.C b/tutorials/visualisation/gui/guitest.C
similarity index 100%
rename from tutorials/data_visualisation/gui/guitest.C
rename to tutorials/visualisation/gui/guitest.C
diff --git a/tutorials/data_visualisation/gui/guitest_playback.C b/tutorials/visualisation/gui/guitest_playback.C
similarity index 100%
rename from tutorials/data_visualisation/gui/guitest_playback.C
rename to tutorials/visualisation/gui/guitest_playback.C
diff --git a/tutorials/data_visualisation/gui/iconAsXPMData.C b/tutorials/visualisation/gui/iconAsXPMData.C
similarity index 100%
rename from tutorials/data_visualisation/gui/iconAsXPMData.C
rename to tutorials/visualisation/gui/iconAsXPMData.C
diff --git a/tutorials/data_visualisation/gui/listBox.C b/tutorials/visualisation/gui/listBox.C
similarity index 100%
rename from tutorials/data_visualisation/gui/listBox.C
rename to tutorials/visualisation/gui/listBox.C
diff --git a/tutorials/data_visualisation/gui/mditest.C b/tutorials/visualisation/gui/mditest.C
similarity index 100%
rename from tutorials/data_visualisation/gui/mditest.C
rename to tutorials/visualisation/gui/mditest.C
diff --git a/tutorials/data_visualisation/gui/mditestbg.xpm b/tutorials/visualisation/gui/mditestbg.xpm
similarity index 100%
rename from tutorials/data_visualisation/gui/mditestbg.xpm
rename to tutorials/visualisation/gui/mditestbg.xpm
diff --git a/tutorials/data_visualisation/gui/ntupleTableTest.C b/tutorials/visualisation/gui/ntupleTableTest.C
similarity index 100%
rename from tutorials/data_visualisation/gui/ntupleTableTest.C
rename to tutorials/visualisation/gui/ntupleTableTest.C
diff --git a/tutorials/data_visualisation/gui/numberEntry.C b/tutorials/visualisation/gui/numberEntry.C
similarity index 100%
rename from tutorials/data_visualisation/gui/numberEntry.C
rename to tutorials/visualisation/gui/numberEntry.C
diff --git a/tutorials/data_visualisation/gui/simpleTableTest.C b/tutorials/visualisation/gui/simpleTableTest.C
similarity index 100%
rename from tutorials/data_visualisation/gui/simpleTableTest.C
rename to tutorials/visualisation/gui/simpleTableTest.C
diff --git a/tutorials/data_visualisation/gui/splitbuttonTest.C b/tutorials/visualisation/gui/splitbuttonTest.C
similarity index 100%
rename from tutorials/data_visualisation/gui/splitbuttonTest.C
rename to tutorials/visualisation/gui/splitbuttonTest.C
diff --git a/tutorials/data_visualisation/gui/splitterHorizontal.C b/tutorials/visualisation/gui/splitterHorizontal.C
similarity index 100%
rename from tutorials/data_visualisation/gui/splitterHorizontal.C
rename to tutorials/visualisation/gui/splitterHorizontal.C
diff --git a/tutorials/data_visualisation/gui/splitterVertical.C b/tutorials/visualisation/gui/splitterVertical.C
similarity index 100%
rename from tutorials/data_visualisation/gui/splitterVertical.C
rename to tutorials/visualisation/gui/splitterVertical.C
diff --git a/tutorials/data_visualisation/gui/staffTableTest.C b/tutorials/visualisation/gui/staffTableTest.C
similarity index 100%
rename from tutorials/data_visualisation/gui/staffTableTest.C
rename to tutorials/visualisation/gui/staffTableTest.C
diff --git a/tutorials/data_visualisation/gui/statusBar.C b/tutorials/visualisation/gui/statusBar.C
similarity index 100%
rename from tutorials/data_visualisation/gui/statusBar.C
rename to tutorials/visualisation/gui/statusBar.C
diff --git a/tutorials/data_visualisation/gui/textEntries.C b/tutorials/visualisation/gui/textEntries.C
similarity index 100%
rename from tutorials/data_visualisation/gui/textEntries.C
rename to tutorials/visualisation/gui/textEntries.C
diff --git a/tutorials/data_visualisation/gui/textviewostream.C b/tutorials/visualisation/gui/textviewostream.C
similarity index 100%
rename from tutorials/data_visualisation/gui/textviewostream.C
rename to tutorials/visualisation/gui/textviewostream.C
diff --git a/tutorials/data_visualisation/gui/worldmap.jpg b/tutorials/visualisation/gui/worldmap.jpg
similarity index 100%
rename from tutorials/data_visualisation/gui/worldmap.jpg
rename to tutorials/visualisation/gui/worldmap.jpg
diff --git a/tutorials/data_visualisation/image/fore.xpm b/tutorials/visualisation/image/fore.xpm
similarity index 100%
rename from tutorials/data_visualisation/image/fore.xpm
rename to tutorials/visualisation/image/fore.xpm
diff --git a/tutorials/data_visualisation/image/galaxy_image.C b/tutorials/visualisation/image/galaxy_image.C
similarity index 100%
rename from tutorials/data_visualisation/image/galaxy_image.C
rename to tutorials/visualisation/image/galaxy_image.C
diff --git a/tutorials/data_visualisation/image/hist2image.C b/tutorials/visualisation/image/hist2image.C
similarity index 100%
rename from tutorials/data_visualisation/image/hist2image.C
rename to tutorials/visualisation/image/hist2image.C
diff --git a/tutorials/data_visualisation/image/hsumanim.C b/tutorials/visualisation/image/hsumanim.C
similarity index 100%
rename from tutorials/data_visualisation/image/hsumanim.C
rename to tutorials/visualisation/image/hsumanim.C
diff --git a/tutorials/data_visualisation/image/image2hist.C b/tutorials/visualisation/image/image2hist.C
similarity index 100%
rename from tutorials/data_visualisation/image/image2hist.C
rename to tutorials/visualisation/image/image2hist.C
diff --git a/tutorials/data_visualisation/image/img2pad.C b/tutorials/visualisation/image/img2pad.C
similarity index 100%
rename from tutorials/data_visualisation/image/img2pad.C
rename to tutorials/visualisation/image/img2pad.C
diff --git a/tutorials/data_visualisation/image/imgconv.C b/tutorials/visualisation/image/imgconv.C
similarity index 100%
rename from tutorials/data_visualisation/image/imgconv.C
rename to tutorials/visualisation/image/imgconv.C
diff --git a/tutorials/data_visualisation/image/mditestbg.xpm b/tutorials/visualisation/image/mditestbg.xpm
similarity index 100%
rename from tutorials/data_visualisation/image/mditestbg.xpm
rename to tutorials/visualisation/image/mditestbg.xpm
diff --git a/tutorials/data_visualisation/image/pad2png.C b/tutorials/visualisation/image/pad2png.C
similarity index 100%
rename from tutorials/data_visualisation/image/pad2png.C
rename to tutorials/visualisation/image/pad2png.C
diff --git a/tutorials/data_visualisation/image/rose512.jpg b/tutorials/visualisation/image/rose512.jpg
similarity index 100%
rename from tutorials/data_visualisation/image/rose512.jpg
rename to tutorials/visualisation/image/rose512.jpg
diff --git a/tutorials/data_visualisation/image/rose_image.C b/tutorials/visualisation/image/rose_image.C
similarity index 100%
rename from tutorials/data_visualisation/image/rose_image.C
rename to tutorials/visualisation/image/rose_image.C
diff --git a/tutorials/data_visualisation/image/trans_graph.C b/tutorials/visualisation/image/trans_graph.C
similarity index 100%
rename from tutorials/data_visualisation/image/trans_graph.C
rename to tutorials/visualisation/image/trans_graph.C
diff --git a/tutorials/data_visualisation/index.md b/tutorials/visualisation/index.md
similarity index 64%
rename from tutorials/data_visualisation/index.md
rename to tutorials/visualisation/index.md
index b20bda645dbc2..5c36b77294022 100644
--- a/tutorials/data_visualisation/index.md
+++ b/tutorials/visualisation/index.md
@@ -1,49 +1,41 @@
-\addtogroup tutorial_data_vis
+\addtogroup tutorial_visualisation
 
 \defgroup tutorial_graphs Graphs tutorials
-\ingroup tutorial_data_vis
+\ingroup tutorial_visualisation
 \brief Examples showing the "graphs classes" usage.
 
 \defgroup tutorial_graphics Graphics tutorials
-\ingroup tutorial_data_vis
+\ingroup tutorial_visualisation
 \brief Various examples showing the basic ROOT graphics.
 
 \defgroup tutorial_webcanv TWebCanvas tutorials
-\ingroup tutorial_data_vis
+\ingroup tutorial_visualisation
 \brief Examples showing the special features of web-based canvas
 
 \defgroup tutorial_webgui Webgui tutorials
-\ingroup tutorial_data_vis
+\ingroup tutorial_visualisation
 \brief Webgui examples
 
 \defgroup tutorial_eve Event display tutorials
-\ingroup tutorial_data_vis
+\ingroup tutorial_visualisation
 \brief Examples showing the usage of the Event display classes.
 
 \defgroup tutorial_geom Geometry tutorials
-\ingroup tutorial_data_vis
+\ingroup tutorial_visualisation
 \brief Various ROOT geometry package examples.
 
 \defgroup tutorial_gui GUI tutorials
-\ingroup tutorial_data_vis
+\ingroup tutorial_visualisation
 \brief Example code which illustrates how to use the ROOT GUI.
 
 \defgroup tutorial_image Image tutorials
-\ingroup tutorial_data_vis
+\ingroup tutorial_visualisation
 \brief Examples showing the TImage class usage.
 
-\defgroup tutorial_spectrum Spectrum tutorials
-\ingroup tutorial_data_vis
-\brief Examples showing the TSpectrum and TSpectrumPainter usage.
-
-\defgroup tutorial_splot TSPlot tutorials
-\ingroup tutorial_data_vis
-\brief This tutorial illustrates the use of class TSPlot.
-
 \defgroup tutorial_gl OpenGL tutorials
-\ingroup tutorial_data_vis
+\ingroup tutorial_visualisation
 \brief Various examples showing the OpenGL graphics in ROOT.
 
 \defgroup tutorial_cocoa Tutorials specific to Mac/Cocoa
-\ingroup tutorial_data_vis
+\ingroup tutorial_visualisation
 \brief Various examples showing graphics done with the Mac graphics system Cocoa.
\ No newline at end of file
diff --git a/tutorials/data_visualisation/webcanv/fonts_ttf.cxx b/tutorials/visualisation/webcanv/fonts_ttf.cxx
similarity index 100%
rename from tutorials/data_visualisation/webcanv/fonts_ttf.cxx
rename to tutorials/visualisation/webcanv/fonts_ttf.cxx
diff --git a/tutorials/data_visualisation/webcanv/haxis.cxx b/tutorials/visualisation/webcanv/haxis.cxx
similarity index 100%
rename from tutorials/data_visualisation/webcanv/haxis.cxx
rename to tutorials/visualisation/webcanv/haxis.cxx
diff --git a/tutorials/data_visualisation/webcanv/inframe.cxx b/tutorials/visualisation/webcanv/inframe.cxx
similarity index 100%
rename from tutorials/data_visualisation/webcanv/inframe.cxx
rename to tutorials/visualisation/webcanv/inframe.cxx
diff --git a/tutorials/data_visualisation/webcanv/latex_url.cxx b/tutorials/visualisation/webcanv/latex_url.cxx
similarity index 100%
rename from tutorials/data_visualisation/webcanv/latex_url.cxx
rename to tutorials/visualisation/webcanv/latex_url.cxx
diff --git a/tutorials/data_visualisation/webcanv/logN.cxx b/tutorials/visualisation/webcanv/logN.cxx
similarity index 100%
rename from tutorials/data_visualisation/webcanv/logN.cxx
rename to tutorials/visualisation/webcanv/logN.cxx
diff --git a/tutorials/data_visualisation/webcanv/triangle.cxx b/tutorials/visualisation/webcanv/triangle.cxx
similarity index 100%
rename from tutorials/data_visualisation/webcanv/triangle.cxx
rename to tutorials/visualisation/webcanv/triangle.cxx
diff --git a/tutorials/data_visualisation/webcanv/triangle.mjs b/tutorials/visualisation/webcanv/triangle.mjs
similarity index 100%
rename from tutorials/data_visualisation/webcanv/triangle.mjs
rename to tutorials/visualisation/webcanv/triangle.mjs
diff --git a/tutorials/data_visualisation/webcanv/twoscales.cxx b/tutorials/visualisation/webcanv/twoscales.cxx
similarity index 100%
rename from tutorials/data_visualisation/webcanv/twoscales.cxx
rename to tutorials/visualisation/webcanv/twoscales.cxx
diff --git a/tutorials/data_visualisation/webgui/geom/geom_threejs.cxx b/tutorials/visualisation/webgui/geom/geom_threejs.cxx
similarity index 100%
rename from tutorials/data_visualisation/webgui/geom/geom_threejs.cxx
rename to tutorials/visualisation/webgui/geom/geom_threejs.cxx
diff --git a/tutorials/data_visualisation/webgui/geom/geom_threejs.html b/tutorials/visualisation/webgui/geom/geom_threejs.html
similarity index 100%
rename from tutorials/data_visualisation/webgui/geom/geom_threejs.html
rename to tutorials/visualisation/webgui/geom/geom_threejs.html
diff --git a/tutorials/data_visualisation/webgui/panel/Readme.md b/tutorials/visualisation/webgui/panel/Readme.md
similarity index 100%
rename from tutorials/data_visualisation/webgui/panel/Readme.md
rename to tutorials/visualisation/webgui/panel/Readme.md
diff --git a/tutorials/data_visualisation/webgui/panel/controller/TestPanel.controller.js b/tutorials/visualisation/webgui/panel/controller/TestPanel.controller.js
similarity index 100%
rename from tutorials/data_visualisation/webgui/panel/controller/TestPanel.controller.js
rename to tutorials/visualisation/webgui/panel/controller/TestPanel.controller.js
diff --git a/tutorials/data_visualisation/webgui/panel/view/TestPanel.view.xml b/tutorials/visualisation/webgui/panel/view/TestPanel.view.xml
similarity index 100%
rename from tutorials/data_visualisation/webgui/panel/view/TestPanel.view.xml
rename to tutorials/visualisation/webgui/panel/view/TestPanel.view.xml
diff --git a/tutorials/data_visualisation/webgui/panel/webpanel.cxx b/tutorials/visualisation/webgui/panel/webpanel.cxx
similarity index 100%
rename from tutorials/data_visualisation/webgui/panel/webpanel.cxx
rename to tutorials/visualisation/webgui/panel/webpanel.cxx
diff --git a/tutorials/data_visualisation/webgui/ping/Readme.md b/tutorials/visualisation/webgui/ping/Readme.md
similarity index 100%
rename from tutorials/data_visualisation/webgui/ping/Readme.md
rename to tutorials/visualisation/webgui/ping/Readme.md
diff --git a/tutorials/data_visualisation/webgui/ping/ping.cxx b/tutorials/visualisation/webgui/ping/ping.cxx
similarity index 100%
rename from tutorials/data_visualisation/webgui/ping/ping.cxx
rename to tutorials/visualisation/webgui/ping/ping.cxx
diff --git a/tutorials/data_visualisation/webgui/ping/ping.html b/tutorials/visualisation/webgui/ping/ping.html
similarity index 100%
rename from tutorials/data_visualisation/webgui/ping/ping.html
rename to tutorials/visualisation/webgui/ping/ping.html
diff --git a/tutorials/data_visualisation/webgui/qtweb/CMakeLists.txt b/tutorials/visualisation/webgui/qtweb/CMakeLists.txt
similarity index 100%
rename from tutorials/data_visualisation/webgui/qtweb/CMakeLists.txt
rename to tutorials/visualisation/webgui/qtweb/CMakeLists.txt
diff --git a/tutorials/data_visualisation/webgui/qtweb/ExampleMain.cpp b/tutorials/visualisation/webgui/qtweb/ExampleMain.cpp
similarity index 100%
rename from tutorials/data_visualisation/webgui/qtweb/ExampleMain.cpp
rename to tutorials/visualisation/webgui/qtweb/ExampleMain.cpp
diff --git a/tutorials/data_visualisation/webgui/qtweb/ExampleWidget.cpp b/tutorials/visualisation/webgui/qtweb/ExampleWidget.cpp
similarity index 100%
rename from tutorials/data_visualisation/webgui/qtweb/ExampleWidget.cpp
rename to tutorials/visualisation/webgui/qtweb/ExampleWidget.cpp
diff --git a/tutorials/data_visualisation/webgui/qtweb/ExampleWidget.h b/tutorials/visualisation/webgui/qtweb/ExampleWidget.h
similarity index 100%
rename from tutorials/data_visualisation/webgui/qtweb/ExampleWidget.h
rename to tutorials/visualisation/webgui/qtweb/ExampleWidget.h
diff --git a/tutorials/data_visualisation/webgui/qtweb/ExampleWidget.ui b/tutorials/visualisation/webgui/qtweb/ExampleWidget.ui
similarity index 100%
rename from tutorials/data_visualisation/webgui/qtweb/ExampleWidget.ui
rename to tutorials/visualisation/webgui/qtweb/ExampleWidget.ui
diff --git a/tutorials/data_visualisation/webgui/qtweb/RCanvasWidget.cpp b/tutorials/visualisation/webgui/qtweb/RCanvasWidget.cpp
similarity index 100%
rename from tutorials/data_visualisation/webgui/qtweb/RCanvasWidget.cpp
rename to tutorials/visualisation/webgui/qtweb/RCanvasWidget.cpp
diff --git a/tutorials/data_visualisation/webgui/qtweb/RCanvasWidget.h b/tutorials/visualisation/webgui/qtweb/RCanvasWidget.h
similarity index 100%
rename from tutorials/data_visualisation/webgui/qtweb/RCanvasWidget.h
rename to tutorials/visualisation/webgui/qtweb/RCanvasWidget.h
diff --git a/tutorials/data_visualisation/webgui/qtweb/RGeomViewerWidget.cpp b/tutorials/visualisation/webgui/qtweb/RGeomViewerWidget.cpp
similarity index 100%
rename from tutorials/data_visualisation/webgui/qtweb/RGeomViewerWidget.cpp
rename to tutorials/visualisation/webgui/qtweb/RGeomViewerWidget.cpp
diff --git a/tutorials/data_visualisation/webgui/qtweb/RGeomViewerWidget.h b/tutorials/visualisation/webgui/qtweb/RGeomViewerWidget.h
similarity index 100%
rename from tutorials/data_visualisation/webgui/qtweb/RGeomViewerWidget.h
rename to tutorials/visualisation/webgui/qtweb/RGeomViewerWidget.h
diff --git a/tutorials/data_visualisation/webgui/qtweb/Readme.md b/tutorials/visualisation/webgui/qtweb/Readme.md
similarity index 100%
rename from tutorials/data_visualisation/webgui/qtweb/Readme.md
rename to tutorials/visualisation/webgui/qtweb/Readme.md
diff --git a/tutorials/data_visualisation/webgui/qtweb/TCanvasWidget.cpp b/tutorials/visualisation/webgui/qtweb/TCanvasWidget.cpp
similarity index 100%
rename from tutorials/data_visualisation/webgui/qtweb/TCanvasWidget.cpp
rename to tutorials/visualisation/webgui/qtweb/TCanvasWidget.cpp
diff --git a/tutorials/data_visualisation/webgui/qtweb/TCanvasWidget.h b/tutorials/visualisation/webgui/qtweb/TCanvasWidget.h
similarity index 100%
rename from tutorials/data_visualisation/webgui/qtweb/TCanvasWidget.h
rename to tutorials/visualisation/webgui/qtweb/TCanvasWidget.h
diff --git a/tutorials/data_visualisation/webgui/webwindow/webwindow.cxx b/tutorials/visualisation/webgui/webwindow/webwindow.cxx
similarity index 100%
rename from tutorials/data_visualisation/webgui/webwindow/webwindow.cxx
rename to tutorials/visualisation/webgui/webwindow/webwindow.cxx
diff --git a/tutorials/data_visualisation/webgui/webwindow/webwindow.html b/tutorials/visualisation/webgui/webwindow/webwindow.html
similarity index 100%
rename from tutorials/data_visualisation/webgui/webwindow/webwindow.html
rename to tutorials/visualisation/webgui/webwindow/webwindow.html