diff --git a/source/Paraview/Camera_and_perspective/background.rst b/source/Paraview/Camera_and_perspective/background/index.rst
similarity index 83%
rename from source/Paraview/Camera_and_perspective/background.rst
rename to source/Paraview/Camera_and_perspective/background/index.rst
index ce28161714aea683ba1131ccde357405b291bf60..b3670f70285b225ce255c4c8de84b77ab6d80c17 100644
--- a/source/Paraview/Camera_and_perspective/background.rst
+++ b/source/Paraview/Camera_and_perspective/background/index.rst
@@ -10,10 +10,10 @@ Set the background of the curret plot
 
 To set the background of your current project go to properties of any object, type ``backg`` into the text field, and chose a background of your liking. Chosing pink might help looking for holes in your data - or making your plot a bit *special*.
 
-.. image:: background/set-background.png
+.. image:: set-background.png
 
 
-.. image:: background/pink-background.png
+.. image:: pink-background.png
 
 .. _set-default-background:
 
@@ -23,4 +23,4 @@ Set the default background
 
 To set the default background :ref:`open-settings` and adjust it in the ``Color Palette`` tab
 
-.. image:: background/set-default-background.png
+.. image:: set-default-background.png
diff --git a/source/Paraview/Camera_and_perspective/camera_parallel_projection.rst b/source/Paraview/Camera_and_perspective/camera_parallel_projection/index.rst
similarity index 75%
rename from source/Paraview/Camera_and_perspective/camera_parallel_projection.rst
rename to source/Paraview/Camera_and_perspective/camera_parallel_projection/index.rst
index df17b4e552b9d5101ae7c3a592be24f4c75fb8e2..3679292d998415c33ebcdaf4e5f5ac17af8c40ca 100644
--- a/source/Paraview/Camera_and_perspective/camera_parallel_projection.rst
+++ b/source/Paraview/Camera_and_perspective/camera_parallel_projection/index.rst
@@ -7,4 +7,4 @@ Switch to camera parallel projection
 If you are using paraview for 2D mapping, switching to camera parallel projection helps removing projection artifacts.
 
 
-.. image:: camera_parallel_projection/activate_camera_parallel_projection.png
+...image:: activate_camera_parallel_projection.png
diff --git a/source/Paraview/Camera_and_perspective/index.rst b/source/Paraview/Camera_and_perspective/index.rst
index 18fefd869d7e1f4c8d77df40b60d5686248e1f25..356dac0a5886a63277672ce457a2b3c57533fe96 100644
--- a/source/Paraview/Camera_and_perspective/index.rst
+++ b/source/Paraview/Camera_and_perspective/index.rst
@@ -11,6 +11,4 @@ Camera and perspective
    :caption: Contents:
    :glob:
 
-   *
-
-..   */index
+   */index
diff --git a/source/Paraview/Camera_and_perspective/view-size.rst b/source/Paraview/Camera_and_perspective/view-size/index.rst
similarity index 81%
rename from source/Paraview/Camera_and_perspective/view-size.rst
rename to source/Paraview/Camera_and_perspective/view-size/index.rst
index 8cdc099dcd55d2209defb26dd0c2a0ceee88506e..c004ac9eba92688ae6627a80f4007cfc5c6fa7fe 100644
--- a/source/Paraview/Camera_and_perspective/view-size.rst
+++ b/source/Paraview/Camera_and_perspective/view-size/index.rst
@@ -7,8 +7,8 @@ When preparing to export images for a video or similar, forcing paraview to disp
 
 Go to ``View->Preview`` and chose the aspect ratio and size of the final product.
 
-.. image:: ./view-size/view-size-fhd.png
+.. image:: view-size-fhd.png
 
 Your screen display will be adjusted accordingly
 
-.. image:: ./view-size/fhd-preview.png
+.. image:: fhd-preview.png
diff --git a/source/Paraview/Colormap/chose-BuGn.rst b/source/Paraview/Colormap/chose-BuGn/index.rst
similarity index 87%
rename from source/Paraview/Colormap/chose-BuGn.rst
rename to source/Paraview/Colormap/chose-BuGn/index.rst
index 32ed68f4a58307572f0e83d9659fbb2d94ababe6..7d45c623eb62f81f3b8cccc6e0863f5a84bd7ab5 100644
--- a/source/Paraview/Colormap/chose-BuGn.rst
+++ b/source/Paraview/Colormap/chose-BuGn/index.rst
@@ -10,11 +10,11 @@ In the top left part of the paraview window, there is a color ar with a small gr
 
 In the Color Map Editor window (View-> Color Map Editor Window) it's on the right hand side of the color map preview
 
