diff --git a/volume-coupled-diffusion/README.md b/volume-coupled-diffusion/README.md
index 28ec8f660..87adf2435 100644
--- a/volume-coupled-diffusion/README.md
+++ b/volume-coupled-diffusion/README.md
@@ -15,27 +15,24 @@ This case illustrates how to implement volume coupling in a simple toy problem.
 
 ## Available solvers and dependencies
 
+Both participants (Source and Drain):
+
 * FEniCS. Install [FEniCS](https://fenicsproject.org/download/) and the [FEniCS-adapter](https://github.com/precice/fenics-adapter). Additionally, you will need to have preCICE and the python bindings installed on your system.
 
 ## Running the simulation
 
-This tutorial is for FEniCS. You can find the corresponding `run.sh` script in the folder `fenics`.
-
-To choose whether you want to run the source or the drain solver, please provide the following command line input:
-
-* `-s` flag will create a source.
-* `-d` flag will create a drain.
-
-For running the case, open two terminals run:
+FEniCS is used to run the simulation. Open two separate terminals and start the source and drain participant by calling the respective run script `run.sh` located in the participant directory. For example:
 
 ```bash
-cd fenics
-./run.sh -s
+cd source-fenics
+./run.sh
 ```
 
 and
 
 ```bash
-cd fenics
-./run.sh -d
+cd drain-fenics
+./run.sh
 ```
+
+in order to use FEniCS for both participants in this test case.
diff --git a/volume-coupled-diffusion/fenics/clean.sh b/volume-coupled-diffusion/drain-fenics/clean.sh
similarity index 100%
rename from volume-coupled-diffusion/fenics/clean.sh
rename to volume-coupled-diffusion/drain-fenics/clean.sh
diff --git a/volume-coupled-diffusion/fenics/precice-adapter-config-drain.json b/volume-coupled-diffusion/drain-fenics/precice-adapter-config.json
similarity index 100%
rename from volume-coupled-diffusion/fenics/precice-adapter-config-drain.json
rename to volume-coupled-diffusion/drain-fenics/precice-adapter-config.json
diff --git a/volume-coupled-diffusion/drain-fenics/run.sh b/volume-coupled-diffusion/drain-fenics/run.sh
new file mode 100755
index 000000000..3ae91af6b
--- /dev/null
+++ b/volume-coupled-diffusion/drain-fenics/run.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e -u
+
+python3 ../solver-fenics/volume-coupled-diffusion.py --drain
\ No newline at end of file
diff --git a/volume-coupled-diffusion/fenics/run.sh b/volume-coupled-diffusion/fenics/run.sh
deleted file mode 100755
index d15dd2163..000000000
--- a/volume-coupled-diffusion/fenics/run.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-set -e -u
-
-usage() { echo "Usage: cmd [-s] [-d]" 1>&2; exit 1; }
-
-# Check if no input argument was provided
-if [ -z "$*" ] ; then
-	usage
-fi
-
-# Select appropriate case
-while getopts ":sd" opt; do
-  case ${opt} in
-  s)
-    python3 volume-coupled-diffusion.py --source
-    ;;
-  d)
-    python3 volume-coupled-diffusion.py --drain
-    ;;
-  *)
-    usage
-    ;;
-  esac
-done
diff --git a/volume-coupled-diffusion/fenics/volume-coupled-diffusion.py b/volume-coupled-diffusion/solver-fenics/volume-coupled-diffusion.py
similarity index 94%
rename from volume-coupled-diffusion/fenics/volume-coupled-diffusion.py
rename to volume-coupled-diffusion/solver-fenics/volume-coupled-diffusion.py
index d6694ede7..034ebec2e 100644
--- a/volume-coupled-diffusion/fenics/volume-coupled-diffusion.py
+++ b/volume-coupled-diffusion/solver-fenics/volume-coupled-diffusion.py
@@ -26,10 +26,7 @@ def inside(self, x, on_boundary):
 command_group.add_argument("-d", "--drain", help="create a drain", dest="drain", action="store_true")
 args = parser.parse_args()
 
-if args.source:
-    precice = Adapter(adapter_config_filename="precice-adapter-config-source.json")
-elif args.drain:
-    precice = Adapter(adapter_config_filename="precice-adapter-config-drain.json")
+precice = Adapter(adapter_config_filename="precice-adapter-config.json")
 
 mesh = UnitSquareMesh(10, 10)
 V = FunctionSpace(mesh, "P", 1)
diff --git a/volume-coupled-diffusion/source-fenics/clean.sh b/volume-coupled-diffusion/source-fenics/clean.sh
new file mode 100755
index 000000000..3a8b4619d
--- /dev/null
+++ b/volume-coupled-diffusion/source-fenics/clean.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e -u
+
+. ../../tools/cleaning-tools.sh
+
+clean_fenics .
diff --git a/volume-coupled-diffusion/fenics/precice-adapter-config-source.json b/volume-coupled-diffusion/source-fenics/precice-adapter-config.json
similarity index 100%
rename from volume-coupled-diffusion/fenics/precice-adapter-config-source.json
rename to volume-coupled-diffusion/source-fenics/precice-adapter-config.json
diff --git a/volume-coupled-diffusion/source-fenics/run.sh b/volume-coupled-diffusion/source-fenics/run.sh
new file mode 100755
index 000000000..1bdbe5662
--- /dev/null
+++ b/volume-coupled-diffusion/source-fenics/run.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e -u
+
+python3 ../solver-fenics/volume-coupled-diffusion.py --source
\ No newline at end of file