-.. image:: chose-BuGn/06-chose-colormap.png
+.. image:: 06-chose-colormap.png
 
 
-..
-  image:: chose-BuGn/07-colormap-overview.png
+
+.. image:: 07-colormap-overview.png
 
 In the color map chooser window, you can select a color map from a wide range of options. By default, only a few of them are displayed. With the dropdown menu on the right [Default] you can chose from a couple groups or display all of them.
 
@@ -22,13 +22,13 @@ In the text field in the top, you can start typing letters that should appear in
 
 You can chose to import a color map with its ``preset range`` (top right) - this can be useful if you e.g. customize a color map for display of annual mean temperatures and save it with that preset range for later use.
 
-.. image:: chose-BuGn/08-colormap-choser.png
+.. image:: 08-colormap-choser.png
 
 
 This should get you something like this:
 
 
-.. image:: chose-BuGn/09-BuGn-currents.png
+.. image:: 09-BuGn-currents.png
 
 
 You can now :ref:`rescale-colormap-to-custom`.
diff --git a/source/Paraview/Colormap/index.rst b/source/Paraview/Colormap/index.rst
index b4950f60115ed9f06895db5bd474a4127bedf7eb..2a9c780ddfd84dc01b9476f6d18a76c95f0a2127 100644
--- a/source/Paraview/Colormap/index.rst
+++ b/source/Paraview/Colormap/index.rst
@@ -12,5 +12,4 @@ Colormaps
    :glob:
 
    *
-
-..   */index
+   */index
diff --git a/source/Paraview/Colormap/invert.rst b/source/Paraview/Colormap/invert/index.rst
similarity index 87%
rename from source/Paraview/Colormap/invert.rst
rename to source/Paraview/Colormap/invert/index.rst
index 8063f647d4dfc1a96ae33500eca543bc98e551fc..8e0829cda63806d0d74212f3f13d1457e8d00e2e 100644
--- a/source/Paraview/Colormap/invert.rst
+++ b/source/Paraview/Colormap/invert/index.rst
@@ -5,4 +5,4 @@ Invert the Colormap
 
 Go to the Colormap editor (``View -> Color Map Editor Window``), and choose the Black and White icon right of the display.
 
-.. image:: invert/invert.png
+.. image:: invert.png
diff --git a/source/Paraview/Colormap/prettify-colorbar.rst b/source/Paraview/Colormap/prettify-colorbar/index.rst
similarity index 82%
rename from source/Paraview/Colormap/prettify-colorbar.rst
rename to source/Paraview/Colormap/prettify-colorbar/index.rst
index 559aa915a338e6b6bbacc0bd973d3f6131913227..a5a56055c45094cbe05096c797bffb1af1a61588 100644
--- a/source/Paraview/Colormap/prettify-colorbar.rst
+++ b/source/Paraview/Colormap/prettify-colorbar/index.rst
@@ -11,13 +11,13 @@ Adjust the color bar and its legend
 
 Open the colormap editor (``View->Color Map Editor``) and chose the top right icon (a color bar with an ``e`` in the icon).
 
-.. image:: prettify-colorbar/get-colorbar-editor.png
+.. image:: get-colorbar-editor.png
 
 
 Choose the gear at the top right of the menu (activates the display of less *important* aspects like the top/bottom value labels), insert a more precise label text in the ``Title`` field, e.g. "Ocean surface speed (m/s)" and set the format for the range labels (top/bottom values) to ``%.0f`` (floating-point with zero digits behind the ``.``). Use ``Apply`` to check your results and finally leave the menu with ``OK``.
 
-.. image:: prettify-colorbar/adjust-colorbar-labels.png
+.. image:: adjust-colorbar-labels.png
 
 The result should look somewhat like
 
-.. image:: prettify-colorbar/adjusted-colorbar-labels.png
+.. image:: adjusted-colorbar-labels.png
diff --git a/source/Paraview/Colormap/rescale-to-custom.rst b/source/Paraview/Colormap/rescale-to-custom/index.rst
similarity index 80%
rename from source/Paraview/Colormap/rescale-to-custom.rst
rename to source/Paraview/Colormap/rescale-to-custom/index.rst
index fc3f3bc0d2784a0ff0b41ee29306685a3e841077..60d4570acc5e86918f1ab7f54d64cbccadd7cbcf 100644
--- a/source/Paraview/Colormap/rescale-to-custom.rst
+++ b/source/Paraview/Colormap/rescale-to-custom/index.rst
@@ -8,11 +8,11 @@ Rescale the colormap to a custom range
 
 Use this button to rescale your color map to a custom range or chose a custom color for monochromatic displays
 
-.. image:: rescale-to-custom/09-rescale-to-custom.png
+.. image:: 09-rescale-to-custom.png
 
 Chose 0 to 1 to get this image:
 
-.. image:: rescale-to-custom/10-rescaled-to-custom.png
+.. image:: 10-rescaled-to-custom.png
 
 
 you can now :ref:`deactivate-light-kit` to make the colors stand out even better.
diff --git a/source/Paraview/Colormap/save-to-preset.rst b/source/Paraview/Colormap/save-to-preset/index.rst
similarity index 74%
rename from source/Paraview/Colormap/save-to-preset.rst
rename to source/Paraview/Colormap/save-to-preset/index.rst
index cb7fe13a21d5d34a3a8271b80641289d9c855d0c..ea51c6c1809e034f59394f35a82562128890b787 100644
--- a/source/Paraview/Colormap/save-to-preset.rst
+++ b/source/Paraview/Colormap/save-to-preset/index.rst
@@ -5,14 +5,14 @@ Save the colormap as a preset
 
 Go to the colormap editor, chose the ``Save to preset`` option next to the preview.
 
-.. image:: ./save-to-preset/save-colormap.png
+.. image:: save-colormap.png
 
 
 You can give the colormap a name, and chose to also save the opacity information.
 
-.. image:: ./save-to-preset/name-dialogue.png
+.. image:: name-dialogue.png
 
 If this name cannot be found in the following pop-up dialogue, search for ``Preset``  in the top menu and rename...
 
 
-.. image:: ./save-to-preset/change-name.png
+.. image:: change-name.png
diff --git a/source/Paraview/Colormap/transparent-clouds.rst b/source/Paraview/Colormap/transparent-clouds/index.rst
similarity index 87%
rename from source/Paraview/Colormap/transparent-clouds.rst
rename to source/Paraview/Colormap/transparent-clouds/index.rst
index 1d09ae17035b4a4ac1ce9b3003363f6456589218..5d54bd5565057e1a73835969363f1ac7a240b97c 100644
--- a/source/Paraview/Colormap/transparent-clouds.rst
+++ b/source/Paraview/Colormap/transparent-clouds/index.rst
@@ -24,15 +24,15 @@ Set the R/G/B values to 1 in the ``Color transfer function values`` section, and
 
 Things should now be changed from
 
-.. image:: transparent-clouds/fields-to-change.png
+.. image:: fields-to-change.png
 
 to
 
-.. image:: transparent-clouds/fields-changed.png
+.. image:: fields-changed.png
 
 Your result should look like
 
-.. image:: transparent-clouds/transparent-clouds-ocean-speeds.png
+.. image:: transparent-clouds-ocean-speeds.png
 
 
 Don't forget to :ref:`save-colormap-preset`.
diff --git a/source/Paraview/Examples/PalMod_combined/load-ice-sheets.rst b/source/Paraview/Examples/PalMod_combined/load-ice-sheets.rst
index 6f2312708f2e1f99f922a66587e39fb147420f7e..937f9e10574d20ac3c6723ec2f6b8cdb2b6f49dc 100644
--- a/source/Paraview/Examples/PalMod_combined/load-ice-sheets.rst
+++ b/source/Paraview/Examples/PalMod_combined/load-ice-sheets.rst
@@ -3,11 +3,10 @@
 Load the ice sheets
 ==============================
 * Load the ice sheet data from `pism_NH_777.nc <https://swiftbrowser.dkrz.de/public/dkrz_8656c91ce0734327b6dc867fc5b6b068/ESiWACE2-Public/Paraview%20Sample%20Data/PalMod_example/>`_
-n
+
 * For random reasons, this file already is in point data. Attach a calculator and in the pipeline view select the calculator of the vegetation, copy it, and paste it to the newly created calculator (i.e. copy the settings to the calculator of the ice sheet). Change ``topg`` to ``ice_surf`` in the equation of the calculator.
 
-.. image::
-     copy-calculator.png
+.. image:: copy-calculator.png
 
 * Color by ``velsurf_mag``, chose ``Use log scale when mapping data to colors``, load the colormap of your choice.
 
diff --git a/source/Paraview/Export/export-animation.rst b/source/Paraview/Export/export-animation/index.rst
similarity index 93%
rename from source/Paraview/Export/export-animation.rst
rename to source/Paraview/Export/export-animation/index.rst
index 6bf03456e6d40431e8907d20ca471fe7a719a539..5ed131664871f188bbea2055c844d3cff2bef91a 100644
--- a/source/Paraview/Export/export-animation.rst
+++ b/source/Paraview/Export/export-animation/index.rst
@@ -16,12 +16,12 @@ It has proven useful to export to a sequence of png files that can then be conca
 Chose ``File->Export Animation``, enter a base file name (will be expanded by _0123/..., see the ``Suffix format`` field in the following dialogue), and ensure the correct image size in the following dialogue.
 
 
-.. image:: export-animation/export-basic-screen.png
+.. image:: export-basic-screen.png
 
 
 (If you change the size of the saved animation, you might want to toggle the gear in the top left and change the font scaling option, but really -- :ref:`set-view-size` beforehand!)
 
-.. image:: export-animation/export-advanced-screen.png
+.. image:: export-advanced-screen.png
 
 
 This will generate a sequence of .png files. For a quick impression you can run through them using ``eog FILENAME*.png`` on linux, or preview on a mac.
diff --git a/source/Paraview/Export/index.rst b/source/Paraview/Export/index.rst
index e085a6dd8b13f301356995fbb1f88c3010306d18..d4ccb0f162f9be211b36b0350145dc3498b6a093 100644
--- a/source/Paraview/Export/index.rst
+++ b/source/Paraview/Export/index.rst
@@ -11,6 +11,4 @@ Export
    :caption: Contents:
    :glob:
 
-   *
-
-..   */index
+   */index
diff --git a/source/Paraview/Filters/calculator-topography.rst b/source/Paraview/Filters/calculator-topography/index.rst
similarity index 97%
rename from source/Paraview/Filters/calculator-topography.rst
rename to source/Paraview/Filters/calculator-topography/index.rst
index 755ecb757318e45eb1b7bd32fbd606480b758ff2..58c71f07856c2b86d9cfe2812d87eb34a3b25c6b 100644
--- a/source/Paraview/Filters/calculator-topography.rst
+++ b/source/Paraview/Filters/calculator-topography/index.rst
@@ -27,7 +27,7 @@ Where the first paren scales the topography to a strong extrusion around a unit
 
 
 .. image::
-   calculator-topography/calculator-settings.png
+   calculator-settings.png
 
 
 .. note::
diff --git a/source/Paraview/Filters/calculator-uv-speed.rst b/source/Paraview/Filters/calculator-uv-speed/index.rst
similarity index 90%
rename from source/Paraview/Filters/calculator-uv-speed.rst
rename to source/Paraview/Filters/calculator-uv-speed/index.rst
index fea8c450634537d4bf82b9bf0b24ce046a61bb7e..7f9ad88e7b0a402add8fb2731298e6ce53576647 100644
--- a/source/Paraview/Filters/calculator-uv-speed.rst
+++ b/source/Paraview/Filters/calculator-uv-speed/index.rst
@@ -16,7 +16,7 @@ Now we want to apply a "Calculator" filter to compute the absolute speed from th
 Choose Filters->Common->Calculator, or use the calculator symbol just above the pipeline.
 
 
-.. image:: calculator-uv-speed/04-pipeline.png
+.. image:: 04-pipeline.png
 
 In the calculator, you can chose the data type to operate on ("cell data" is correct here), give your result variable a sensible name -- we chose ``vel`` here -- ``speed`` would have been correct...
 
@@ -29,11 +29,11 @@ In the next field, you can define the equation that is computed. We want to use:
 You can also use the drop-down menus at the bottom to get access to the variables available (sorted by scalars and vector quantities).
 
 
-.. image:: calculator-uv-speed/05-calculator.png
+.. image:: 05-calculator.png
 
 The result should look similar to this:
 
-.. image:: calculator-uv-speed/05a-speed-image.png
+.. image:: 05a-speed-image.png
 
 With the speed computed, you can :ref:`chose-BuGn`
 
diff --git a/source/Paraview/Filters/cell2point/cell-or-point.png b/source/Paraview/Filters/cell-to-point/cell-or-point.png
similarity index 100%
rename from source/Paraview/Filters/cell2point/cell-or-point.png
rename to source/Paraview/Filters/cell-to-point/cell-or-point.png
diff --git a/source/Paraview/Filters/cell2point/cell2point.png b/source/Paraview/Filters/cell-to-point/cell2point.png
similarity index 100%
rename from source/Paraview/Filters/cell2point/cell2point.png
rename to source/Paraview/Filters/cell-to-point/cell2point.png
diff --git a/source/Paraview/Filters/cell-to-point.rst b/source/Paraview/Filters/cell-to-point/index.rst
similarity index 91%
rename from source/Paraview/Filters/cell-to-point.rst
rename to source/Paraview/Filters/cell-to-point/index.rst
index 97417a761f679cf8caebbc8c79298202c3321bad..dd04c158d8828515be3d7bce308e751cc2441e17 100644
--- a/source/Paraview/Filters/cell-to-point.rst
+++ b/source/Paraview/Filters/cell-to-point/index.rst
@@ -12,7 +12,7 @@ Some filters are picky with regard to their input data type and require cell dat
 Use the dropdown for choosing the object color to check which variables of which types are available.
 In this example topo exists as cell and as point data (because we just converted it). The topo with a dot in front of it is point data. That with a box is cell data.
 
-.. image:: cell2point/cell-or-point.png
+.. image:: cell-or-point.png
 
 
 If neccessary you can
@@ -28,10 +28,10 @@ Convert cell data to point data
 To convert cell data to point data, do ``Filters->Search`` and enter ``cell da``, use ``Enter`` to cofirm.
 
 .. image::
-   cell2point/cell2point.png
+   cell2point.png
 
 In the settings of the calculator activate passing of cell data.
 If you have many arrays in your input data, you might only want to process the data of relevance for this use.
 
-.. image::  cell2point/
+.. image::
 	    pass-cell.png
diff --git a/source/Paraview/Filters/cell2point/pass-cell.png b/source/Paraview/Filters/cell-to-point/pass-cell.png
similarity index 100%
rename from source/Paraview/Filters/cell2point/pass-cell.png
rename to source/Paraview/Filters/cell-to-point/pass-cell.png
diff --git a/source/Paraview/Filters/contour-isolines.rst b/source/Paraview/Filters/contour-isolines/index.rst
similarity index 79%
rename from source/Paraview/Filters/contour-isolines.rst
rename to source/Paraview/Filters/contour-isolines/index.rst
index 14af0c2cc4ec58b7903e1065f435ce9a0812e025..beeb4a4682ae346783e71daa735ce7ce2fe1c88f 100644
--- a/source/Paraview/Filters/contour-isolines.rst
+++ b/source/Paraview/Filters/contour-isolines/index.rst
@@ -1,4 +1,4 @@
-.. _countour-isolines:
+.. _contour-isolines:
 
 Use the contour filter to display isolines
 ===========================================
@@ -6,21 +6,21 @@ Use the contour filter to display isolines
 Add a contour filter
 
 .. image::
-   contour-isolines/add-contour.png
+   add-contour.png
 
 Chose the variable, you want to contour by, use the red x to get rid of the default contour level, use the *scale* icon (below + and -) to create a number series, (see below), finally select the levels ``100`` and the ``0`` and use the ``+`` to add ``-50`` and ``50`` levels below them.
 
 .. image::
-   contour-isolines/contour-levels.png
+   contour-levels.png
 
 
 
 .. image::
-   contour-isolines/number-series.png
+   number-series.png
 
 Adjust the line width to ``5`` by searching for ``line`` in the search box in the top and then adjusting it.
 
 .. image::
-   contour-isolines/line-width.png
+   line-width.png
 
 Select ``BrBG`` as colormap, invert it, and set the value range to ``-100`` to ``100``.
diff --git a/source/Paraview/Filters/index.rst b/source/Paraview/Filters/index.rst
index fc17273b609fac365d5db075bf10c0b69ba326e8..1fa74499d4ee68c4f0590be979b3a3b87e9230c7 100644
--- a/source/Paraview/Filters/index.rst
+++ b/source/Paraview/Filters/index.rst
@@ -11,6 +11,6 @@ Filters
    :caption: Contents:
    :glob:
 
-   *
 
-..   */index
+
+   */index
diff --git a/source/Paraview/Filters/texture-map-to-plane.rst b/source/Paraview/Filters/texture-map-to-plane/index.rst
similarity index 83%
rename from source/Paraview/Filters/texture-map-to-plane.rst
rename to source/Paraview/Filters/texture-map-to-plane/index.rst
index 2c16e26f976c7e2eb4cbe235fb7dafd02e2e42e6..383d6d555aea1152cb1f45608745e991af193833 100644
--- a/source/Paraview/Filters/texture-map-to-plane.rst
+++ b/source/Paraview/Filters/texture-map-to-plane/index.rst
@@ -15,41 +15,41 @@ Add an image as texture (plane) in the background
 
 As our ocean data set has *holes* on the land points, we have to first create a plane *behind* it, before we can attach an image of Earth.
 
-.. image:: texture-map-to-plane/000-ocean-with-holes.png
+.. image:: 000-ocean-with-holes.png
 
 As a first step, we figure out the size of *Earth* in paraview. For this we need the ``Information View`` (View-> Information). There we look for the section ``Bounds`` and note the extreme values. The x-range is from roughly -300 to 300, the y-range is from roughly -131 to 150. The lower bound of the y-range is a bit weird, because Antarctica is cut off, because the oceans don't reach 90 deg S. Now we know our plane needs to be -300 to 300 by -150 to 150, and just below z=0.
 
-.. image:: texture-map-to-plane/00a-find-data-size.png
+.. image:: 00a-find-data-size.png
 
 We can get a plane from the ``Sources`` menu, e.g. from ``Geometric Shapes``.
 
-.. image:: texture-map-to-plane/00b-get-plane.png
+.. image:: 00b-get-plane.png
 
 Here we adjust the x coordinates to +/- 300 and the y coordinates to +/- 150, keeping the signs as they were. As z-coordinate we use -0.1 to put this plane just below the ocean.
 
-.. image:: texture-map-to-plane/00c-new-coordinates.png
+.. image:: 00c-new-coordinates.png
 
 After clicking ``Apply``, we should have all land areas filled with white.
 
 Now we can add the texture itself. Chose ``Filters->Search...`` and type ``texture``. You will be presented with the three different texture filters. Chose ``Texture Map to Plane`` and hit ``Enter``
 
-.. image:: texture-map-to-plane/01-find-filter.png
+.. image:: 01-find-filter.png
 
 Now you first have to click apply before you can set the texture (for whatever reason)
 
-.. image:: texture-map-to-plane/02-apply.png
+.. image:: 02-apply.png
 
 Now use the text box and search for texture. Click the ``Texture`` dropdown menu, and chose load.
 
 
-.. image:: texture-map-to-plane/03-find-texture-field.png
+.. image:: 03-find-texture-field.png
 
 Pick the small blue marble from the directory with the sample data (or use any one of NASA's Blue Marble images, e.g.  `the low-res version of the February image <https://eoimages.gsfc.nasa.gov/images/imagerecords/74000/74268/world.topo.200402.3x5400x2700.jpg>`_. (Thanks, NASA for that great service!).
 
 
-.. image:: texture-map-to-plane/04-texture-file.png
+.. image:: 04-texture-file.png
 
 You should have Earth peeking out of the holes in the ocean.
 
 
-.. image:: texture-map-to-plane/05-texture-on-earth.png
+.. image:: 05-texture-on-earth.png
diff --git a/source/Paraview/Filters/texture-map-to-sphere.rst b/source/Paraview/Filters/texture-map-to-sphere/index.rst
similarity index 79%
rename from source/Paraview/Filters/texture-map-to-sphere.rst
rename to source/Paraview/Filters/texture-map-to-sphere/index.rst
index 2977b2a68d9afb4d063b796eb98624bf948b452a..d30ce12cea1c52431ba464cecd6bec8b5230fd12 100644
--- a/source/Paraview/Filters/texture-map-to-sphere.rst
+++ b/source/Paraview/Filters/texture-map-to-sphere/index.rst
@@ -7,12 +7,12 @@ Create a sphere and follow the steps for mapping a texture to a plane in :ref:`t
 
 Some adjustments are necessary. If you use a custom-created sphere, increase the resolution in teta and phi in the properties of the sphere (not the texture mapping).
 
-.. image:: ../Sources/Sphere/sphere-resolution.png
+.. image:: ../../Sources/Sphere/sphere-resolution.png
 
 To avoid a seam set the theta-range to 359.999
 
-.. image:: ./texture-map-to-sphere/theta-range.png
+.. image:: ./theta-range.png
 
 To match the projection to that of icon data set all scalings to -.999
 
-.. image:: ./texture-map-to-sphere/scale-texture.png
+.. image:: ./scale-texture.png
diff --git a/source/Paraview/Light/deactivate-light-kit.rst b/source/Paraview/Light/deactivate-light-kit/index.rst
similarity index 83%
rename from source/Paraview/Light/deactivate-light-kit.rst
rename to source/Paraview/Light/deactivate-light-kit/index.rst
index b6cc9b77d3d44b87eb5287ae7d5d73fe05ee2789..b783b87704d0aa829ff99f9a05507b5753de2ba2 100644
--- a/source/Paraview/Light/deactivate-light-kit.rst
+++ b/source/Paraview/Light/deactivate-light-kit/index.rst
@@ -12,11 +12,11 @@ Deactivate the light kit
 
 By default, Paraview creates a couple of light sources in positions that are fixed relative to the viewer. This light sources allow for shadows and depth perception. However this comes at the cost of brilliance of colors.
 
-.. image:: deactivate-light-kit/01-get-light-inspector.png
+.. image:: 01-get-light-inspector.png
 
 Use the checkbox in the top left corner to deactivate the light kit.
 
-.. image:: deactivate-light-kit/02-light-inspector.png
+.. image:: 02-light-inspector.png
 
 
 If you followed the whole series of  :ref:`create-image-sea-surface-speeds`, your result should look like this:
diff --git a/source/Paraview/Light/index.rst b/source/Paraview/Light/index.rst
index 7b05047fc3d800766e1547fe676a096ef3cb82b7..c509f1285209317f9257c5d6121c416ba9609d67 100644
--- a/source/Paraview/Light/index.rst
+++ b/source/Paraview/Light/index.rst
@@ -11,7 +11,4 @@ Light
    :caption: Contents:
    :glob:
 
-   *
-
-
-..   */index
+   */index
diff --git a/source/Paraview/Readers/nemo-3d-netcdf-CF.rst b/source/Paraview/Readers/Nemo/index.rst
similarity index 87%
rename from source/Paraview/Readers/nemo-3d-netcdf-CF.rst
rename to source/Paraview/Readers/Nemo/index.rst
index 95442ff7658fa439d004defba8b0d4699ac344fe..9838ecb24aaa134052e550e74d79e87b84c165ee 100644
--- a/source/Paraview/Readers/nemo-3d-netcdf-CF.rst
+++ b/source/Paraview/Readers/Nemo/index.rst
@@ -15,4 +15,4 @@ Settings that get you some idea of the output are
 
 ``Replace Fill Value with NaN``
 
-.. image:: ./Nemo/nemo-with-netCDF-CF-reader.png
+.. image:: ./nemo-with-netCDF-CF-reader.png
diff --git a/source/Paraview/Readers/cdi-reader-plugin.rst b/source/Paraview/Readers/cdi-reader-plugin/index.rst
similarity index 85%
rename from source/Paraview/Readers/cdi-reader-plugin.rst
rename to source/Paraview/Readers/cdi-reader-plugin/index.rst
index 57900be9bef8ec0fcc3b5cafcff598bcb0eb8fb5..fa35de396dee97e8702847e71b59624f5c976f9e 100644
--- a/source/Paraview/Readers/cdi-reader-plugin.rst
+++ b/source/Paraview/Readers/cdi-reader-plugin/index.rst
@@ -12,12 +12,12 @@ For loading ICON data, we need to activate the CDI reader plugin (on Mistral it'
 Chose Tools-> Manage Plugins
 
 
-.. image:: cdi-reader-plugin/00a-load-plugin.png
+.. image:: 00a-load-plugin.png
 
 Select the CDIReader plugin, open the detailed view, activate ``Auto Load``, and Chose ``Load selected`` at the bottom. The ``Status`` should now be ``Loaded``, and ``Load Selected`` should be greyed out.
 
 
-.. image:: cdi-reader-plugin/00b-activate-cdi-plugin.png
+.. image:: 00b-activate-cdi-plugin.png
 
 
 With the cdi reader loaded, you can  :ref:`load-2d-icon`
diff --git a/source/Paraview/Readers/cf-reader.rst b/source/Paraview/Readers/cf-reader/index.rst
similarity index 94%
rename from source/Paraview/Readers/cf-reader.rst
rename to source/Paraview/Readers/cf-reader/index.rst
index 77c023009f766bbac167d9755c118fe84763a75b..8ee666dc94a7b217f68d70e474b809c51f82fdc6 100644
--- a/source/Paraview/Readers/cf-reader.rst
+++ b/source/Paraview/Readers/cf-reader/index.rst
@@ -23,9 +23,9 @@ Open a file with the standard NetCDF Reader
 
 Use ``File->Open`` or the top-left icon (see :ref:`main-screen`), chose the desired file and select ``NetCDF reader`` when prompted.
 
-.. image:: cf-reader/chose-reader.png
+.. image:: chose-reader.png
 
 
 For a spherical projection use ``Spherical Coordinates`` and (for most cases) use ``Replace Fill Value With Nan``
 
-.. image:: cf-reader/spherical-nans.png
+.. image:: spherical-nans.png
diff --git a/source/Paraview/Readers/index.rst b/source/Paraview/Readers/index.rst
index 0c662eaf9931514be101ac72a5c11d4f6858fc5b..6d954bbc43ff664836bc753c07f6d2fe19af742e 100644
--- a/source/Paraview/Readers/index.rst
+++ b/source/Paraview/Readers/index.rst
@@ -11,6 +11,4 @@ Readers
    :caption: Contents:
    :glob:
 
-   *
-
-..   */index
+   */index
diff --git a/source/Paraview/Readers/load-2d-icon.rst b/source/Paraview/Readers/load-2d-icon/index.rst
similarity index 80%
rename from source/Paraview/Readers/load-2d-icon.rst
rename to source/Paraview/Readers/load-2d-icon/index.rst
index a19f459ff3ad408adb42edb5458ff2fe047df75b..5ca8f0e13fd9830a74118c6521605994fc4d8946 100644
--- a/source/Paraview/Readers/load-2d-icon.rst
+++ b/source/Paraview/Readers/load-2d-icon/index.rst
@@ -10,18 +10,18 @@ You might need to :ref:`activate_the_cdi_reader_plugin`
 
 Use File-> Open.., or use the top-left icon to open the file choser.
 
-.. image:: load-2d-icon/01-load-file.png
+.. image:: 01-load-file.png
 
 
 Chose uv.nc (get it from ....)
 
-.. image:: load-2d-icon/02-chose-file.png
+.. image:: 02-chose-file.png
 
 
 Chose the CDI reader for ICON files -- Models with a regular (lat/lon, or stretched) grid usually go via "NetCDF Reader". If CDIReader does not appear in the menu, you need to :ref:`activate_the_cdi_reader_plugin`.
 
 
-.. image:: load-2d-icon/02a-chose-reader.png
+.. image:: 02a-chose-reader.png
 
 
 uv.nc now appears in the top of the pipeline (top left).
@@ -35,20 +35,20 @@ Some ICON Ocean data comes with zeros on land points. Then a wet_c variable can
 With "Vertical levels" you can chose which vertical level you want to see if there's more than one in the source file (not in uv.nc).
 
 
-.. image:: load-2d-icon/03-viever-properties.png
+.. image:: 03-viever-properties.png
 
 The result should look like this:
 
-.. image:: load-2d-icon/02b-ocean-loaded.png
+.. image:: 02b-ocean-loaded.png
 
 
 From the dropdown menu in the top you can chose to color by any variable, e.g. ``v``
 
-.. image:: load-2d-icon/04-chose-variable-for-display.png
+.. image:: 04-chose-variable-for-display.png
 
 Which should give a basic idea of eddies and friends
 
-.. image:: load-2d-icon/05-color-by-v.png
+.. image:: 05-color-by-v.png
 
 
 
diff --git a/source/Paraview/technical/index.rst b/source/Paraview/technical/index.rst
index d1d70193aadb878c1f60f134ed28369d4214c320..9508bfc319fe54f1e2bd5524dc0702419f61aade 100644
--- a/source/Paraview/technical/index.rst
+++ b/source/Paraview/technical/index.rst
@@ -12,5 +12,4 @@ Technical
    :glob:
 
    *
-
-..   */index
+   */index
diff --git a/source/Paraview/technical/make-paraview-save-on-quit-or-crash.rst b/source/Paraview/technical/make-paraview-save-on-quit-or-crash/index.rst
similarity index 81%
rename from source/Paraview/technical/make-paraview-save-on-quit-or-crash.rst
rename to source/Paraview/technical/make-paraview-save-on-quit-or-crash/index.rst
index 70e185ff0ca9400ea1fc2207fdd199c53c096bb6..ec543b37f1d256a0c1329a8e0a576441f5361eaa 100644
--- a/source/Paraview/technical/make-paraview-save-on-quit-or-crash.rst
+++ b/source/Paraview/technical/make-paraview-save-on-quit-or-crash/index.rst
@@ -6,4 +6,4 @@ Make Paraview save a state on quitting or crashing
 :ref:`open-settings` and use the text box in the ``General`` tab to seach for ``save``, activate both options, and ``Apply``.
 
 
-.. image:: make-paraview-save-on-quit-or-crash/activate-options.png
+.. image:: activate-options.png
diff --git a/source/Paraview/technical/save-state.rst b/source/Paraview/technical/save-state/index.rst
similarity index 94%
rename from source/Paraview/technical/save-state.rst
rename to source/Paraview/technical/save-state/index.rst
index 5931759fbb2139362297017c48cf2763315d9711..23e7eda3ba122c843b5b15d9550ca4987298d8dc 100644
--- a/source/Paraview/technical/save-state.rst
+++ b/source/Paraview/technical/save-state/index.rst
@@ -6,7 +6,7 @@ Save a state file
 There are two possible formats for saving the state (recipe) of your paraview session: ``.pvsm``, the paraview-native XML format, and ``.py`` -- python executables that can be executed using ``pvbatch``. The python export is not as stable as ``.pvsm``, so it might be a good idea to **first save your state to ``.pvsm``** and save an additional ``.py`` copy after this.
 
 
-.. image:: save-state/file-save-state.png
+.. image:: file-save-state.png
 
 
 **It has proved very useful to have older states at hand.** Paraview has the *feature* of grouping files that end on a number, so _a _b _c naming has proved useful. Using a version control system is even better. :)